dbus/patches/dbus-0.50-dnotify-watchdirs-1.patch

Index: bus/bus.c
===================================================================
RCS file: /cvs/dbus/dbus/bus/bus.c,v
retrieving revision 1.64
diff -u -r1.64 bus.c
--- bus/bus.c	16 Jun 2005 06:05:09 -0000	1.64
+++ bus/bus.c	2 Nov 2005 14:06:30 -0000
@@ -479,15 +479,11 @@
       goto failed;
     }
 
-  /* Drop existing conf-dir watches (if applicable) and watch all conf directories */
+  /* Drop existing conf-dir watches (if applicable) */
 
   if (is_reload)
     bus_drop_all_directory_watches ();
 
-  _dbus_list_foreach (bus_config_parser_get_conf_dirs (parser),
-		      (DBusForeachFunction) bus_watch_directory,
-		      NULL);
-
   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
   retval = TRUE;
 
@@ -497,9 +493,9 @@
 }
 
 static dbus_bool_t
-process_config_postinit (BusContext *context,
+process_config_postinit (BusContext      *context,
 			 BusConfigParser *parser,
-			 DBusError *error)
+			 DBusError       *error)
 {
   DBusHashTable *service_context_table;
 
@@ -512,6 +508,12 @@
     }
 
   _dbus_hash_table_unref (service_context_table);
+
+  /* Watch all conf directories */
+  _dbus_list_foreach (bus_config_parser_get_conf_dirs (parser),
+		      (DBusForeachFunction) bus_watch_directory,
+		      NULL);
+
   return TRUE;
 }
 
1	Index: bus/bus.c
2	===================================================================
3	RCS file: /cvs/dbus/dbus/bus/bus.c,v
4	retrieving revision 1.64
5	diff -u -r1.64 bus.c
6	--- bus/bus.c 16 Jun 2005 06:05:09 -0000 1.64
7	+++ bus/bus.c 2 Nov 2005 14:06:30 -0000
8	@@ -479,15 +479,11 @@
9	goto failed;
10	}
11
12	- /* Drop existing conf-dir watches (if applicable) and watch all conf directories */
13	+ /* Drop existing conf-dir watches (if applicable) */
14
15	if (is_reload)
16	bus_drop_all_directory_watches ();
17
18	- _dbus_list_foreach (bus_config_parser_get_conf_dirs (parser),
19	- (DBusForeachFunction) bus_watch_directory,
20	- NULL);
21	-
22	_DBUS_ASSERT_ERROR_IS_CLEAR (error);
23	retval = TRUE;
24
25	@@ -497,9 +493,9 @@
26	}
27
28	static dbus_bool_t
29	-process_config_postinit (BusContext *context,
30	+process_config_postinit (BusContext *context,
31	BusConfigParser *parser,
32	- DBusError *error)
33	+ DBusError *error)
34	{
35	DBusHashTable *service_context_table;
36
37	@@ -512,6 +508,12 @@
38	}
39
40	_dbus_hash_table_unref (service_context_table);
41	+
42	+ /* Watch all conf directories */
43	+ _dbus_list_foreach (bus_config_parser_get_conf_dirs (parser),
44	+ (DBusForeachFunction) bus_watch_directory,
45	+ NULL);
46	+
47	return TRUE;
48	}
49