summaryrefslogtreecommitdiff
path: root/packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch
blob: 05fbdde501f129419ebcb11c7a89d4b681d2c421 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
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"))
     {