From 3bdd8a2c882ed3cd8d7aab48d2f3180a543d21a2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 28 Jul 2013 18:44:41 -0400 Subject: [PATCH] Use GLIB_PRIVATE_CALL macro I accidentally pushed the fix for bug 704873 before applying this cleanup. --- gio/inotify/inotify-kernel.c | 6 +++--- gio/inotify/inotify-missing.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gio/inotify/inotify-kernel.c b/gio/inotify/inotify-kernel.c index d59dc23..3c205a6 100644 --- a/gio/inotify/inotify-kernel.c +++ b/gio/inotify/inotify-kernel.c @@ -152,7 +152,7 @@ ik_source_check (GSource *source) timeout_source = g_timeout_source_new (TIMEOUT_MILLISECONDS); g_source_set_callback (timeout_source, ik_source_timeout, source, NULL); - g_source_attach (timeout_source, glib__private__ ()->g_get_worker_context ()); + g_source_attach (timeout_source, GLIB_PRIVATE_CALL (g_get_worker_context) ()); g_source_unref (timeout_source); return FALSE; @@ -218,7 +218,7 @@ gboolean _ik_startup (void (*cb)(ik_event_t *event)) g_source_set_name (source, "GIO Inotify"); g_source_add_poll (source, &ik_poll_fd); g_source_set_callback (source, ik_read_callback, NULL, NULL); - g_source_attach (source, glib__private__ ()->g_get_worker_context ()); + g_source_attach (source, GLIB_PRIVATE_CALL (g_get_worker_context) ()); g_source_unref (source); cookie_hash = g_hash_table_new (g_direct_hash, g_direct_equal); @@ -371,7 +371,7 @@ ik_read_callback (gpointer user_data) process_eq_running = TRUE; timeout_source = g_timeout_source_new (PROCESS_EVENTS_TIME); g_source_set_callback (timeout_source, ik_process_eq_callback, NULL, NULL); - g_source_attach (timeout_source, glib__private__ ()->g_get_worker_context ()); + g_source_attach (timeout_source, GLIB_PRIVATE_CALL (g_get_worker_context ())); g_source_unref (timeout_source); } diff --git a/gio/inotify/inotify-missing.c b/gio/inotify/inotify-missing.c index c127ab1..5ce241c 100644 --- a/gio/inotify/inotify-missing.c +++ b/gio/inotify/inotify-missing.c @@ -76,7 +76,7 @@ _im_add (inotify_sub *sub) scan_missing_running = TRUE; source = g_timeout_source_new_seconds (SCAN_MISSING_TIME); g_source_set_callback (source, im_scan_missing, NULL, NULL); - g_source_attach (source, glib__private__ ()->g_get_worker_context ()); + g_source_attach (source, GLIB_PRIVATE_CALL (g_get_worker_context) ()); g_source_unref (source); } } -- 2.7.4