summaryrefslogtreecommitdiff
path: root/gtk/gtkrecentmanager.c
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2007-06-19 10:59:37 +0000
committerEmmanuele Bassi <ebassi@src.gnome.org>2007-06-19 10:59:37 +0000
commitca0ad888922ab743d15e3991f822c8b08bf94bc1 (patch)
tree8daddcd17051edab0b848faf65056f4e08d04223 /gtk/gtkrecentmanager.c
parent232e79a6d79b90d99deb11e126373d493f3045f6 (diff)
downloadgtk+-ca0ad888922ab743d15e3991f822c8b08bf94bc1.tar.gz
Use g_timeout_add_seconds_full() for the timed poll of the storage file,
2007-06-19 Emmanuele Bassi <ebassi@gnome.org> * gtk/gtkrecentmanager.c: Use g_timeout_add_seconds_full() for the timed poll of the storage file, since we are using multiple seconds intervals and we don't actually care about millisecond precision. (threads_dispatch), (threads_free), (gtk_recent_manager_init), (gtk_recent_manager_set_filename): Roll our own version of gdk_threads_add_timeout() using g_timeout_add_seconds_full() while holding the GDK main lock. svn path=/trunk/; revision=18185
Diffstat (limited to 'gtk/gtkrecentmanager.c')
-rw-r--r--gtk/gtkrecentmanager.c65
1 files changed, 57 insertions, 8 deletions
diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index 8c0269947a..6f038fcd5f 100644
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -48,8 +48,8 @@
/* the file where we store the recently used items */
#define GTK_RECENTLY_USED_FILE ".recently-used.xbel"
-/* a poll every two seconds should be enough */
-#define POLL_DELTA 2000
+/* a poll approximately every five seconds */
+#define POLL_DELTA 5
/* return all items by default */
#define DEFAULT_LIMIT -1
@@ -59,6 +59,13 @@
typedef struct
{
+ GSourceFunc func;
+ gpointer data;
+ GDestroyNotify notify;
+} ThreadsDispatch;
+
+typedef struct
+{
gchar *name;
gchar *exec;
@@ -189,6 +196,32 @@ gtk_recent_manager_error_quark (void)
return g_quark_from_static_string ("gtk-recent-manager-error-quark");
}
+static gboolean
+threads_dispatch (gpointer data)
+{
+ ThreadsDispatch *dispatch = data;
+ gboolean res = FALSE;
+
+ GDK_THREADS_ENTER ();
+
+ if (!g_source_is_destroyed (g_main_current_source ()))
+ res = dispatch->func (dispatch->data);
+
+ GDK_THREADS_LEAVE ();
+
+ return res;
+}
+
+static void
+threads_free (gpointer data)
+{
+ ThreadsDispatch *dispatch = data;
+
+ if (dispatch->notify)
+ dispatch->notify (dispatch->data);
+
+ g_slice_free (ThreadsDispatch, dispatch);
+}
static void
gtk_recent_manager_class_init (GtkRecentManagerClass *klass)
@@ -277,6 +310,7 @@ static void
gtk_recent_manager_init (GtkRecentManager *manager)
{
GtkRecentManagerPrivate *priv;
+ ThreadsDispatch *dispatch;
priv = g_type_instance_get_private ((GTypeInstance *) manager,
GTK_TYPE_RECENT_MANAGER);
@@ -292,9 +326,16 @@ gtk_recent_manager_init (GtkRecentManager *manager)
priv->filename = g_build_filename (g_get_home_dir (),
GTK_RECENTLY_USED_FILE,
NULL);
- priv->poll_timeout = gdk_threads_add_timeout (POLL_DELTA,
- gtk_recent_manager_poll_timeout,
- manager);
+
+ dispatch = g_slice_new (ThreadsDispatch);
+ dispatch->func = gtk_recent_manager_poll_timeout;
+ dispatch->data = manager;
+ dispatch->notify = NULL;
+ priv->poll_timeout = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT + 30,
+ POLL_DELTA,
+ threads_dispatch,
+ dispatch,
+ threads_free);
build_recent_items_list (manager);
}
@@ -487,6 +528,7 @@ gtk_recent_manager_set_filename (GtkRecentManager *manager,
const gchar *filename)
{
GtkRecentManagerPrivate *priv;
+ ThreadsDispatch *dispatch;
g_assert (GTK_IS_RECENT_MANAGER (manager));
priv = manager->priv;
@@ -503,9 +545,16 @@ gtk_recent_manager_set_filename (GtkRecentManager *manager,
}
priv->filename = g_strdup (filename);
- priv->poll_timeout = gdk_threads_add_timeout (POLL_DELTA,
- gtk_recent_manager_poll_timeout,
- manager);
+
+ dispatch = g_slice_new (ThreadsDispatch);
+ dispatch->func = gtk_recent_manager_poll_timeout;
+ dispatch->data = manager;
+ dispatch->notify = NULL;
+ priv->poll_timeout = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT + 30,
+ POLL_DELTA,
+ threads_dispatch,
+ dispatch,
+ threads_free);
/* mark us clean, so that we can re-read the list
* of recently used resources