luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add g_main_context_ref_thread_default()

Browse Source 
Add g_main_context_ref_thread_default(), which always returns a
reffed GMainContext, rather than sometimes returning a (non-reffed)
GMainContext, and sometimes returning NULL. This simplifies the
bookkeeping in any code that needs to keep a reference to the
thread-default context for a while.

https://bugzilla.gnome.org/show_bug.cgi?id=660994
This commit is contained in:
Dan Winship
2011-10-05 10:46:57 -04:00
parent d91769b641
commit 59f1f54655
15 changed files with 84 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gio/gdbusserver.c
View File

@@ -99,7 +99,7 @@ struct _GDBusServer
gboolean is_using_listener;
gulong run_signal_handler_id;
/* The result of g_main_context_get_thread_default() when the object
/* The result of g_main_context_ref_thread_default() when the object
* was created (the GObject _init() function) - this is used for delivery
* of the :new-connection GObject signal.
*/
@@ -183,8 +183,7 @@ g_dbus_server_finalize (GObject *object)
*/
g_free (server->nonce_file);
if (server->main_context_at_construction != NULL)
g_main_context_unref (server->main_context_at_construction);
g_main_context_unref (server->main_context_at_construction);
G_OBJECT_CLASS (g_dbus_server_parent_class)->finalize (object);
}
@@ -434,9 +433,7 @@ g_dbus_server_class_init (GDBusServerClass *klass)
static void
g_dbus_server_init (GDBusServer *server)
{
server->main_context_at_construction = g_main_context_get_thread_default ();
if (server->main_context_at_construction != NULL)
g_main_context_ref (server->main_context_at_construction);
server->main_context_at_construction = g_main_context_ref_thread_default ();
}
static gboolean