From dda7f28432d231bd7324e7a5c40121456e585904 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Wed, 14 May 2008 13:38:50 +0000
Subject: [PATCH] - update add_seconds patch to not remove timeouts that aren't
 created     anymore

---
 GConf2.spec          |  6 +++-
 gconf-timeouts.patch | 77 ++++++++++++++++++++++++++++----------------
 2 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/GConf2.spec b/GConf2.spec
index b348eb1..053f75b 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.22.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.22/GConf-%{version}.tar.bz2
@@ -160,6 +160,10 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed May 14 2008 Ray Strode <rstrode@redhat.com> - 2.22.0-7
+- update add_seconds patch to not remove timeouts that aren't
+  created anymore
+
 * Mon May 12 2008 Ray Strode <rstrode@redhat.com> - 2.22.0-6
 - If the session bus isn't running, don't autolaunch it unless
   we also want to autostart gconfd.
diff --git a/gconf-timeouts.patch b/gconf-timeouts.patch
index 197ae68..fc87c5d 100644
--- a/gconf-timeouts.patch
+++ b/gconf-timeouts.patch
@@ -1,41 +1,62 @@
 diff -up GConf-2.22.0/backends/markup-backend.c.timeouts GConf-2.22.0/backends/markup-backend.c
---- GConf-2.22.0/backends/markup-backend.c.timeouts	2008-05-02 09:36:25.000000000 -0400
-+++ GConf-2.22.0/backends/markup-backend.c	2008-05-02 09:36:46.000000000 -0400
-@@ -878,17 +878,17 @@ gconf_backend_get_vtable (void)
- /* This timeout periodically unloads
-  * data that hasn't been used in a while.
-  */
-+#if 0
- static gboolean
- cleanup_timeout (gpointer data)
+--- GConf-2.22.0/backends/markup-backend.c.timeouts	2007-06-25 07:11:19.000000000 -0400
++++ GConf-2.22.0/backends/markup-backend.c	2008-05-14 09:33:04.000000000 -0400
+@@ -59,7 +59,6 @@ typedef struct
  {
--#if 0
-   MarkupSource* ms = (MarkupSource*)data;
+   GConfSource source; /* inherit from GConfSource */
+   char *root_dir;
+-  guint timeout_id;
+   GConfLock* lock;
+   MarkupTree *tree;
+   guint dir_mode;
+@@ -875,21 +874,6 @@ gconf_backend_get_vtable (void)
+  *  MarkupSource
+  */ 
  
-   cache_clean(ms->cache, 60*5 /* 5 minutes */);
+-/* This timeout periodically unloads
+- * data that hasn't been used in a while.
+- */
+-static gboolean
+-cleanup_timeout (gpointer data)
+-{
+-#if 0
+-  MarkupSource* ms = (MarkupSource*)data;
+-
+-  cache_clean(ms->cache, 60*5 /* 5 minutes */);
 -#endif
-   
-   return TRUE;
- }
-+#endif
- 
+-  
+-  return TRUE;
+-}
+-
  static MarkupSource*
  ms_new (const char* root_dir,
-@@ -903,9 +903,11 @@ ms_new (const char* root_dir,
+         guint       dir_mode,
+@@ -903,10 +887,6 @@ ms_new (const char* root_dir,
  
    ms = g_new0(MarkupSource, 1);
  
-+#if 0
-   ms->timeout_id = g_timeout_add (1000*60*5, /* 1 sec * 60 s/min * 5 min */
-                                   cleanup_timeout,
-                                   ms);
-+#endif
- 
+-  ms->timeout_id = g_timeout_add (1000*60*5, /* 1 sec * 60 s/min * 5 min */
+-                                  cleanup_timeout,
+-                                  ms);
+-
    ms->root_dir = g_strdup (root_dir);
    
+   ms->lock = lock;
+@@ -941,11 +921,6 @@ ms_destroy (MarkupSource* ms)
+       error = NULL;
+     }
+   
+-  if (!g_source_remove (ms->timeout_id))
+-    {
+-      /* should not happen, don't translate */
+-      gconf_log (GCL_ERR, "timeout not found to remove?");
+-    }
+ 
+   markup_tree_unref (ms->tree);
+ 
 diff -up GConf-2.22.0/gconf/gconf-database.c.timeouts GConf-2.22.0/gconf/gconf-database.c
---- GConf-2.22.0/gconf/gconf-database.c.timeouts	2008-05-02 09:37:52.000000000 -0400
-+++ GConf-2.22.0/gconf/gconf-database.c	2008-05-02 09:38:12.000000000 -0400
+--- GConf-2.22.0/gconf/gconf-database.c.timeouts	2008-01-08 09:28:38.000000000 -0500
++++ GConf-2.22.0/gconf/gconf-database.c	2008-05-14 09:29:17.000000000 -0400
 @@ -1008,7 +1008,7 @@ gconf_database_schedule_sync(GConfDataba
    else
      {
@@ -46,8 +67,8 @@ diff -up GConf-2.22.0/gconf/gconf-database.c.timeouts GConf-2.22.0/gconf/gconf-d
  }
  
 diff -up GConf-2.22.0/gconf/gconfd.c.timeouts GConf-2.22.0/gconf/gconfd.c
---- GConf-2.22.0/gconf/gconfd.c.timeouts	2008-05-02 09:36:57.000000000 -0400
-+++ GConf-2.22.0/gconf/gconfd.c	2008-05-02 09:37:43.000000000 -0400
+--- GConf-2.22.0/gconf/gconfd.c.timeouts	2008-05-14 09:29:17.000000000 -0400
++++ GConf-2.22.0/gconf/gconfd.c	2008-05-14 09:29:17.000000000 -0400
 @@ -910,12 +910,12 @@ gconf_main(void)
  
    if (main_loops == NULL)