summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-12-17 13:26:35 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-21 09:29:12 +0000
commitcb1f3e088170652dde7ec270ef0ebf4486a2f3a6 (patch)
treef580a650b00f6fc6f8f586f78989aa1ff4ad3be6
parenteb74a0506a2f17170254e62513db3451e0587d11 (diff)
downloadpoky-cb1f3e088170652dde7ec270ef0ebf4486a2f3a6.tar.gz
connman-gnome: Remove the applet and properties desktop icons
Remove the applet and properties desktop icons, since the connman-properties program should be invoked by tool bar, while connman-applet is launched by autostart. This fixes [BUGID #506] Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-rw-r--r--meta/recipes-connectivity/connman/connman-gnome/connman-applet.desktop10
-rw-r--r--meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch42
-rw-r--r--meta/recipes-connectivity/connman/connman-gnome_0.5.bb9
3 files changed, 44 insertions, 17 deletions
diff --git a/meta/recipes-connectivity/connman/connman-gnome/connman-applet.desktop b/meta/recipes-connectivity/connman/connman-gnome/connman-applet.desktop
deleted file mode 100644
index 83d96ee67d..0000000000
--- a/meta/recipes-connectivity/connman/connman-gnome/connman-applet.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
1[Desktop Entry]
2Encoding=UTF-8
3Name=Connection Manager
4Comment=Connection Manager applet
5Icon=stock_internet
6Exec=connman-applet
7Terminal=false
8Type=Application
9Categories=Network;GTK;
10
diff --git a/meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch b/meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch
new file mode 100644
index 0000000000..2a8cff3593
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-gnome/remove-connman-property-desktop-file.patch
@@ -0,0 +1,42 @@
1diff -ruN connman-gnome-0.5-orig/po/POTFILES.in connman-gnome-0.5/po/POTFILES.in
2--- connman-gnome-0.5-orig/po/POTFILES.in 2010-12-16 16:03:29.000000000 +0800
3+++ connman-gnome-0.5/po/POTFILES.in 2010-12-17 10:27:17.000000000 +0800
4@@ -4,4 +4,3 @@
5 properties/advanced.c
6 properties/ethernet.c
7 properties/wifi.c
8-properties/connman-properties.desktop.in
9diff -ruN connman-gnome-0.5-orig/properties/Makefile.am connman-gnome-0.5/properties/Makefile.am
10--- connman-gnome-0.5-orig/properties/Makefile.am 2010-12-16 16:03:29.000000000 +0800
11+++ connman-gnome-0.5/properties/Makefile.am 2010-12-17 10:27:09.000000000 +0800
12@@ -17,16 +17,6 @@
13
14 INCLUDES = -I$(top_srcdir)/common
15
16-desktopdir = $(datadir)/applications
17-
18-desktop_in_files = connman-properties.desktop.in
19-
20-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
21-
22 @INTLTOOL_DESKTOP_RULE@
23
24-CLEANFILES = $(desktop_DATA)
25-
26-EXTRA_DIST = $(desktop_in_files)
27-
28 MAINTAINERCLEANFILES = Makefile.in
29diff -ruN connman-gnome-0.5-orig/properties/connman-properties.desktop.in connman-gnome-0.5/properties/connman-properties.desktop.in
30--- connman-gnome-0.5-orig/properties/connman-properties.desktop.in 2010-12-16 16:03:29.000000000 +0800
31+++ connman-gnome-0.5/properties/connman-properties.desktop.in 1970-01-01 08:00:00.000000000 +0800
32@@ -1,10 +0,0 @@
33-[Desktop Entry]
34-Encoding=UTF-8
35-_Name=Connection Management
36-_Comment=Configure connection management
37-Icon=stock_internet
38-Exec=connman-properties
39-Terminal=false
40-Type=Application
41-Categories=Settings;
42-OnlyShowIn=GNOME;
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
index 4729c5dfde..9dd1b4179f 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
@@ -6,20 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
6 file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \ 6 file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
7 file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a" 7 file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
8DEPENDS = "gtk+ dbus" 8DEPENDS = "gtk+ dbus"
9PR = "r1" 9PR = "r2"
10 10
11RRECOMMENDS_${PN} = "python python-dbus connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi connman-plugin-fake connman-plugin-bluetooth connman-plugin-dnsproxy" 11RRECOMMENDS_${PN} = "python python-dbus connman connman-plugin-ethernet connman-plugin-loopback connman-plugin-udhcp connman-plugin-wifi connman-plugin-fake connman-plugin-bluetooth connman-plugin-dnsproxy"
12 12
13SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \ 13SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \
14 file://connman-gnome.patch \ 14 file://connman-gnome.patch \
15 file://connman-applet.desktop" 15 file://remove-connman-property-desktop-file.patch"
16 16
17SRC_URI[md5sum] = "0e1c4c25d19cad9b08a216848a320716" 17SRC_URI[md5sum] = "0e1c4c25d19cad9b08a216848a320716"
18SRC_URI[sha256sum] = "4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c" 18SRC_URI[sha256sum] = "4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c"
19 19
20inherit autotools gtk-icon-cache 20inherit autotools gtk-icon-cache
21
22do_install_append() {
23 install -d ${D}${datadir}/applications/
24 install ${WORKDIR}/connman-applet.desktop ${D}${datadir}/applications/
25}