[glib] gdbus: Initialize types at async entrypoints
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gdbus: Initialize types at async entrypoints
- Date: Mon, 27 Mar 2017 13:43:38 +0000 (UTC)
commit 07465176da95e91ebde065e846294769cf9ca36b
Author: INSUN PYO <insun pyo samsung com>
Date: Mon Oct 31 16:36:18 2016 +0900
gdbus: Initialize types at async entrypoints
This isn't a comprehensive fix, but should cover a lot of cases
for GDBus.
https://bugzilla.gnome.org/show_bug.cgi?id=674885
gio/gdbusconnection.c | 13 +++++++++++++
gio/gdbusproxy.c | 6 ++++++
2 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index e75e47c..17b0741 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -2688,7 +2688,10 @@ g_dbus_connection_new (GIOStream *stream,
GAsyncReadyCallback callback,
gpointer user_data)
{
+ _g_dbus_initialize ();
+
g_return_if_fail (G_IS_IO_STREAM (stream));
+
g_async_initable_new_async (G_TYPE_DBUS_CONNECTION,
G_PRIORITY_DEFAULT,
cancellable,
@@ -2773,6 +2776,7 @@ g_dbus_connection_new_sync (GIOStream *stream,
GCancellable *cancellable,
GError **error)
{
+ _g_dbus_initialize ();
g_return_val_if_fail (G_IS_IO_STREAM (stream), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
return g_initable_new (G_TYPE_DBUS_CONNECTION,
@@ -2828,7 +2832,10 @@ g_dbus_connection_new_for_address (const gchar *address,
GAsyncReadyCallback callback,
gpointer user_data)
{
+ _g_dbus_initialize ();
+
g_return_if_fail (address != NULL);
+
g_async_initable_new_async (G_TYPE_DBUS_CONNECTION,
G_PRIORITY_DEFAULT,
cancellable,
@@ -2912,6 +2919,8 @@ g_dbus_connection_new_for_address_sync (const gchar *address,
GCancellable *cancellable,
GError **error)
{
+ _g_dbus_initialize ();
+
g_return_val_if_fail (address != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
return g_initable_new (G_TYPE_DBUS_CONNECTION,
@@ -7252,6 +7261,8 @@ g_bus_get_sync (GBusType bus_type,
{
GDBusConnection *connection;
+ _g_dbus_initialize ();
+
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
connection = get_uninitialized_connection (bus_type, cancellable, error);
@@ -7318,6 +7329,8 @@ g_bus_get (GBusType bus_type,
GTask *task;
GError *error = NULL;
+ _g_dbus_initialize ();
+
task = g_task_new (NULL, cancellable, callback, user_data);
g_task_set_source_tag (task, g_bus_get);
diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
index 8676600..96c761b 100644
--- a/gio/gdbusproxy.c
+++ b/gio/gdbusproxy.c
@@ -2021,6 +2021,8 @@ g_dbus_proxy_new (GDBusConnection *connection,
GAsyncReadyCallback callback,
gpointer user_data)
{
+ _g_dbus_initialize ();
+
g_return_if_fail (G_IS_DBUS_CONNECTION (connection));
g_return_if_fail ((name == NULL && g_dbus_connection_get_unique_name (connection) == NULL) ||
g_dbus_is_name (name));
g_return_if_fail (g_variant_is_object_path (object_path));
@@ -2171,6 +2173,8 @@ g_dbus_proxy_new_for_bus (GBusType bus_type,
GAsyncReadyCallback callback,
gpointer user_data)
{
+ _g_dbus_initialize ();
+
g_return_if_fail (g_dbus_is_name (name));
g_return_if_fail (g_variant_is_object_path (object_path));
g_return_if_fail (g_dbus_is_interface_name (interface_name));
@@ -2239,6 +2243,8 @@ g_dbus_proxy_new_for_bus_sync (GBusType bus_type,
{
GInitable *initable;
+ _g_dbus_initialize ();
+
g_return_val_if_fail (g_dbus_is_name (name), NULL);
g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);
g_return_val_if_fail (g_dbus_is_interface_name (interface_name), NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]