8 files changed, 83 insertions, 19 deletions

diff --git a/meta/recipes-connectivity/connman/connman-0.63/connman b/meta/recipes-connectivity/connman/connman-0.65/connman
index f01bf371c2..f01bf371c2 100644
--- a/meta/recipes-connectivity/connman/connman-0.63/connman
+++ b/meta/recipes-connectivity/connman/connman-0.65/connman
diff --git a/meta/recipes-connectivity/connman/connman-0.63/dbusperms.patch b/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch
index 100af0367b..100af0367b 100644
--- a/meta/recipes-connectivity/connman/connman-0.63/dbusperms.patch
+++ b/meta/recipes-connectivity/connman/connman-0.65/dbusperms.patch
diff --git a/meta/recipes-connectivity/connman/connman-0.63/fix-shutdown-ap-disconnect.patch b/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch
index a0ad0991df..a0ad0991df 100644
--- a/meta/recipes-connectivity/connman/connman-0.63/fix-shutdown-ap-disconnect.patch
+++ b/meta/recipes-connectivity/connman/connman-0.65/fix-shutdown-ap-disconnect.patch
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 @@
-[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;
-
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 @@
+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;
diff --git a/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch b/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch
new file mode 100644
index 0000000000..942cfc883c
--- /dev/null
+++ b/meta/recipes-connectivity/connman/connman-gnome/service_name_update.patch
@@ -0,0 +1,36 @@
+diff -ruN connman-gnome-0.5-orig/common/connman-dbus.h connman-gnome-0.5/common/connman-dbus.h
+--- connman-gnome-0.5-orig/common/connman-dbus.h        2010-12-30 09:45:03.312043457 +0800
++++ connman-gnome-0.5/common/connman-dbus.h     2010-12-30 09:45:33.978499439 +0800
+@@ -22,7 +22,7 @@
+ #include <dbus/dbus-glib.h>
+ #include <gtk/gtk.h>
+ 
+-#define CONNMAN_SERVICE                        "org.moblin.connman"
++#define CONNMAN_SERVICE                        "net.connman"
+ 
+ #define CONNMAN_ERROR_INTERFACE                CONNMAN_SERVICE ".Error"
+ #define CONNMAN_AGENT_INTERFACE                CONNMAN_SERVICE ".Agent"
+diff -ruN connman-gnome-0.5-orig/common/instance.c connman-gnome-0.5/common/instance.c
+--- connman-gnome-0.5-orig/common/instance.c    2010-12-30 09:45:03.316085542 +0800
++++ connman-gnome-0.5/common/instance.c 2010-12-30 09:46:01.654479049 +0800
+@@ -29,7 +29,7 @@
+ 
+ #include "instance.h"
+ 
+-#define CONNMAN_SERVICE    "org.moblin.connman"
++#define CONNMAN_SERVICE    "net.connman"
+ #define CONNMAN_INSTANCE   CONNMAN_SERVICE ".Instance"
+ 
+ static DBusGConnection *connection;
+diff -ruN connman-gnome-0.5-orig/common/instance.xml connman-gnome-0.5/common/instance.xml
+--- connman-gnome-0.5-orig/common/instance.xml  2010-12-30 09:45:03.312043457 +0800
++++ connman-gnome-0.5/common/instance.xml       2010-12-30 09:45:49.868372780 +0800
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+ 
+ <node name="/">
+-  <interface name="org.moblin.connman.Instance">
++  <interface name="net.connman.Instance">
+     <method name="Present">
+     </method>
+   </interface>
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
index 4729c5dfde..3b7d1b8f58 100644
--- a/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
+++ b/meta/recipes-connectivity/connman/connman-gnome_0.5.bb
@@ -6,20 +6,16 @@ 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 = "r3"
 
 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 \
+           file://service_name_update.patch"
 
 SRC_URI[md5sum] = "0e1c4c25d19cad9b08a216848a320716"
 SRC_URI[sha256sum] = "4d5fe481b444fc3e64fd9caa149dbcd76de166a25733f18fd93da01d2abf5d1c"
 
 inherit autotools gtk-icon-cache
-
-do_install_append() {
-        install -d ${D}${datadir}/applications/
-        install ${WORKDIR}/connman-applet.desktop ${D}${datadir}/applications/
-}
diff --git a/meta/recipes-connectivity/connman/connman_0.63.bb b/meta/recipes-connectivity/connman/connman_0.65.bb
index e99f7840af..0b077e1d98 100644
--- a/meta/recipes-connectivity/connman/connman_0.63.bb
+++ b/meta/recipes-connectivity/connman/connman_0.65.bb
@@ -24,5 +24,5 @@ SRC_URI  = "\
   file://connman \
 "
 
-SRC_URI[md5sum] = "11616a4fa1d03f96f0739730645f7c53"
-SRC_URI[sha256sum] = "e2a57376cdcd42b3876262da6959aa58428941e0eb2df9a4724cd3f1af934492"
+SRC_URI[md5sum] = "bd714da295ed2d2d91a49539f4c4fa3a"
+SRC_URI[sha256sum] = "a1c1d93da6bb4c2d8ae53293b06f237e02f5e796d2bba73ec639a466d05259c3"