bump glib require to 2.14 remove some if 0'd code, and drop

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

svn path=/branches/gnome-2-22/; revision=2597

3 files changed, 8 insertions, 53 deletions

diff --git a/ChangeLog b/ChangeLog
index 54e52156..756a48ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,27 +1,10 @@
-2008-05-09  Ray Strode  <rstrode@redhat.com>
-
-	Tie gconf daemon to session bus and drop use daemon
-	GetIOR() method instead of /tmp/something/ior to
-	tell clients about ior (bugs 141138 and 507310)
-
-	* configure.in: depend on dbus
-	* gconf/gconfd.c (get_introspection_xml),
-	(bus_message_handler), (get_on_d_bus), (main):
-	Connect to message bus, take org.gnome.GConf name,
-	and export GetIOR() method.  Quit, when session quits.
-	* Makefile.am:
-	* gconf/org.gnome.GConf.server.in: new service file to
-	support session bus activation
-	* gconf/gconf-sanity-check.c (offer_delete_locks):
-	Daemon doesn't have a lock anymore, so need to try to
-	blow it away.
-	* gconf/gcon-internals.c (read_current_server_and_set_warning),
-	(read_current_server), (gconf_get_current_lock_holder),
-	(gconf_daemon_blow_away_locks), (set_cloexec),
-	(close_fd_func): dropped functions dealing with files in /tmp
-	(get_ior), (gconf_get_server), (gconf_get_lock_or_current_holder),
-	(gconf_activate_server: call GetIOR method instead of of reading
-	 /tmp/gconf-$USER/ior
+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
 
 2008-05-07  Kjartan Maraas  <kmaraas@gnome.org>
 
diff --git a/backends/markup-backend.c b/backends/markup-backend.c
index d867c876..86ceb13f 100644
--- a/backends/markup-backend.c
+++ b/backends/markup-backend.c
@@ -59,7 +59,6 @@ typedef struct
 {
   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
  */ 
 
-/* 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_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->root_dir = g_strdup (root_dir);
   
   ms->lock = lock;
@@ -943,12 +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);
 
   g_free (ms->root_dir);
diff --git a/configure.in b/configure.in
index fa16d25a..a3cc1b92 100644
--- a/configure.in
+++ b/configure.in
@@ -131,7 +131,7 @@ GTK_DOC_CHECK([1.0])
 
 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 dbus-1 >= 1.0.0 dbus-glib-1 >= 0.74'
+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"