gconf r2597 - in branches/gnome-2-22: . backends

[halfline svn gnome org]

Author: halfline
Date: Wed May 14 13:58:01 2008
New Revision: 2597
URL: http://svn.gnome.org/viewvc/gconf?rev=2597&view=rev

Log:
2008-05-14  Ray Strode  <rstrode redhat com>

	* configure.in: bump glib require to 2.14
	* backends/markup-backend.c (cleanup_timeout),
	(ms_new), (ms_destroy): remove some if 0'd code,
	and drop g_source_remove on non-existant timeout
	to prevent warning


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/backends/markup-backend.c
   branches/gnome-2-22/configure.in

Modified: branches/gnome-2-22/backends/markup-backend.c
==============================================================================
--- branches/gnome-2-22/backends/markup-backend.c	(original)
+++ branches/gnome-2-22/backends/markup-backend.c	Wed May 14 13:58:01 2008
@@ -59,7 +59,6 @@
 {
   GConfSource source; /* inherit from GConfSource */
   char *root_dir;
-  guint timeout_id;
   GConfLock* lock;
   MarkupTree *tree;
   guint dir_mode;
@@ -875,21 +874,6 @@
  *  MarkupSource
  */ 
 
-/* This timeout periodically unloads
- * data that hasn't been used in a while.
- */
-#if 0
-static gboolean
-cleanup_timeout (gpointer data)
-{
-  MarkupSource* ms = (MarkupSource*)data;
-
-  cache_clean(ms->cache, 60*5 /* 5 minutes */);
-  
-  return TRUE;
-}
-#endif
-
 static MarkupSource*
 ms_new (const char* root_dir,
         guint       dir_mode,
@@ -903,12 +887,6 @@
 
   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->root_dir = g_strdup (root_dir);
   
   ms->lock = lock;
@@ -943,12 +921,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: branches/gnome-2-22/configure.in
==============================================================================
--- branches/gnome-2-22/configure.in	(original)
+++ branches/gnome-2-22/configure.in	Wed May 14 13:58:01 2008
@@ -131,7 +131,7 @@
 
 AC_ARG_ENABLE(gtk, [  --enable-gtk          Enable GTK+ support (for gconf-sanity-check) [default=auto]], enable_gtk="$enableval", enable_gtk=auto)
 
-PKGCONFIG_MODULES='glib-2.0 > 2.9.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0 ORBit-2.0 >= 2.4.0'
+PKGCONFIG_MODULES='glib-2.0 > 2.14.0 gmodule-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0 ORBit-2.0 >= 2.4.0'
 PKGCONFIG_MODULES_WITH_XML="$PKGCONFIG_MODULES libxml-2.0"
 PKGCONFIG_MODULES_WITH_GTK=" $PKGCONFIG_MODULES gtk+-2.0 >= 2.0.0"
 PKGCONFIG_MODULES_WITH_XML_AND_GTK=" $PKGCONFIG_MODULES gtk+-2.0 libxml-2.0"