diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-02-15 09:45:06 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-02-22 14:11:33 -0800 |
commit | fdcda41c5e339465818826f44c668d32be1bf831 (patch) | |
tree | fbef93c90a6703ffeb01dcbcd5c67b44fc73ac2a | |
parent | 6ceab2c76d03be91aebf6e2a5b7eb8a7bcc24a3e (diff) | |
download | poky-fdcda41c5e339465818826f44c668d32be1bf831.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 #683] for laverne build, which is similar as
Bug 506.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
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] | ||
2 | Encoding=UTF-8 | ||
3 | Name=Connection Manager | ||
4 | Comment=Connection Manager applet | ||
5 | Icon=stock_internet | ||
6 | Exec=connman-applet | ||
7 | Terminal=false | ||
8 | Type=Application | ||
9 | Categories=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 @@ | |||
1 | diff -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 | ||
9 | diff -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 | ||
29 | diff -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 7660048111..fd6b5e8e6f 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb | |||
@@ -6,17 +6,12 @@ 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" |
8 | DEPENDS = "gtk+ dbus" | 8 | DEPENDS = "gtk+ dbus" |
9 | PR = "r1" | 9 | PR = "r2" |
10 | 10 | ||
11 | RRECOMMENDS_${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" | 11 | RRECOMMENDS_${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 | ||
13 | SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \ | 13 | SRC_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 | ||
17 | inherit autotools gtk-icon-cache | 17 | inherit autotools gtk-icon-cache |
18 | |||
19 | do_install_append() { | ||
20 | install -d ${D}${datadir}/applications/ | ||
21 | install ${WORKDIR}/connman-applet.desktop ${D}${datadir}/applications/ | ||
22 | } | ||