devel/GConf2/GConf2-2.14.0-timeout.patch

--- GConf-2.14.0/gconf/gconfd.c.timeout	2006-09-18 12:19:24.000000000 -0400
+++ GConf-2.14.0/gconf/gconfd.c	2006-09-18 12:21:30.000000000 -0400
@@ -1151,18 +1151,20 @@
 static gboolean
 no_databases_in_use (void)
 {
-  /* Only the default database still open, and
-   * it has no listeners
-   */
+  GList *l;
 
-  if (db_list == NULL)
-    return TRUE;
+  for (l = db_list; l; l = l->next)
+    {	
+      GConfDatabase *db = l->data;
 
-  if (db_list->next == NULL &&
-      db_list->data == default_db)
-    return gconf_listeners_count (default_db->listeners) == 0;
+      if (gconf_listeners_count (db->listeners) > 0)
+	return FALSE;
 
-  return FALSE;
+      if (db->sync_timeout || db->sync_idle)
+	return FALSE;
+    }
+
+  return TRUE;
 }
 
 void
1	--- GConf-2.14.0/gconf/gconfd.c.timeout 2006-09-18 12:19:24.000000000 -0400
2	+++ GConf-2.14.0/gconf/gconfd.c 2006-09-18 12:21:30.000000000 -0400
3	@@ -1151,18 +1151,20 @@
4	static gboolean
5	no_databases_in_use (void)
6	{
7	- /* Only the default database still open, and
8	- * it has no listeners
9	- */
10	+ GList *l;
11
12	- if (db_list == NULL)
13	- return TRUE;
14	+ for (l = db_list; l; l = l->next)
15	+ {
16	+ GConfDatabase *db = l->data;
17
18	- if (db_list->next == NULL &&
19	- db_list->data == default_db)
20	- return gconf_listeners_count (default_db->listeners) == 0;
21	+ if (gconf_listeners_count (db->listeners) > 0)
22	+ return FALSE;
23
24	- return FALSE;
25	+ if (db->sync_timeout \|\| db->sync_idle)
26	+ return FALSE;
27	+ }
28	+
29	+ return TRUE;
30	}
31
32	void
admin@fedoraproject.org	ViewVC Help
Powered by ViewVC 1.1.2