org.handhelds.familiar/packages/gpe-autostarter/gpe-autostarter-0.11/dbus-new-api.patch

   1 --- gpe-autostarter-0.11/autostarter.c.orig     2005-08-29 19:39:10 +0200
   2 +++ gpe-autostarter-0.11/autostarter.c  2005-08-29 19:42:01 +0200
   3 @@ -50,7 +50,11 @@
   4    if (type != DBUS_TYPE_STRING)
   5      return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
   6
   7 +#ifndef DBUS_INTERFACE_LOCAL
   8    subsys = dbus_message_iter_get_string (&iter);
   9 +#else
  10 +  dbus_message_iter_get_basic (&iter, &subsys);
  11 +#endif
  12
  13    if (!strcmp (subsys, "net"))
  14      return handle_net_message (message, &iter);
  15 @@ -72,7 +72,11 @@
  16      return autostarter_handle_dbus_request (connection, message);
  17
  18    if (dbus_message_is_signal (message,
  19 +#ifndef DBUS_INTERFACE_LOCAL
  20                                DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
  21 +#else
  22 +                              DBUS_INTERFACE_LOCAL,
  23 +#endif
  24                                "Disconnected"))
  25      exit (0);
  26
  27 --- gpe-autostarter-0.11/bluetooth.c.orig       2005-08-29 19:36:33 +0200
  28 +++ gpe-autostarter-0.11/bluetooth.c    2005-08-29 19:41:43 +0200
  29 @@ -40,7 +40,11 @@
  30    if (type != DBUS_TYPE_STRING)
  31      return;
  32
  33 +#ifndef DBUS_INTERFACE_LOCAL
  34    action = dbus_message_iter_get_string (iter);
  35 +#else
  36 +  dbus_message_iter_get_basic (iter, &action);
  37 +#endif
  38
  39    if (! strcmp (action, "register") || ! strcmp (action, "add"))
  40      {
  41 --- gpe-autostarter-0.11/net.c.orig     2005-08-29 19:36:29 +0200
  42 +++ gpe-autostarter-0.11/net.c  2005-08-29 19:41:29 +0200
  43 @@ -97,7 +97,11 @@
  44    if (type != DBUS_TYPE_STRING)
  45      return;
  46
  47 +#ifndef DBUS_INTERFACE_LOCAL
  48    action = dbus_message_iter_get_string (iter);
  49 +#else
  50 +  dbus_message_iter_get_basic (iter, &action);
  51 +#endif
  52
  53    if (! dbus_message_iter_next (iter))
  54      return;
  55 @@ -106,7 +106,11 @@
  56    if (type != DBUS_TYPE_STRING)
  57      return;
  58
  59 +#ifndef DBUS_INTERFACE_LOCAL
  60    interface = dbus_message_iter_get_string (iter);
  61 +#else
  62 +  dbus_message_iter_get_basic (iter, &interface);
  63 +#endif
  64
  65    if (! strcmp (action, "register") || ! strcmp (action, "add"))
  66      {