[maemo-commits] [maemo-commits] r18963 - in projects/haf/trunk/gconf2: backends debian

[From: subversion at stage.maemo.org]

Author: richard
Date: 2009-07-23 14:44:27 +0300 (Thu, 23 Jul 2009)
New Revision: 18963

Modified:
   projects/haf/trunk/gconf2/backends/markup-backend.c
   projects/haf/trunk/gconf2/debian/changelog
Log:
Remove unused timeout

Modified: projects/haf/trunk/gconf2/backends/markup-backend.c
===================================================================
--- projects/haf/trunk/gconf2/backends/markup-backend.c	2009-07-23 11:38:25 UTC (rev 18962)
+++ projects/haf/trunk/gconf2/backends/markup-backend.c	2009-07-23 11:44:27 UTC (rev 18963)
@@ -59,7 +59,6 @@
 {
   GConfSource source; /* inherit from GConfSource */
   char *root_dir;
-  guint timeout_id;
   GConfLock* lock;
   MarkupTree *tree;
   guint dir_mode;
@@ -877,21 +876,6 @@
  *  MarkupSource
  */ 
 
-/* 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;
-}
-
 static MarkupSource*
 ms_new (const char* root_dir,
         guint       dir_mode,
@@ -905,10 +889,6 @@
 
   ms = g_new0(MarkupSource, 1);
 
-  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;
@@ -943,12 +923,6 @@
       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);
 
   g_free (ms->root_dir);

Modified: projects/haf/trunk/gconf2/debian/changelog
===================================================================
--- projects/haf/trunk/gconf2/debian/changelog	2009-07-23 11:38:25 UTC (rev 18962)
+++ projects/haf/trunk/gconf2/debian/changelog	2009-07-23 11:44:27 UTC (rev 18963)
@@ -1,3 +1,9 @@
+gconf2 (2.16.0-2osso6) unstable; urgency=low
+
+  * Fixes: NB#129551, gconfd is waking up from time to time
+
+ -- Richard Hult <richard at imendio.com>  Thu, 23 Jul 2009 13:42:00 +0100
+
 gconf2 (2.16.0-2osso5) unstable; urgency=low
 
   * Merge optimizations to the markup backup from upstream