From fcef359f59ce7dd3b42a64ec4f0aef77dcd4fe16 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 3 Jan 2006 10:24:30 +0000
Subject: gpe-autostarter-0.11: dbus-0.60 support

---
 .../gpe-autostarter-0.11/.mtn2git_empty            |  0
 .../gpe-autostarter-0.11/dbus-new-api.patch        | 66 ++++++++++++++++++++++
 packages/gpe-autostarter/gpe-autostarter_0.11.bb   |  2 +
 3 files changed, 68 insertions(+)
 create mode 100644 packages/gpe-autostarter/gpe-autostarter-0.11/.mtn2git_empty
 create mode 100644 packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch

(limited to 'packages')

diff --git a/packages/gpe-autostarter/gpe-autostarter-0.11/.mtn2git_empty b/packages/gpe-autostarter/gpe-autostarter-0.11/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch b/packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch
new file mode 100644
index 0000000000..05fbdde501
--- /dev/null
+++ b/packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch
@@ -0,0 +1,66 @@
+--- gpe-autostarter-0.11/autostarter.c.orig	2005-08-29 19:39:10 +0200
++++ gpe-autostarter-0.11/autostarter.c	2005-08-29 19:42:01 +0200
+@@ -50,7 +50,11 @@
+   if (type != DBUS_TYPE_STRING)
+     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ 
++#ifndef DBUS_INTERFACE_LOCAL
+   subsys = dbus_message_iter_get_string (&iter);
++#else
++  dbus_message_iter_get_basic (&iter, &subsys);
++#endif
+ 
+   if (!strcmp (subsys, "net"))
+     return handle_net_message (message, &iter);
+@@ -72,7 +72,11 @@
+     return autostarter_handle_dbus_request (connection, message);
+   
+   if (dbus_message_is_signal (message,
++#ifndef DBUS_INTERFACE_LOCAL
+                               DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
++#else
++                              DBUS_INTERFACE_LOCAL,
++#endif
+                               "Disconnected"))
+     exit (0);
+   
+--- gpe-autostarter-0.11/bluetooth.c.orig	2005-08-29 19:36:33 +0200
++++ gpe-autostarter-0.11/bluetooth.c	2005-08-29 19:41:43 +0200
+@@ -40,7 +40,11 @@
+   if (type != DBUS_TYPE_STRING)
+     return;
+ 
++#ifndef DBUS_INTERFACE_LOCAL
+   action = dbus_message_iter_get_string (iter);
++#else
++  dbus_message_iter_get_basic (iter, &action);
++#endif
+ 
+   if (! strcmp (action, "register") || ! strcmp (action, "add"))
+     {
+--- gpe-autostarter-0.11/net.c.orig	2005-08-29 19:36:29 +0200
++++ gpe-autostarter-0.11/net.c	2005-08-29 19:41:29 +0200
+@@ -97,7 +97,11 @@
+   if (type != DBUS_TYPE_STRING)
+     return;
+ 
++#ifndef DBUS_INTERFACE_LOCAL
+   action = dbus_message_iter_get_string (iter);
++#else
++  dbus_message_iter_get_basic (iter, &action);
++#endif
+ 
+   if (! dbus_message_iter_next (iter))
+     return;
+@@ -106,7 +106,11 @@
+   if (type != DBUS_TYPE_STRING)
+     return;
+ 
++#ifndef DBUS_INTERFACE_LOCAL
+   interface = dbus_message_iter_get_string (iter);
++#else
++  dbus_message_iter_get_basic (iter, &interface);
++#endif
+ 
+   if (! strcmp (action, "register") || ! strcmp (action, "add"))
+     {
diff --git a/packages/gpe-autostarter/gpe-autostarter_0.11.bb b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
index 555134889b..e670c168d3 100644
--- a/packages/gpe-autostarter/gpe-autostarter_0.11.bb
+++ b/packages/gpe-autostarter/gpe-autostarter_0.11.bb
@@ -4,3 +4,5 @@ RDEPENDS = "hotplug-dbus"
 LICENSE = "GPL"
 
 inherit gpe
+	
+SRC_URI += " file://dbus-new-api.patch;patch=1"
-- 
cgit v1.2.3