summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-02-29 17:56:25 +0000
committerRichard Purdie <richard@openedhand.com>2008-02-29 17:56:25 +0000
commit698f4302c314077b199982626cf4d8c273af11df (patch)
tree30137ff8e6a45c66508d15f0feb8617cb6aa8346
parent25081db18300fd5e3bda7bd8895bd9ec565ee876 (diff)
downloadpoky-698f4302c314077b199982626cf4d8c273af11df.tar.gz
networkmanager-applet: Remove VPN connections menu
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3881 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/networkmanager/files/no_vpn.patch13
-rw-r--r--meta/packages/networkmanager/networkmanager-applet_svn.bb5
2 files changed, 16 insertions, 2 deletions
diff --git a/meta/packages/networkmanager/files/no_vpn.patch b/meta/packages/networkmanager/files/no_vpn.patch
new file mode 100644
index 0000000000..49423e879f
--- /dev/null
+++ b/meta/packages/networkmanager/files/no_vpn.patch
@@ -0,0 +1,13 @@
1Index: trunk/src/applet.c
2===================================================================
3--- trunk.orig/src/applet.c 2008-02-29 17:47:39.000000000 +0000
4+++ trunk/src/applet.c 2008-02-29 17:48:38.000000000 +0000
5@@ -1783,7 +1783,7 @@
6 }
7
8 nma_menu_add_devices (menu, applet);
9- nma_menu_add_vpn_submenu (menu, applet);
10+ //nma_menu_add_vpn_submenu (menu, applet);
11
12 gtk_widget_show_all (applet->menu);
13
diff --git a/meta/packages/networkmanager/networkmanager-applet_svn.bb b/meta/packages/networkmanager/networkmanager-applet_svn.bb
index 2d31030a05..d6a64856b1 100644
--- a/meta/packages/networkmanager/networkmanager-applet_svn.bb
+++ b/meta/packages/networkmanager/networkmanager-applet_svn.bb
@@ -3,14 +3,15 @@ LICENSE = "GPL"
3DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring" 3DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring"
4#TODO DEPENDS libnotify 4#TODO DEPENDS libnotify
5RDEPENDS = "networkmanager" 5RDEPENDS = "networkmanager"
6PR = "r2" 6PR = "r3"
7 7
8inherit gnome gtk-icon-cache 8inherit gnome gtk-icon-cache
9 9
10SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \ 10SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \
11 file://applet-no-gnome.diff;patch=1;pnum=0 \ 11 file://applet-no-gnome.diff;patch=1;pnum=0 \
12 file://applet-no-animation.patch;patch=1 \ 12 file://applet-no-animation.patch;patch=1 \
13 file://70NetworkManagerApplet" 13 file://no_vpn.patch;patch=1 \
14 file://70NetworkManagerApplet"
14 15
15PV = "0.0+svnr${SRCREV}" 16PV = "0.0+svnr${SRCREV}"
16 17