org.handhelds.familiar/packages/gnome/gnome-vfs-dbus/dbus-api-change.patch

   1 --- trunk/dbus-daemon/vfs-daemon.c.orig 2006-08-09 10:43:26.000000000 +0100
   2 +++ trunk/dbus-daemon/vfs-daemon.c      2006-08-09 10:45:59.000000000 +0100
   3 @@ -91,7 +91,7 @@
   4                 g_warning ("Failed to acquire vfs-daemon service: %s", error.message);
   5                 dbus_error_free (&error);
   6
   7 -               dbus_connection_disconnect (conn);
   8 +               dbus_connection_close (conn);
   9                 dbus_connection_unref (conn);
  10                 conn = NULL;
  11
  12 @@ -101,7 +101,7 @@
  13         if (ret == DBUS_REQUEST_NAME_REPLY_EXISTS) {
  14                 g_printerr ("VFS daemon already running, exiting.\n");
  15
  16 -               dbus_connection_disconnect (conn);
  17 +               dbus_connection_close (conn);
  18                 dbus_connection_unref (conn);
  19                 conn = NULL;
  20
  21 @@ -111,7 +111,7 @@
  22         if (ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
  23                 g_printerr ("Not primary owner of the service, exiting.\n");
  24
  25 -               dbus_connection_disconnect (conn);
  26 +               dbus_connection_close (conn);
  27                 dbus_connection_unref (conn);
  28                 conn = NULL;
  29
  30 @@ -124,7 +124,7 @@
  31                                                    NULL)) {
  32                 g_printerr ("Failed to register object with D-BUS.\n");
  33
  34 -               dbus_connection_disconnect (conn);
  35 +               dbus_connection_close (conn);
  36                 dbus_connection_unref (conn);
  37                 conn = NULL;
  38
  39 @@ -152,7 +152,7 @@
  40                 return;
  41         }
  42
  43 -       dbus_connection_disconnect (conn);
  44 +       dbus_connection_close (conn);
  45         dbus_connection_unref (conn);
  46  }
  47
  48 --- trunk/dbus-daemon/daemon-connection.c.orig  2006-08-09 10:43:32.000000000 +0100
  49 +++ trunk/dbus-daemon/daemon-connection.c       2006-08-09 10:46:26.000000000 +0100
  50 @@ -321,7 +321,7 @@
  51         d(g_print ("Last unref\n"));
  52
  53         if (dbus_connection_get_is_connected (conn->conn)) {
  54 -               dbus_connection_disconnect (conn->conn);
  55 +               dbus_connection_close (conn->conn);
  56         }
  57         dbus_connection_unref (conn->conn);
  58
  59 --- trunk/dbus-daemon/dbus-method.c.orig        2006-08-09 10:43:38.000000000 +0100
  60 +++ trunk/dbus-daemon/dbus-method.c     2006-08-09 10:46:57.000000000 +0100
  61 @@ -220,7 +220,7 @@
  62         if (!dbus_connection_add_filter (dbus_conn, message_handler,
  63                                          NULL, NULL)) {
  64                 g_warning ("Failed to add filter to the connection.");
  65 -               dbus_connection_disconnect (dbus_conn);
  66 +               dbus_connection_close (dbus_conn);
  67                 dbus_connection_unref (dbus_conn);
  68
  69                 dbus_conn = NULL;
  70 @@ -1666,7 +1666,7 @@
  71  vfs_module_shutdown (GnomeVFSMethod* method)
  72  {
  73         if (dbus_conn) {
  74 -               dbus_connection_disconnect (dbus_conn);
  75 +               dbus_connection_close (dbus_conn);
  76                 dbus_connection_unref (dbus_conn);
  77
  78                 dbus_conn = NULL;