diff options
| author | Ray Strode <rstrode@redhat.com> | 2008-05-14 13:51:45 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@src.gnome.org> | 2008-05-14 13:51:45 +0000 |
| commit | 7869493b6170a1c61fc503c4f1cd665fe49ccadd (patch) | |
| tree | 4c610c19c27eb60685297dbceef4d1d110087bef /backends | |
| parent | 16d66e5a078c80a1413c84a3e4f35bd2983aca55 (diff) | |
| download | gconf-7869493b6170a1c61fc503c4f1cd665fe49ccadd.tar.gz | |
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=/trunk/; revision=2596
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/markup-backend.c | 28 |
1 files changed, 0 insertions, 28 deletions
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); |