NetworkManager-dbus.patch

   1 diff -urN NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c NetworkManager-0.6.4.new/gnome/libnm_glib/libnm_glib.c
   2 --- NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c  2006-05-05 17:36:46.000000000 +0200
   3 +++ NetworkManager-0.6.4.new/gnome/libnm_glib/libnm_glib.c      2007-01-13 11:41:16.978873626 +0100
   4 @@ -230,7 +230,7 @@
   5         {
   6                 /* Try to reactivate our connection to dbus on the next pass through the event loop */
   7                 ctx->nm_state = LIBNM_NO_DBUS;
   8 -               dbus_connection_disconnect (ctx->dbus_con);
   9 +               dbus_connection_close (ctx->dbus_con);
  10                 libnm_glib_schedule_dbus_watcher (ctx);
  11         }
  12         else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
  13 @@ -444,7 +444,7 @@
  14                 g_main_loop_unref (ctx->g_main_loop);
  15
  16         if (ctx->dbus_con)
  17 -               dbus_connection_disconnect (ctx->dbus_con);
  18 +               dbus_connection_close (ctx->dbus_con);
  19
  20         if (ctx->callbacks_lock)
  21                 g_mutex_free (ctx->callbacks_lock);
  22 diff -urN NetworkManager-0.6.4/src/NetworkManagerDbus.c NetworkManager-0.6.4.new/src/NetworkManagerDbus.c
  23 --- NetworkManager-0.6.4/src/NetworkManagerDbus.c       2006-05-21 19:28:02.000000000 +0200
  24 +++ NetworkManager-0.6.4.new/src/NetworkManagerDbus.c   2007-01-13 11:41:34.618873626 +0100
  25 @@ -831,7 +831,7 @@
  26         }
  27
  28         dbus_error_init (&error);
  29 -#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
  30 +#if ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) || DBUS_VERSION_MAJOR > 0)
  31         flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;    /* Prohibit replacement is now the default */
  32  #else
  33         flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;