luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDBus: Take a reference to the GDBusInterfaceInfo object

Browse Source 
Things will still work fine if the GDBusInterfaceInfo is allocated
statically because if so the ref_count will be -1.

Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen 2010-06-30 12:19:28 -04:00
parent 5ac2722975
commit 87fa3a6e75
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gdbusconnection.c
View File

@ -3103,6 +3103,8 @@ typedef struct
static void static void
exported_interface_free (ExportedInterface *ei) exported_interface_free (ExportedInterface *ei)
{ {
g_dbus_interface_info_unref ((GDBusInterfaceInfo *) ei->interface_info);
if (ei->user_data_free_func != NULL) if (ei->user_data_free_func != NULL)
/* TODO: push to thread-default mainloop */ /* TODO: push to thread-default mainloop */
ei->user_data_free_func (ei->user_data); ei->user_data_free_func (ei->user_data);
@ -4160,7 +4162,7 @@ g_dbus_connection_register_object (GDBusConnection *connection,
ei->user_data = user_data; ei->user_data = user_data;
ei->user_data_free_func = user_data_free_func; ei->user_data_free_func = user_data_free_func;
ei->vtable = vtable; ei->vtable = vtable;
ei->interface_info = interface_info; ei->interface_info = g_dbus_interface_info_ref ((GDBusInterfaceInfo *) interface_info);
ei->interface_name = g_strdup (interface_info->name); ei->interface_name = g_strdup (interface_info->name);
ei->context = g_main_context_get_thread_default (); ei->context = g_main_context_get_thread_default ();
if (ei->context != NULL) if (ei->context != NULL)

2
gio/tests/gdbus-peer.c
View File

@ -822,7 +822,7 @@ dmp_on_new_connection (GDBusServer *server,
data, data,
NULL, NULL,
&error); &error);
//g_dbus_node_info_unref (node); g_dbus_node_info_unref (node);
} }
static gpointer static gpointer