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>
This commit is contained in:
Dongxiao Xu 2011-02-15 09:45:06 +08:00 committed by Saul Wold
parent 6ceab2c76d
commit fdcda41c5e
3 changed files with 44 additions and 17 deletions

View File

@ -1,10 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Name=Connection Manager
Comment=Connection Manager applet
Icon=stock_internet
Exec=connman-applet
Terminal=false
Type=Application
Categories=Network;GTK;

View File

@ -0,0 +1,42 @@
diff -ruN connman-gnome-0.5-orig/po/POTFILES.in connman-gnome-0.5/po/POTFILES.in
--- connman-gnome-0.5-orig/po/POTFILES.in 2010-12-16 16:03:29.000000000 +0800
+++ connman-gnome-0.5/po/POTFILES.in 2010-12-17 10:27:17.000000000 +0800
@@ -4,4 +4,3 @@
properties/advanced.c
properties/ethernet.c
properties/wifi.c
-properties/connman-properties.desktop.in
diff -ruN connman-gnome-0.5-orig/properties/Makefile.am connman-gnome-0.5/properties/Makefile.am
--- connman-gnome-0.5-orig/properties/Makefile.am 2010-12-16 16:03:29.000000000 +0800
+++ connman-gnome-0.5/properties/Makefile.am 2010-12-17 10:27:09.000000000 +0800
@@ -17,16 +17,6 @@
INCLUDES = -I$(top_srcdir)/common
-desktopdir = $(datadir)/applications
-
-desktop_in_files = connman-properties.desktop.in
-
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
@INTLTOOL_DESKTOP_RULE@
-CLEANFILES = $(desktop_DATA)
-
-EXTRA_DIST = $(desktop_in_files)
-
MAINTAINERCLEANFILES = Makefile.in
diff -ruN connman-gnome-0.5-orig/properties/connman-properties.desktop.in connman-gnome-0.5/properties/connman-properties.desktop.in
--- connman-gnome-0.5-orig/properties/connman-properties.desktop.in 2010-12-16 16:03:29.000000000 +0800
+++ connman-gnome-0.5/properties/connman-properties.desktop.in 1970-01-01 08:00:00.000000000 +0800
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-_Name=Connection Management
-_Comment=Configure connection management
-Icon=stock_internet
-Exec=connman-properties
-Terminal=false
-Type=Application
-Categories=Settings;
-OnlyShowIn=GNOME;

View File

@ -6,17 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
file://properties/main.c;beginline=1;endline=20;md5=50c77c81871308b033ab7a1504626afb \
file://common/connman-dbus.c;beginline=1;endline=20;md5=de6b485c0e717a0236402d220187717a"
DEPENDS = "gtk+ dbus"
PR = "r1"
PR = "r2"
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"
SRC_URI = "http://www.kernel.org/pub/linux/network/connman/connman-gnome-${PV}.tar.gz \
file://connman-gnome.patch \
file://connman-applet.desktop"
file://remove-connman-property-desktop-file.patch"
inherit autotools gtk-icon-cache
do_install_append() {
install -d ${D}${datadir}/applications/
install ${WORKDIR}/connman-applet.desktop ${D}${datadir}/applications/
}