[Pkg-utopia-commits] r200 - in packages/gnome-volume-manager/trunk/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-04-11 19:49:32 +0000 (Mon, 11 Apr 2005)
New Revision: 200

Modified:
   packages/gnome-volume-manager/trunk/debian/changelog
   packages/gnome-volume-manager/trunk/debian/patches/11_dbus_reconnect_on_bus_exit.patch
Log:
Fix some potential crashers in the dbus reconnect patch

Modified: packages/gnome-volume-manager/trunk/debian/changelog
===================================================================
--- packages/gnome-volume-manager/trunk/debian/changelog	2005-04-11 16:30:14 UTC (rev 199)
+++ packages/gnome-volume-manager/trunk/debian/changelog	2005-04-11 19:49:32 UTC (rev 200)
@@ -1,3 +1,10 @@
+gnome-volume-manager (1.2.0-2) unstable; urgency=low
+
+  * debian/patches/11_dbus_reconnect_on_bus_exit.patch
+    + Updated. Fixes some potential crashers.
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 11 Apr 2005 21:47:21 +0200
+
 gnome-volume-manager (1.2.0-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/gnome-volume-manager/trunk/debian/patches/11_dbus_reconnect_on_bus_exit.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/11_dbus_reconnect_on_bus_exit.patch	2005-04-11 16:30:14 UTC (rev 199)
+++ packages/gnome-volume-manager/trunk/debian/patches/11_dbus_reconnect_on_bus_exit.patch	2005-04-11 19:49:32 UTC (rev 200)
@@ -1,6 +1,7 @@
-diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
---- gnome-volume-manager-old/src/manager.c	2004-11-18 15:05:30.129197000 +0100
-+++ gnome-volume-manager/src/manager.c	2004-11-18 15:05:30.417214796 +0100
+Files gnome-volume-manager-1.2.0-old/src/.swp and gnome-volume-manager-1.2.0/src/.swp differ
+diff -ruN gnome-volume-manager-1.2.0-old/src/manager.c gnome-volume-manager-1.2.0/src/manager.c
+--- gnome-volume-manager-1.2.0-old/src/manager.c	2005-04-11 21:17:39.000000000 +0200
++++ gnome-volume-manager-1.2.0/src/manager.c	2005-04-11 21:40:57.000000000 +0200
 @@ -51,6 +51,7 @@
  
  static struct gvm_configuration config;
@@ -19,7 +20,7 @@
  /*
   * gvm_load_config - synchronize gconf => config structure
   */
-@@ -904,6 +908,58 @@
+@@ -899,6 +903,59 @@
  {
  }
  
@@ -45,7 +46,6 @@
 +		return TRUE;
 +
 +	/* Too many retries; clean up and bail. */
-+	hal_shutdown (hal_ctx);
 +	gtk_main_quit ();
 +	return FALSE;
 +}
@@ -65,7 +65,9 @@
 +	                            DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
 +	                            "Disconnected")) {
 +		g_timeout_add(500, gvm_reconnect_to_hal, NULL);
-+		hal_shutdown (hal_ctx);
++		if (hal_ctx) {
++		  hal_shutdown (hal_ctx);
++		}
 +		hal_ctx = NULL;
 +		dbus_connection_unref (dbus_ctx);
 +		dbus_ctx = NULL;
@@ -78,7 +80,7 @@
  /** Invoked by libhal for integration with our mainloop. 
   *
   *  @param  ctx                 LibHal context
-@@ -913,7 +969,12 @@
+@@ -908,7 +965,12 @@
  hal_mainloop_integration (LibHalContext *ctx __attribute__((__unused__)),
  			  DBusConnection * dbus_connection)
  {
@@ -91,7 +93,7 @@
  }
  
  /** Internal HAL initialization function
-@@ -1037,7 +1098,12 @@
+@@ -1029,7 +1091,12 @@
  	char *device_file;
  	char *udi;
  
@@ -105,7 +107,7 @@
  
  	for (i = all_mounted_volumes; i != NULL; i = g_slist_next (i)) {
  
-@@ -1109,17 +1175,23 @@
+@@ -1101,17 +1168,23 @@
  	gtk_main_quit ();
  }
  
@@ -136,7 +138,7 @@
  
  	gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE,
  			    argc, argv, GNOME_PARAM_NONE);
-@@ -1140,7 +1212,7 @@
+@@ -1132,7 +1205,7 @@
  	gtk_signal_connect (GTK_OBJECT (client), "die",
  			    GTK_SIGNAL_FUNC (gvm_die), NULL);