X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgdbusobjectmanagerclient.c;h=5755e74fb9616f00f9a391a6a5d900258617fc48;hb=25990eb2b6da94e1d03631eab8a952ef84cb9986;hp=2b5bd601a7f748a935448f8cc4a3d33be88d5ad8;hpb=323242578524a1b6355d8451015b14ca75aa0afa;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c
index 2b5bd60..5755e74 100644
--- a/gio/gdbusobjectmanagerclient.c
+++ b/gio/gdbusobjectmanagerclient.c
@@ -112,7 +112,7 @@
* #GDBusObjectManagerClient::interface-proxy-signal.
*
* Note that all callbacks and signals are emitted in the
- * thread-default main loop
+ * [thread-default main context][g-main-context-push-thread-default]
* that the #GDBusObjectManagerClient object was constructed
* in. Additionally, the #GDBusObjectProxy and #GDBusProxy objects
* originating from the #GDBusObjectManagerClient object will be created in
@@ -204,7 +204,8 @@ g_dbus_object_manager_client_finalize (GObject *object)
manager);
g_object_unref (manager->priv->control_proxy);
}
- g_object_unref (manager->priv->connection);
+ if (manager->priv->connection != NULL)
+ g_object_unref (manager->priv->connection);
g_free (manager->priv->object_path);
g_free (manager->priv->name);
g_free (manager->priv->name_owner);
@@ -505,7 +506,7 @@ g_dbus_object_manager_client_class_init (GDBusObjectManagerClientClass *klass)
* connect signals to all interface proxies managed by @manager.
*
* This signal is emitted in the
- * thread-default main loop
+ * [thread-default main context][g-main-context-push-thread-default]
* that @manager was constructed in.
*
* Since: 2.30
@@ -543,7 +544,7 @@ g_dbus_object_manager_client_class_init (GDBusObjectManagerClientClass *klass)
* connect signals to all interface proxies managed by @manager.
*
* This signal is emitted in the
- * thread-default main loop
+ * [thread-default main context][g-main-context-push-thread-default]
* that @manager was constructed in.
*
* Since: 2.30
@@ -654,7 +655,7 @@ g_dbus_object_manager_client_new_sync (GDBusConnection *connection
*
* This is an asynchronous failable constructor. When the result is
* ready, @callback will be invoked in the
- * thread-default main loop
+ * [thread-default main context][g-main-context-push-thread-default]
* of the thread you are calling this method from. You can
* then call g_dbus_object_manager_client_new_finish() to get the result. See
* g_dbus_object_manager_client_new_sync() for the synchronous version.
@@ -807,7 +808,7 @@ g_dbus_object_manager_client_new_for_bus_sync (GBusType bu
*
* This is an asynchronous failable constructor. When the result is
* ready, @callback will be invoked in the
- * thread-default main loop
+ * [thread-default main loop][g-main-context-push-thread-default]
* of the thread you are calling this method from. You can
* then call g_dbus_object_manager_client_new_for_bus_finish() to get the result. See
* g_dbus_object_manager_client_new_for_bus_sync() for the synchronous version.
@@ -957,8 +958,8 @@ g_dbus_object_manager_client_get_flags (GDBusObjectManagerClient *manager)
* #GObject::notify signal to track changes to the
* #GDBusObjectManagerClient:name-owner property.
*
- * Returns: The name owner or %NULL if no name owner exists. Free with
- * g_free().
+ * Returns: (nullable): The name owner or %NULL if no name owner
+ * exists. Free with g_free().
*
* Since: 2.30
*/