gnome-volume-manager/patches/gnome-volume-manager-1.3.3-reconnect_dbus.patch

diff -urN gnome-volume-manager-1.3.3.orig/src/manager.c gnome-volume-manager-1.3.3/src/manager.c
--- gnome-volume-manager-1.3.3.orig/src/manager.c	2005-07-25 13:32:13.000000000 -0500
+++ gnome-volume-manager-1.3.3/src/manager.c	2005-07-25 13:36:01.000000000 -0500
@@ -48,7 +48,8 @@
 #define NAUTILUS_COMMAND	 BIN_NAUTILUS" -n --no-desktop %m"
 
 static struct gvm_configuration config;
-static LibHalContext *hal_ctx;
+static LibHalContext *hal_ctx = NULL;
+static DBusConnection *dbus_connection = NULL;
 
 #ifndef ASSUME_SUBMOUNT
 /** Table of UDI's for volumes being mounted by g-v-m that we need to apply policy to */
@@ -1379,6 +1380,73 @@
 {
 }
 
+static LibHalContext * gvm_do_hal_init ();
+
+/** Invoked by gvm_do_filter_dbus_msg in response to a D-BUS disconnect event.
+ *
+ * @param  data                 Context pointer
+ * @return true if it should be tried again, false if success or failure.
+ */
+static gboolean
+gvm_reconnect_to_hal (gpointer data __attribute__((__unused__)))
+{
+       static unsigned int retries = 0;
+       DBusError error;
+
+       dbg ("Trying a reconnect ...\n");
+       hal_ctx = gvm_do_hal_init ();
+       if (hal_ctx != NULL) {
+               dbg ("Reconnected OK.\n");
+               retries = 0;
+               return FALSE;
+       } else if (dbus_connection){
+               /* shut down dbus connection to try it again */
+               dbus_connection_unref (dbus_connection);
+               dbus_connection = NULL;
+       }
+
+       /* Retry later if it failed. */
+       if (retries++ < 100)
+               return TRUE;
+
+       /* Too many retries; clean up and bail. */
+       warn("gvm_reconnect_to_hal: no reconnection after 100 retries, exiting\n");
+       libhal_ctx_shutdown (hal_ctx, &error);
+       libhal_ctx_free (hal_ctx);
+       hal_ctx = NULL;
+       gtk_main_quit ();
+       return FALSE;
+}
+
+/** Invoked by D-BUS to filter messages.
+ *
+ * @param  connection  D-BUS connection
+ * @param  message     D-BUS message
+ * @param  user_data   Context pointer
+ */
+static DBusHandlerResult
+gvm_do_filter_dbus_msg (DBusConnection *connection __attribute__((__unused__)),
+                        DBusMessage *message,
+                        void *user_data __attribute__((__unused__)))
+{
+       DBusError error;
+       
+       if (dbus_message_is_signal (message,
+                                   DBUS_INTERFACE_LOCAL,
+                                   "Disconnected")) {
+               dbg("gvm_do_filter_dbus_msg: received Disconnected message\n");
+               g_timeout_add(500, gvm_reconnect_to_hal, NULL);
+               libhal_ctx_shutdown (hal_ctx, &error);
+               libhal_ctx_free (hal_ctx);
+               hal_ctx = NULL;
+               dbus_connection_unref (dbus_connection);
+               dbus_connection = NULL;
+               return DBUS_HANDLER_RESULT_HANDLED;
+       }
+       else
+               return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+}
+
 /** Integrate a dbus mainloop. 
  *
  *  @param  ctx                 LibHal context
@@ -1389,14 +1457,15 @@
 static dbus_bool_t 
 hal_mainloop_integration (LibHalContext *ctx, DBusError *error)
 {
-	DBusConnection *dbus_connection;
-
 	dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, error);
 
 	if (dbus_error_is_set (error))
 		return FALSE;
+
+        dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
 	
         dbus_connection_setup_with_g_main (dbus_connection, NULL);
+        dbus_connection_add_filter (dbus_connection, gvm_do_filter_dbus_msg, NULL, NULL);
 
 	libhal_ctx_set_dbus_connection (ctx, dbus_connection);
 	
@@ -1556,6 +1625,10 @@
 	DBusError error;
 	GSList *l;
 	
+        if (ctx == NULL) {
+            warn("unmount_all: No hal connection! can't unmount volumes\n");
+            return;
+        }
 	dbg ("unmounting all volumes that we saw mounted in our life\n");
 	dbus_error_init (&error);
 	for (l = mounted_volumes; l != NULL; l = g_slist_next (l)) {
1	diff -urN gnome-volume-manager-1.3.3.orig/src/manager.c gnome-volume-manager-1.3.3/src/manager.c
2	--- gnome-volume-manager-1.3.3.orig/src/manager.c 2005-07-25 13:32:13.000000000 -0500
3	+++ gnome-volume-manager-1.3.3/src/manager.c 2005-07-25 13:36:01.000000000 -0500
4	@@ -48,7 +48,8 @@
5	#define NAUTILUS_COMMAND BIN_NAUTILUS" -n --no-desktop %m"
6
7	static struct gvm_configuration config;
8	-static LibHalContext *hal_ctx;
9	+static LibHalContext *hal_ctx = NULL;
10	+static DBusConnection *dbus_connection = NULL;
11
12	#ifndef ASSUME_SUBMOUNT
13	/** Table of UDI's for volumes being mounted by g-v-m that we need to apply policy to */
14	@@ -1379,6 +1380,73 @@
15	{
16	}
17
18	+static LibHalContext * gvm_do_hal_init ();
19	+
20	+/** Invoked by gvm_do_filter_dbus_msg in response to a D-BUS disconnect event.
21	+ *
22	+ * @param data Context pointer
23	+ * @return true if it should be tried again, false if success or failure.
24	+ */
25	+static gboolean
26	+gvm_reconnect_to_hal (gpointer data __attribute__((__unused__)))
27	+{
28	+ static unsigned int retries = 0;
29	+ DBusError error;
30	+
31	+ dbg ("Trying a reconnect ...\n");
32	+ hal_ctx = gvm_do_hal_init ();
33	+ if (hal_ctx != NULL) {
34	+ dbg ("Reconnected OK.\n");
35	+ retries = 0;
36	+ return FALSE;
37	+ } else if (dbus_connection){
38	+ /* shut down dbus connection to try it again */
39	+ dbus_connection_unref (dbus_connection);
40	+ dbus_connection = NULL;
41	+ }
42	+
43	+ /* Retry later if it failed. */
44	+ if (retries++ < 100)
45	+ return TRUE;
46	+
47	+ /* Too many retries; clean up and bail. */
48	+ warn("gvm_reconnect_to_hal: no reconnection after 100 retries, exiting\n");
49	+ libhal_ctx_shutdown (hal_ctx, &error);
50	+ libhal_ctx_free (hal_ctx);
51	+ hal_ctx = NULL;
52	+ gtk_main_quit ();
53	+ return FALSE;
54	+}
55	+
56	+/** Invoked by D-BUS to filter messages.
57	+ *
58	+ * @param connection D-BUS connection
59	+ * @param message D-BUS message
60	+ * @param user_data Context pointer
61	+ */
62	+static DBusHandlerResult
63	+gvm_do_filter_dbus_msg (DBusConnection *connection __attribute__((__unused__)),
64	+ DBusMessage *message,
65	+ void *user_data __attribute__((__unused__)))
66	+{
67	+ DBusError error;
68	+
69	+ if (dbus_message_is_signal (message,
70	+ DBUS_INTERFACE_LOCAL,
71	+ "Disconnected")) {
72	+ dbg("gvm_do_filter_dbus_msg: received Disconnected message\n");
73	+ g_timeout_add(500, gvm_reconnect_to_hal, NULL);
74	+ libhal_ctx_shutdown (hal_ctx, &error);
75	+ libhal_ctx_free (hal_ctx);
76	+ hal_ctx = NULL;
77	+ dbus_connection_unref (dbus_connection);
78	+ dbus_connection = NULL;
79	+ return DBUS_HANDLER_RESULT_HANDLED;
80	+ }
81	+ else
82	+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
83	+}
84	+
85	/** Integrate a dbus mainloop.
86	*
87	* @param ctx LibHal context
88	@@ -1389,14 +1457,15 @@
89	static dbus_bool_t
90	hal_mainloop_integration (LibHalContext ctx, DBusError error)
91	{
92	- DBusConnection *dbus_connection;
93	-
94	dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, error);
95
96	if (dbus_error_is_set (error))
97	return FALSE;
98	+
99	+ dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
100
101	dbus_connection_setup_with_g_main (dbus_connection, NULL);
102	+ dbus_connection_add_filter (dbus_connection, gvm_do_filter_dbus_msg, NULL, NULL);
103
104	libhal_ctx_set_dbus_connection (ctx, dbus_connection);
105
106	@@ -1556,6 +1625,10 @@
107	DBusError error;
108	GSList *l;
109
110	+ if (ctx == NULL) {
111	+ warn("unmount_all: No hal connection! can't unmount volumes\n");
112	+ return;
113	+ }
114	dbg ("unmounting all volumes that we saw mounted in our life\n");
115	dbus_error_init (&error);
116	for (l = mounted_volumes; l != NULL; l = g_slist_next (l)) {