luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

GPollFileMonitor: use thread default main context

Browse Source 
Attach the GPollFileMonitor to the thread default main context instead
of the global default.

This matches the behaviour of the other file monitors.
This commit is contained in:
Ryan Lortie 2015-01-16 16:41:21 -05:00
parent c5d5e2916b
commit 19522424b1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/gpollfilemonitor.c
View File

@ -35,7 +35,7 @@ struct _GPollFileMonitor
GFileMonitor parent_instance; GFileMonitor parent_instance;
GFile *file; GFile *file;
GFileInfo *last_info; GFileInfo *last_info;
guint timeout; GSource *timeout;
}; };
#define POLL_TIME_SECS 5 #define POLL_TIME_SECS 5
@ -171,8 +171,10 @@ poll_file_timeout (gpointer data)
static void static void
schedule_poll_timeout (GPollFileMonitor* poll_monitor) schedule_poll_timeout (GPollFileMonitor* poll_monitor)
{ {
poll_monitor->timeout = g_timeout_add_seconds (POLL_TIME_SECS, poll_file_timeout, poll_monitor); poll_monitor->timeout = g_timeout_source_new_seconds (POLL_TIME_SECS);
} g_source_set_callback (poll_monitor->timeout, poll_file_timeout, poll_monitor, NULL);
g_source_attach (poll_monitor->timeout, g_main_context_get_thread_default ());
}
static void static void
got_initial_info (GObject *source_object, got_initial_info (GObject *source_object,
@ -222,8 +224,9 @@ g_poll_file_monitor_cancel (GFileMonitor* monitor)
if (poll_monitor->timeout) if (poll_monitor->timeout)
{ {
g_source_remove (poll_monitor->timeout); g_source_destroy (poll_monitor->timeout);
poll_monitor->timeout = 0; g_source_unref (poll_monitor->timeout);
poll_monitor->timeout = NULL;
} }
return TRUE; return TRUE;