Blame SOURCES/workaround-crash.patch
|
 |
92be15 |
diff -up GConf-3.2.6/gconf/gconfd.c.workaround-crash GConf-3.2.6/gconf/gconfd.c
|
|
|
92be15 |
--- GConf-3.2.6/gconf/gconfd.c.workaround-crash 2013-04-15 10:12:54.480753142 -0400
|
|
|
92be15 |
+++ GConf-3.2.6/gconf/gconfd.c 2013-04-15 10:12:53.457736847 -0400
|
|
|
92be15 |
@@ -1076,17 +1076,6 @@ periodic_cleanup_timeout(gpointer data)
|
|
|
92be15 |
#endif
|
|
|
92be15 |
drop_old_databases ();
|
|
|
92be15 |
|
|
|
92be15 |
-#ifdef HAVE_DBUS
|
|
|
92be15 |
- if (no_databases_in_use () && gconfd_dbus_client_count () == 0)
|
|
|
92be15 |
-#else
|
|
|
92be15 |
- if (no_databases_in_use () && client_count () == 0)
|
|
|
92be15 |
-#endif
|
|
|
92be15 |
- {
|
|
|
92be15 |
- gconf_log (GCL_INFO, _("GConf server is not in use, shutting down."));
|
|
|
92be15 |
- gconfd_main_quit ();
|
|
|
92be15 |
- return FALSE;
|
|
|
92be15 |
- }
|
|
|
92be15 |
-
|
|
|
92be15 |
/* expire old locale cache entries */
|
|
|
92be15 |
gconfd_locale_cache_expire ();
|
|
|
92be15 |
|
|
|
92be15 |
@@ -1105,7 +1094,6 @@ periodic_cleanup_timeout(gpointer data)
|
|
|
92be15 |
|
|
|
92be15 |
return TRUE;
|
|
|
92be15 |
}
|
|
|
92be15 |
-
|
|
|
92be15 |
void
|
|
|
92be15 |
gconfd_need_log_cleanup (void)
|
|
|
92be15 |
{
|
|
|
92be15 |
@@ -1131,14 +1119,14 @@ gconf_main(void)
|
|
|
92be15 |
}
|
|
|
92be15 |
|
|
|
92be15 |
main_loops = g_slist_prepend(main_loops, loop);
|
|
|
92be15 |
+ main_loops = g_slist_prepend(main_loops, loop);
|
|
|
92be15 |
|
|
|
92be15 |
g_main_loop_run (loop);
|
|
|
92be15 |
|
|
|
92be15 |
main_loops = g_slist_remove(main_loops, loop);
|
|
|
92be15 |
|
|
|
92be15 |
- if (main_loops == NULL)
|
|
|
92be15 |
+ if (main_loops == NULL && timeout_id != 0)
|
|
|
92be15 |
{
|
|
|
92be15 |
- g_assert(timeout_id != 0);
|
|
|
92be15 |
g_source_remove(timeout_id);
|
|
|
92be15 |
timeout_id = 0;
|
|
|
92be15 |
}
|