X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgdbusproxy.c;h=33492b718ca2f3145eeb3bc3dd86d83e40b9bc7c;hb=853692bdfd9f8a87aed70d21f643dc13b57c92d1;hp=f776662b43dafe9bd270a18e152ce9cf069e7def;hpb=20387d262ff104f9de3defc264c5c2010d272857;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
index f776662..33492b7 100644
--- a/gio/gdbusproxy.c
+++ b/gio/gdbusproxy.c
@@ -13,9 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Author: David Zeuthen
*/
@@ -74,24 +72,25 @@
* %G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START is set).
*
* The generic #GDBusProxy::g-properties-changed and
- * #GDBusProxy::g-signal signals are not very convenient to work
- * with. Therefore, the recommended way of working with proxies is to
- * subclass #GDBusProxy, and have more natural properties and signals
- * in your derived class. See
- * for how this can easily be done using the
- * gdbus-codegen
- * tool.
+ * #GDBusProxy::g-signal signals are not very convenient to work with.
+ * Therefore, the recommended way of working with proxies is to subclass
+ * #GDBusProxy, and have more natural properties and signals in your derived
+ * class. This [example][gdbus-example-gdbus-codegen] shows how this can
+ * easily be done using the [gdbus-codegen][gdbus-codegen] tool.
*
* A #GDBusProxy instance can be used from multiple threads but note
* that all signals (e.g. #GDBusProxy::g-signal, #GDBusProxy::g-properties-changed
* and #GObject::notify) are emitted in the
- * thread-default main loop
+ * [thread-default main context][g-main-context-push-thread-default]
* of the thread where the instance was constructed.
*
- * GDBusProxy for a well-known-nameFIXME: MISSING XINCLUDE CONTENT
+ * An example using a proxy for a well-known name can be found in
+ * [gdbus-example-watch-proxy.c](https://git.gnome.org/browse/glib/tree/gio/tests/gdbus-example-watch-proxy.c)
*/
-/* lock protecting the properties GHashTable */
+/* lock protecting the mutable properties: name_owner, timeout_msec,
+ * expected_interface, and the properties hash table
+ */
G_LOCK_DEFINE_STATIC (properties_lock);
/* ---------------------------------------------------------------------------------------------------- */
@@ -129,18 +128,21 @@ struct _GDBusProxyPrivate
GDBusConnection *connection;
gchar *name;
+ /* mutable, protected by properties_lock */
gchar *name_owner;
gchar *object_path;
gchar *interface_name;
+ /* mutable, protected by properties_lock */
gint timeout_msec;
guint name_owner_changed_subscription_id;
GCancellable *get_all_cancellable;
- /* gchar* -> GVariant* */
+ /* gchar* -> GVariant*, protected by properties_lock */
GHashTable *properties;
+ /* mutable, protected by properties_lock */
GDBusInterfaceInfo *expected_interface;
guint properties_changed_subscription_id;
@@ -148,6 +150,7 @@ struct _GDBusProxyPrivate
gboolean initialized;
+ /* mutable, protected by properties_lock */
GDBusObject *object;
SignalSubscriptionData *signal_subscription_data;
@@ -174,17 +177,17 @@ enum
LAST_SIGNAL,
};
-guint signals[LAST_SIGNAL] = {0};
+static guint signals[LAST_SIGNAL] = {0};
static void dbus_interface_iface_init (GDBusInterfaceIface *dbus_interface_iface);
static void initable_iface_init (GInitableIface *initable_iface);
static void async_initable_iface_init (GAsyncInitableIface *async_initable_iface);
G_DEFINE_TYPE_WITH_CODE (GDBusProxy, g_dbus_proxy, G_TYPE_OBJECT,
+ G_ADD_PRIVATE (GDBusProxy)
G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_INTERFACE, dbus_interface_iface_init)
G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init)
- G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init)
- );
+ G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init))
static void
g_dbus_proxy_dispose (GObject *object)
@@ -265,7 +268,7 @@ g_dbus_proxy_get_property (GObject *object,
break;
case PROP_G_NAME_OWNER:
- g_value_set_string (value, proxy->priv->name_owner);
+ g_value_take_string (value, g_dbus_proxy_get_name_owner (proxy));
break;
case PROP_G_OBJECT_PATH:
@@ -277,7 +280,7 @@ g_dbus_proxy_get_property (GObject *object,
break;
case PROP_G_DEFAULT_TIMEOUT:
- g_value_set_int (value, proxy->priv->timeout_msec);
+ g_value_set_int (value, g_dbus_proxy_get_default_timeout (proxy));
break;
case PROP_G_INTERFACE_INFO:
@@ -355,10 +358,29 @@ g_dbus_proxy_class_init (GDBusProxyClass *klass)
* GDBusProxy:g-interface-info:
*
* Ensure that interactions with this proxy conform to the given
- * interface. For example, when completing a method call, if the
- * type signature of the message isn't what's expected, the given
- * #GError is set. Signals that have a type signature mismatch are
- * simply dropped.
+ * interface. This is mainly to ensure that malformed data received
+ * from the other peer is ignored. The given #GDBusInterfaceInfo is
+ * said to be the "expected interface".
+ *
+ * The checks performed are:
+ * - When completing a method call, if the type signature of
+ * the reply message isn't what's expected, the reply is
+ * discarded and the #GError is set to %G_IO_ERROR_INVALID_ARGUMENT.
+ *
+ * - Received signals that have a type signature mismatch are dropped and
+ * a warning is logged via g_warning().
+ *
+ * - Properties received via the initial `GetAll()` call or via the
+ * `::PropertiesChanged` signal (on the
+ * [org.freedesktop.DBus.Properties](http://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-properties)
+ * interface) or set using g_dbus_proxy_set_cached_property()
+ * with a type signature mismatch are ignored and a warning is
+ * logged via g_warning().
+ *
+ * Note that these checks are never done on methods, signals and
+ * properties that are not referenced in the given
+ * #GDBusInterfaceInfo, since extending a D-Bus interface on the
+ * service-side is not considered an ABI break.
*
* Since: 2.26
*/
@@ -461,7 +483,7 @@ g_dbus_proxy_class_init (GDBusProxyClass *klass)
/**
* GDBusProxy:g-name-owner:
*
- * The unique name that owns #GDBusProxy:name or %NULL if no-one
+ * The unique name that owns #GDBusProxy:g-name or %NULL if no-one
* currently owns that name. You may connect to #GObject::notify signal to
* track changes to this property.
*
@@ -558,9 +580,13 @@ g_dbus_proxy_class_init (GDBusProxyClass *klass)
* that both @changed_properties and @invalidated_properties are
* guaranteed to never be %NULL (either may be empty though).
*
+ * If the proxy has the flag
+ * %G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES set, then
+ * @invalidated_properties will always be empty.
+ *
* This signal corresponds to the
- * PropertiesChanged D-Bus signal on the
- * org.freedesktop.DBus.Properties interface.
+ * `PropertiesChanged` D-Bus signal on the
+ * `org.freedesktop.DBus.Properties` interface.
*
* Since: 2.26
*/
@@ -579,7 +605,7 @@ g_dbus_proxy_class_init (GDBusProxyClass *klass)
/**
* GDBusProxy::g-signal:
* @proxy: The #GDBusProxy emitting the signal.
- * @sender_name: The sender of the signal or %NULL if the connection is not a bus connection.
+ * @sender_name: (allow-none): The sender of the signal or %NULL if the connection is not a bus connection.
* @signal_name: The name of the signal.
* @parameters: A #GVariant tuple with parameters for the signal.
*
@@ -600,14 +626,12 @@ g_dbus_proxy_class_init (GDBusProxyClass *klass)
G_TYPE_STRING,
G_TYPE_VARIANT);
-
- g_type_class_add_private (klass, sizeof (GDBusProxyPrivate));
}
static void
g_dbus_proxy_init (GDBusProxy *proxy)
{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, G_TYPE_DBUS_PROXY, GDBusProxyPrivate);
+ proxy->priv = g_dbus_proxy_get_instance_private (proxy);
proxy->priv->signal_subscription_data = g_slice_new0 (SignalSubscriptionData);
proxy->priv->signal_subscription_data->ref_count = 1;
proxy->priv->signal_subscription_data->proxy = proxy;
@@ -669,23 +693,21 @@ g_dbus_proxy_get_cached_property_names (GDBusProxy *proxy)
return names;
}
+/* properties_lock must be held for as long as you will keep the
+ * returned value
+ */
static const GDBusPropertyInfo *
-lookup_property_info_or_warn (GDBusProxy *proxy,
- const gchar *property_name)
+lookup_property_info (GDBusProxy *proxy,
+ const gchar *property_name)
{
- const GDBusPropertyInfo *info;
+ const GDBusPropertyInfo *info = NULL;
if (proxy->priv->expected_interface == NULL)
- return NULL;
+ goto out;
info = g_dbus_interface_info_lookup_property (proxy->priv->expected_interface, property_name);
- if (info == NULL)
- {
- g_warning ("Trying to lookup property %s which isn't in expected interface %s",
- property_name,
- proxy->priv->expected_interface->name);
- }
+ out:
return info;
}
@@ -698,8 +720,8 @@ lookup_property_info_or_warn (GDBusProxy *proxy,
* blocking IO.
*
* If @proxy has an expected interface (see
- * #GDBusProxy:g-interface-info), then @property_name (for existence)
- * is checked against it.
+ * #GDBusProxy:g-interface-info) and @property_name is referenced by
+ * it, then @value is checked against the type of the property.
*
* Returns: A reference to the #GVariant instance that holds the value
* for @property_name or %NULL if the value is not in the cache. The
@@ -711,6 +733,7 @@ GVariant *
g_dbus_proxy_get_cached_property (GDBusProxy *proxy,
const gchar *property_name)
{
+ const GDBusPropertyInfo *info;
GVariant *value;
g_return_val_if_fail (G_IS_DBUS_PROXY (proxy), NULL);
@@ -720,10 +743,22 @@ g_dbus_proxy_get_cached_property (GDBusProxy *proxy,
value = g_hash_table_lookup (proxy->priv->properties, property_name);
if (value == NULL)
+ goto out;
+
+ info = lookup_property_info (proxy, property_name);
+ if (info != NULL)
{
- lookup_property_info_or_warn (proxy, property_name);
- /* no difference */
- goto out;
+ const gchar *type_string = g_variant_get_type_string (value);
+ if (g_strcmp0 (type_string, info->signature) != 0)
+ {
+ g_warning ("Trying to get property %s with type %s but according to the expected "
+ "interface the type is %s",
+ property_name,
+ type_string,
+ info->signature);
+ value = NULL;
+ goto out;
+ }
}
g_variant_ref (value);
@@ -746,12 +781,12 @@ g_dbus_proxy_get_cached_property (GDBusProxy *proxy,
* property cache.
*
* If @proxy has an expected interface (see
- * #GDBusProxy:g-interface-info), then @property_name (for existence)
- * and @value (for the type) is checked against it.
+ * #GDBusProxy:g-interface-info) and @property_name is referenced by
+ * it, then @value is checked against the type of the property.
*
* If the @value #GVariant is floating, it is consumed. This allows
* convenient 'inline' use of g_variant_new(), e.g.
- * |[
+ * |[
* g_dbus_proxy_set_cached_property (proxy,
* "SomeProperty",
* g_variant_new ("(si)",
@@ -759,20 +794,19 @@ g_dbus_proxy_get_cached_property (GDBusProxy *proxy,
* 42));
* ]|
*
- * Normally you will not need to use this method since @proxy is
- * tracking changes using the
- * org.freedesktop.DBus.Properties.PropertiesChanged
- * D-Bus signal. However, for performance reasons an object may decide
- * to not use this signal for some properties and instead use a
- * proprietary out-of-band mechanism to transmit changes.
+ * Normally you will not need to use this method since @proxy
+ * is tracking changes using the
+ * `org.freedesktop.DBus.Properties.PropertiesChanged`
+ * D-Bus signal. However, for performance reasons an object may
+ * decide to not use this signal for some properties and instead
+ * use a proprietary out-of-band mechanism to transmit changes.
*
* As a concrete example, consider an object with a property
- * ChatroomParticipants which is an array of
- * strings. Instead of transmitting the same (long) array every time
- * the property changes, it is more efficient to only transmit the
- * delta using e.g. signals ChatroomParticipantJoined(String
- * name) and ChatroomParticipantParted(String
- * name).
+ * `ChatroomParticipants` which is an array of strings. Instead of
+ * transmitting the same (long) array every time the property changes,
+ * it is more efficient to only transmit the delta using e.g. signals
+ * `ChatroomParticipantJoined(String name)` and
+ * `ChatroomParticipantParted(String name)`.
*
* Since: 2.26
*/
@@ -790,7 +824,7 @@ g_dbus_proxy_set_cached_property (GDBusProxy *proxy,
if (value != NULL)
{
- info = lookup_property_info_or_warn (proxy, property_name);
+ info = lookup_property_info (proxy, property_name);
if (info != NULL)
{
if (g_strcmp0 (info->signature, g_variant_get_type_string (value)) != 0)
@@ -835,7 +869,7 @@ on_signal_received (GDBusConnection *connection,
if (proxy == NULL)
{
G_UNLOCK (signal_subscription_lock);
- goto out;
+ return;
}
else
{
@@ -846,31 +880,47 @@ on_signal_received (GDBusConnection *connection,
if (!proxy->priv->initialized)
goto out;
+ G_LOCK (properties_lock);
+
if (proxy->priv->name_owner != NULL && g_strcmp0 (sender_name, proxy->priv->name_owner) != 0)
- goto out;
+ {
+ G_UNLOCK (properties_lock);
+ goto out;
+ }
if (proxy->priv->expected_interface != NULL)
{
const GDBusSignalInfo *info;
- GVariantType *expected_type;
info = g_dbus_interface_info_lookup_signal (proxy->priv->expected_interface, signal_name);
- if (info == NULL)
- goto out;
- expected_type = _g_dbus_compute_complete_signature (info->args);
- if (!g_variant_type_equal (expected_type, g_variant_get_type (parameters)))
+ if (info != NULL)
{
+ GVariantType *expected_type;
+ expected_type = _g_dbus_compute_complete_signature (info->args);
+ if (!g_variant_type_equal (expected_type, g_variant_get_type (parameters)))
+ {
+ gchar *expected_type_string = g_variant_type_dup_string (expected_type);
+ g_warning ("Dropping signal %s of type %s since the type from the expected interface is %s",
+ info->name,
+ g_variant_get_type_string (parameters),
+ expected_type_string);
+ g_free (expected_type_string);
+ g_variant_type_free (expected_type);
+ G_UNLOCK (properties_lock);
+ goto out;
+ }
g_variant_type_free (expected_type);
- goto out;
}
- g_variant_type_free (expected_type);
}
+ G_UNLOCK (properties_lock);
+
g_signal_emit (proxy,
signals[SIGNAL_SIGNAL],
0,
sender_name,
signal_name,
parameters);
+
out:
if (proxy != NULL)
g_object_unref (proxy);
@@ -887,15 +937,21 @@ insert_property_checked (GDBusProxy *proxy,
if (proxy->priv->expected_interface != NULL)
{
const GDBusPropertyInfo *info;
-
info = g_dbus_interface_info_lookup_property (proxy->priv->expected_interface, property_name);
- /* Ignore unknown properties */
- if (info == NULL)
- goto invalid;
-
- /* Ignore properties with the wrong type */
- if (g_strcmp0 (info->signature, g_variant_get_type_string (value)) != 0)
- goto invalid;
+ /* Only check known properties */
+ if (info != NULL)
+ {
+ /* Warn about properties with the wrong type */
+ if (g_strcmp0 (info->signature, g_variant_get_type_string (value)) != 0)
+ {
+ g_warning ("Received property %s with type %s does not match expected type "
+ "%s in the expected interface",
+ property_name,
+ g_variant_get_type_string (value),
+ info->signature);
+ goto invalid;
+ }
+ }
}
g_hash_table_insert (proxy->priv->properties,
@@ -909,6 +965,63 @@ insert_property_checked (GDBusProxy *proxy,
g_free (property_name);
}
+typedef struct
+{
+ GDBusProxy *proxy;
+ gchar *prop_name;
+} InvalidatedPropGetData;
+
+static void
+invalidated_property_get_cb (GDBusConnection *connection,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ InvalidatedPropGetData *data = user_data;
+ const gchar *invalidated_properties[] = {NULL};
+ GVariantBuilder builder;
+ GVariant *value = NULL;
+ GVariant *unpacked_value = NULL;
+
+ /* errors are fine, the other end could have disconnected */
+ value = g_dbus_connection_call_finish (connection, res, NULL);
+ if (value == NULL)
+ {
+ goto out;
+ }
+
+ if (!g_variant_is_of_type (value, G_VARIANT_TYPE ("(v)")))
+ {
+ g_warning ("Expected type '(v)' for Get() reply, got '%s'", g_variant_get_type_string (value));
+ goto out;
+ }
+
+ g_variant_get (value, "(v)", &unpacked_value);
+
+ /* synthesize the a{sv} in the PropertiesChanged signal */
+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
+ g_variant_builder_add (&builder, "{sv}", data->prop_name, unpacked_value);
+
+ G_LOCK (properties_lock);
+ insert_property_checked (data->proxy,
+ data->prop_name, /* adopts string */
+ unpacked_value); /* adopts value */
+ data->prop_name = NULL;
+ G_UNLOCK (properties_lock);
+
+ g_signal_emit (data->proxy,
+ signals[PROPERTIES_CHANGED_SIGNAL], 0,
+ g_variant_builder_end (&builder), /* consumed */
+ invalidated_properties);
+
+
+ out:
+ if (value != NULL)
+ g_variant_unref (value);
+ g_object_unref (data->proxy);
+ g_free (data->prop_name);
+ g_slice_free (InvalidatedPropGetData, data);
+}
+
static void
on_properties_changed (GDBusConnection *connection,
const gchar *sender_name,
@@ -919,6 +1032,7 @@ on_properties_changed (GDBusConnection *connection,
gpointer user_data)
{
SignalSubscriptionData *data = user_data;
+ gboolean emit_g_signal = FALSE;
GDBusProxy *proxy;
const gchar *interface_name_for_signal;
GVariant *changed_properties;
@@ -947,13 +1061,19 @@ on_properties_changed (GDBusConnection *connection,
if (!proxy->priv->initialized)
goto out;
+ G_LOCK (properties_lock);
+
if (proxy->priv->name_owner != NULL && g_strcmp0 (sender_name, proxy->priv->name_owner) != 0)
- goto out;
+ {
+ G_UNLOCK (properties_lock);
+ goto out;
+ }
if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(sa{sv}as)")))
{
- g_warning ("Value for PropertiesChanged signal with type `%s' does not match `(sa{sv}as)'",
+ g_warning ("Value for PropertiesChanged signal with type '%s' does not match '(sa{sv}as)'",
g_variant_get_type_string (parameters));
+ G_UNLOCK (properties_lock);
goto out;
}
@@ -964,9 +1084,10 @@ on_properties_changed (GDBusConnection *connection,
&invalidated_properties);
if (g_strcmp0 (interface_name_for_signal, proxy->priv->interface_name) != 0)
- goto out;
-
- G_LOCK (properties_lock);
+ {
+ G_UNLOCK (properties_lock);
+ goto out;
+ }
g_variant_iter_init (&iter, changed_properties);
while (g_variant_iter_next (&iter, "{sv}", &key, &value))
@@ -974,20 +1095,52 @@ on_properties_changed (GDBusConnection *connection,
insert_property_checked (proxy,
key, /* adopts string */
value); /* adopts value */
+ emit_g_signal = TRUE;
}
- for (n = 0; invalidated_properties[n] != NULL; n++)
+ if (proxy->priv->flags & G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES)
+ {
+ if (proxy->priv->name_owner != NULL)
+ {
+ for (n = 0; invalidated_properties[n] != NULL; n++)
+ {
+ InvalidatedPropGetData *data;
+ data = g_slice_new0 (InvalidatedPropGetData);
+ data->proxy = g_object_ref (proxy);
+ data->prop_name = g_strdup (invalidated_properties[n]);
+ g_dbus_connection_call (proxy->priv->connection,
+ proxy->priv->name_owner,
+ proxy->priv->object_path,
+ "org.freedesktop.DBus.Properties",
+ "Get",
+ g_variant_new ("(ss)", proxy->priv->interface_name, data->prop_name),
+ G_VARIANT_TYPE ("(v)"),
+ G_DBUS_CALL_FLAGS_NONE,
+ -1, /* timeout */
+ NULL, /* GCancellable */
+ (GAsyncReadyCallback) invalidated_property_get_cb,
+ data);
+ }
+ }
+ }
+ else
{
- g_hash_table_remove (proxy->priv->properties, invalidated_properties[n]);
+ emit_g_signal = TRUE;
+ for (n = 0; invalidated_properties[n] != NULL; n++)
+ {
+ g_hash_table_remove (proxy->priv->properties, invalidated_properties[n]);
+ }
}
G_UNLOCK (properties_lock);
- /* emit signal */
- g_signal_emit (proxy, signals[PROPERTIES_CHANGED_SIGNAL],
- 0,
- changed_properties,
- invalidated_properties);
+ if (emit_g_signal)
+ {
+ g_signal_emit (proxy, signals[PROPERTIES_CHANGED_SIGNAL],
+ 0,
+ changed_properties,
+ invalidated_properties);
+ }
out:
if (changed_properties != NULL)
@@ -1010,7 +1163,7 @@ process_get_all_reply (GDBusProxy *proxy,
if (!g_variant_is_of_type (result, G_VARIANT_TYPE ("(a{sv})")))
{
- g_warning ("Value for GetAll reply with type `%s' does not match `(a{sv})'",
+ g_warning ("Value for GetAll reply with type '%s' does not match '(a{sv})'",
g_variant_get_type_string (result));
goto out;
}
@@ -1093,11 +1246,10 @@ on_name_owner_changed_get_all_cb (GDBusConnection *connection,
/* and finally we can notify */
if (!cancelled)
{
+ G_LOCK (properties_lock);
g_free (data->proxy->priv->name_owner);
data->proxy->priv->name_owner = data->name_owner;
data->name_owner = NULL; /* to avoid an extra copy, we steal the string */
-
- G_LOCK (properties_lock);
g_hash_table_remove_all (data->proxy->priv->properties);
G_UNLOCK (properties_lock);
if (result != NULL)
@@ -1160,11 +1312,10 @@ on_name_owner_changed (GDBusConnection *connection,
if (strlen (new_owner) == 0)
{
+ G_LOCK (properties_lock);
g_free (proxy->priv->name_owner);
proxy->priv->name_owner = NULL;
- G_LOCK (properties_lock);
-
/* Synthesize ::g-properties-changed changed */
if (!(proxy->priv->flags & G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES) &&
g_hash_table_size (proxy->priv->properties) > 0)
@@ -1203,15 +1354,20 @@ on_name_owner_changed (GDBusConnection *connection,
}
else
{
+ G_LOCK (properties_lock);
+
/* ignore duplicates - this can happen when activating the service */
if (g_strcmp0 (new_owner, proxy->priv->name_owner) == 0)
- goto out;
+ {
+ G_UNLOCK (properties_lock);
+ goto out;
+ }
if (proxy->priv->flags & G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES)
{
g_free (proxy->priv->name_owner);
proxy->priv->name_owner = g_strdup (new_owner);
- G_LOCK (properties_lock);
+
g_hash_table_remove_all (proxy->priv->properties);
G_UNLOCK (properties_lock);
g_object_notify (G_OBJECT (proxy), "g-name-owner");
@@ -1220,6 +1376,8 @@ on_name_owner_changed (GDBusConnection *connection,
{
LoadPropertiesOnNameOwnerChangedData *data;
+ G_UNLOCK (properties_lock);
+
/* start loading properties.. only then emit notify::g-name-owner .. we
* need to be able to cancel this in the event another NameOwnerChanged
* signal suddenly happens
@@ -1309,46 +1467,19 @@ async_init_get_all_cb (GDBusConnection *connection,
async_init_data_free (data);
}
-
static void
-async_init_get_name_owner_cb (GDBusConnection *connection,
- GAsyncResult *res,
- gpointer user_data)
+async_init_data_set_name_owner (AsyncInitData *data,
+ const gchar *name_owner)
{
- AsyncInitData *data = user_data;
gboolean get_all;
- if (res != NULL)
- {
- GError *error;
- GVariant *result;
- error = NULL;
- result = g_dbus_connection_call_finish (connection,
- res,
- &error);
- if (result == NULL)
- {
- if (error->domain == G_DBUS_ERROR &&
- error->code == G_DBUS_ERROR_NAME_HAS_NO_OWNER)
- {
- g_error_free (error);
- }
- else
- {
- g_simple_async_result_take_error (data->simple, error);
- g_simple_async_result_complete_in_idle (data->simple);
- async_init_data_free (data);
- goto out;
- }
- }
- else
- {
- g_variant_get (result,
- "(s)",
- &data->proxy->priv->name_owner);
- g_variant_unref (result);
- }
+ if (name_owner != NULL)
+ {
+ /* it starts as NULL anyway */
+ G_LOCK (properties_lock);
+ data->proxy->priv->name_owner = g_strdup (name_owner);
+ G_UNLOCK (properties_lock);
}
get_all = TRUE;
@@ -1358,8 +1489,7 @@ async_init_get_name_owner_cb (GDBusConnection *connection,
/* Don't load properties if the API user doesn't want them */
get_all = FALSE;
}
- else if (data->proxy->priv->name_owner == NULL &&
- data->proxy->priv->name != NULL)
+ else if (name_owner == NULL && data->proxy->priv->name != NULL)
{
/* Don't attempt to load properties if the name_owner is NULL (which
* usually means the name isn't owned), unless name is also NULL (which
@@ -1373,7 +1503,7 @@ async_init_get_name_owner_cb (GDBusConnection *connection,
{
/* load all properties asynchronously */
g_dbus_connection_call (data->proxy->priv->connection,
- data->proxy->priv->name_owner,
+ name_owner,
data->proxy->priv->object_path,
"org.freedesktop.DBus.Properties",
"GetAll",
@@ -1390,9 +1520,45 @@ async_init_get_name_owner_cb (GDBusConnection *connection,
g_simple_async_result_complete_in_idle (data->simple);
async_init_data_free (data);
}
+}
- out:
- ;
+static void
+async_init_get_name_owner_cb (GDBusConnection *connection,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ AsyncInitData *data = user_data;
+ GError *error;
+ GVariant *result;
+
+ error = NULL;
+ result = g_dbus_connection_call_finish (connection,
+ res,
+ &error);
+ if (result == NULL)
+ {
+ if (error->domain == G_DBUS_ERROR &&
+ error->code == G_DBUS_ERROR_NAME_HAS_NO_OWNER)
+ {
+ g_error_free (error);
+ async_init_data_set_name_owner (data, NULL);
+ }
+ else
+ {
+ g_simple_async_result_take_error (data->simple, error);
+ g_simple_async_result_complete_in_idle (data->simple);
+ async_init_data_free (data);
+ }
+ }
+ else
+ {
+ /* borrowed from result to avoid an extra copy */
+ const gchar *name_owner;
+
+ g_variant_get (result, "(&s)", &name_owner);
+ async_init_data_set_name_owner (data, name_owner);
+ g_variant_unref (result);
+ }
}
static void
@@ -1433,21 +1599,39 @@ async_init_start_service_by_name_cb (GDBusConnection *connection,
* org.freedesktop.DBus.Error.ServiceUnknown: The name org.gnome.Epiphany2
* was not provided by any .service files
*
+ * or (see #677718)
+ *
+ * org.freedesktop.systemd1.Masked: Unit polkit.service is masked.
+ *
* This doesn't mean that the name doesn't have an owner, just
- * that it's not provided by a .service file. So just proceed to
- * invoke GetNameOwner() if dealing with that error.
+ * that it's not provided by a .service file or can't currently
+ * be started.
+ *
+ * In particular, in both cases, it could be that a service
+ * owner will actually appear later. So instead of erroring out,
+ * we just proceed to invoke GetNameOwner() if dealing with the
+ * kind of errors above.
*/
- if (error->domain == G_DBUS_ERROR &&
- error->code == G_DBUS_ERROR_SERVICE_UNKNOWN)
+ if (error->domain == G_DBUS_ERROR && error->code == G_DBUS_ERROR_SERVICE_UNKNOWN)
{
g_error_free (error);
}
else
{
- g_prefix_error (&error,
- _("Error calling StartServiceByName for %s: "),
- data->proxy->priv->name);
- goto failed;
+ gchar *remote_error = g_dbus_error_get_remote_error (error);
+ if (g_strcmp0 (remote_error, "org.freedesktop.systemd1.Masked") == 0)
+ {
+ g_error_free (error);
+ g_free (remote_error);
+ }
+ else
+ {
+ g_prefix_error (&error,
+ _("Error calling StartServiceByName for %s: "),
+ data->proxy->priv->name);
+ g_free (remote_error);
+ goto failed;
+ }
}
}
else
@@ -1519,21 +1703,22 @@ async_initable_init_second_async (GAsyncInitable *initable,
callback,
user_data,
NULL);
+ g_simple_async_result_set_check_cancellable (data->simple, cancellable);
/* Check name ownership asynchronously - possibly also start the service */
if (proxy->priv->name == NULL)
{
/* Do nothing */
- async_init_get_name_owner_cb (proxy->priv->connection, NULL, data);
+ async_init_data_set_name_owner (data, NULL);
}
else if (g_dbus_is_unique_name (proxy->priv->name))
{
- proxy->priv->name_owner = g_strdup (proxy->priv->name);
- async_init_get_name_owner_cb (proxy->priv->connection, NULL, data);
+ async_init_data_set_name_owner (data, proxy->priv->name);
}
else
{
- if (proxy->priv->flags & G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START)
+ if ((proxy->priv->flags & G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START) ||
+ (proxy->priv->flags & G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION))
{
async_init_call_get_name_owner (data);
}
@@ -1665,6 +1850,7 @@ get_connection_cb (GObject *source_object,
data->callback,
data->user_data,
NULL);
+ g_simple_async_result_set_check_cancellable (simple, data->cancellable);
g_simple_async_result_take_error (simple, error);
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
@@ -1830,7 +2016,7 @@ initable_iface_init (GInitableIface *initable_iface)
* @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
* @object_path: An object path.
* @interface_name: A D-Bus interface name.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @callback: Callback function to invoke when the proxy is ready.
* @user_data: User data to pass to @callback.
*
@@ -1846,9 +2032,9 @@ initable_iface_init (GInitableIface *initable_iface)
* to handle signals from the remote object.
*
* If @name is a well-known name and the
- * %G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag isn't set and no name
- * owner currently exists, the message bus will be requested to launch
- * a name owner for the name.
+ * %G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START and %G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION
+ * flags aren't set and no name owner currently exists, the message bus
+ * will be requested to launch a name owner for the name.
*
* This is a failable asynchronous constructor - when the proxy is
* ready, @callback will be invoked and you can use
@@ -1856,7 +2042,7 @@ initable_iface_init (GInitableIface *initable_iface)
*
* See g_dbus_proxy_new_sync() and for a synchronous version of this constructor.
*
- * See for an example of how #GDBusProxy can be used.
+ * #GDBusProxy is used in this [example][gdbus-wellknown-proxy].
*
* Since: 2.26
*/
@@ -1943,14 +2129,14 @@ g_dbus_proxy_new_finish (GAsyncResult *res,
* to handle signals from the remote object.
*
* If @name is a well-known name and the
- * %G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag isn't set and no name
- * owner currently exists, the message bus will be requested to launch
- * a name owner for the name.
+ * %G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START and %G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START_AT_CONSTRUCTION
+ * flags aren't set and no name owner currently exists, the message bus
+ * will be requested to launch a name owner for the name.
*
* This is a synchronous failable constructor. See g_dbus_proxy_new()
* and g_dbus_proxy_new_finish() for the asynchronous version.
*
- * See for an example of how #GDBusProxy can be used.
+ * #GDBusProxy is used in this [example][gdbus-wellknown-proxy].
*
* Returns: A #GDBusProxy or %NULL if error is set. Free with g_object_unref().
*
@@ -2000,13 +2186,13 @@ g_dbus_proxy_new_sync (GDBusConnection *connection,
* @name: A bus name (well-known or unique).
* @object_path: An object path.
* @interface_name: A D-Bus interface name.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @callback: Callback function to invoke when the proxy is ready.
* @user_data: User data to pass to @callback.
*
* Like g_dbus_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
*
- * See for an example of how #GDBusProxy can be used.
+ * #GDBusProxy is used in this [example][gdbus-wellknown-proxy].
*
* Since: 2.26
*/
@@ -2066,12 +2252,12 @@ g_dbus_proxy_new_for_bus_finish (GAsyncResult *res,
* @name: A bus name (well-known or unique).
* @object_path: An object path.
* @interface_name: A D-Bus interface name.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Like g_dbus_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
*
- * See for an example of how #GDBusProxy can be used.
+ * #GDBusProxy is used in this [example][gdbus-wellknown-proxy].
*
* Returns: A #GDBusProxy or %NULL if error is set. Free with g_object_unref().
*
@@ -2178,8 +2364,14 @@ g_dbus_proxy_get_name (GDBusProxy *proxy)
gchar *
g_dbus_proxy_get_name_owner (GDBusProxy *proxy)
{
+ gchar *ret;
+
g_return_val_if_fail (G_IS_DBUS_PROXY (proxy), NULL);
- return g_strdup (proxy->priv->name_owner);
+
+ G_LOCK (properties_lock);
+ ret = g_strdup (proxy->priv->name_owner);
+ G_UNLOCK (properties_lock);
+ return ret;
}
/**
@@ -2233,8 +2425,14 @@ g_dbus_proxy_get_interface_name (GDBusProxy *proxy)
gint
g_dbus_proxy_get_default_timeout (GDBusProxy *proxy)
{
+ gint ret;
+
g_return_val_if_fail (G_IS_DBUS_PROXY (proxy), -1);
- return proxy->priv->timeout_msec;
+
+ G_LOCK (properties_lock);
+ ret = proxy->priv->timeout_msec;
+ G_UNLOCK (properties_lock);
+ return ret;
}
/**
@@ -2257,22 +2455,28 @@ g_dbus_proxy_set_default_timeout (GDBusProxy *proxy,
g_return_if_fail (G_IS_DBUS_PROXY (proxy));
g_return_if_fail (timeout_msec == -1 || timeout_msec >= 0);
- /* TODO: locking? */
+ G_LOCK (properties_lock);
+
if (proxy->priv->timeout_msec != timeout_msec)
{
proxy->priv->timeout_msec = timeout_msec;
+ G_UNLOCK (properties_lock);
+
g_object_notify (G_OBJECT (proxy), "g-default-timeout");
}
+ else
+ {
+ G_UNLOCK (properties_lock);
+ }
}
/**
* g_dbus_proxy_get_interface_info:
* @proxy: A #GDBusProxy
*
- * Returns the #GDBusInterfaceInfo, if any, specifying the minimal
- * interface that @proxy conforms to.
- *
- * See the #GDBusProxy:g-interface-info property for more details.
+ * Returns the #GDBusInterfaceInfo, if any, specifying the interface
+ * that @proxy conforms to. See the #GDBusProxy:g-interface-info
+ * property for more details.
*
* Returns: A #GDBusInterfaceInfo or %NULL. Do not unref the returned
* object, it is owned by @proxy.
@@ -2282,8 +2486,17 @@ g_dbus_proxy_set_default_timeout (GDBusProxy *proxy,
GDBusInterfaceInfo *
g_dbus_proxy_get_interface_info (GDBusProxy *proxy)
{
+ GDBusInterfaceInfo *ret;
+
g_return_val_if_fail (G_IS_DBUS_PROXY (proxy), NULL);
- return proxy->priv->expected_interface;
+
+ G_LOCK (properties_lock);
+ ret = proxy->priv->expected_interface;
+ G_UNLOCK (properties_lock);
+ /* FIXME: returning a borrowed ref with no guarantee that nobody will
+ * call g_dbus_proxy_set_interface_info() and make it invalid...
+ */
+ return ret;
}
/**
@@ -2292,12 +2505,8 @@ g_dbus_proxy_get_interface_info (GDBusProxy *proxy)
* @info: (allow-none): Minimum interface this proxy conforms to or %NULL to unset.
*
* Ensure that interactions with @proxy conform to the given
- * interface. For example, when completing a method call, if the type
- * signature of the message isn't what's expected, the given #GError
- * is set. Signals that have a type signature mismatch are simply
- * dropped.
- *
- * See the #GDBusProxy:g-interface-info property for more details.
+ * interface. See the #GDBusProxy:g-interface-info property for more
+ * details.
*
* Since: 2.26
*/
@@ -2306,6 +2515,8 @@ g_dbus_proxy_set_interface_info (GDBusProxy *proxy,
GDBusInterfaceInfo *info)
{
g_return_if_fail (G_IS_DBUS_PROXY (proxy));
+ G_LOCK (properties_lock);
+
if (proxy->priv->expected_interface != NULL)
{
g_dbus_interface_info_cache_release (proxy->priv->expected_interface);
@@ -2314,6 +2525,8 @@ g_dbus_proxy_set_interface_info (GDBusProxy *proxy,
proxy->priv->expected_interface = info != NULL ? g_dbus_interface_info_ref (info) : NULL;
if (proxy->priv->expected_interface != NULL)
g_dbus_interface_info_cache_build (proxy->priv->expected_interface);
+
+ G_UNLOCK (properties_lock);
}
/* ---------------------------------------------------------------------------------------------------- */
@@ -2411,25 +2624,27 @@ reply_cb (GDBusConnection *connection,
g_object_unref (simple);
}
+/* properties_lock must be held for as long as you will keep the
+ * returned value
+ */
static const GDBusMethodInfo *
-lookup_method_info_or_warn (GDBusProxy *proxy,
- const gchar *method_name)
+lookup_method_info (GDBusProxy *proxy,
+ const gchar *method_name)
{
- const GDBusMethodInfo *info;
+ const GDBusMethodInfo *info = NULL;
if (proxy->priv->expected_interface == NULL)
- return NULL;
+ goto out;
info = g_dbus_interface_info_lookup_method (proxy->priv->expected_interface, method_name);
- if (info == NULL)
- {
- g_warning ("Trying to invoke method %s which isn't in expected interface %s",
- method_name, proxy->priv->expected_interface->name);
- }
+out:
return info;
}
+/* properties_lock must be held for as long as you will keep the
+ * returned value
+ */
static const gchar *
get_destination_for_call (GDBusProxy *proxy)
{
@@ -2474,8 +2689,9 @@ g_dbus_proxy_call_internal (GDBusProxy *proxy,
const gchar *split_method_name;
const gchar *target_method_name;
const gchar *target_interface_name;
- const gchar *destination;
+ gchar *destination;
GVariantType *reply_type;
+ GAsyncReadyCallback my_callback;
g_return_if_fail (G_IS_DBUS_PROXY (proxy));
g_return_if_fail (g_dbus_is_member_name (method_name) || g_dbus_is_interface_name (method_name));
@@ -2490,10 +2706,26 @@ g_dbus_proxy_call_internal (GDBusProxy *proxy,
reply_type = NULL;
split_interface_name = NULL;
- simple = g_simple_async_result_new (G_OBJECT (proxy),
- callback,
- user_data,
- g_dbus_proxy_call_internal);
+ /* g_dbus_connection_call() is optimised for the case of a NULL
+ * callback. If we get a NULL callback from our user then make sure
+ * we pass along a NULL callback for ourselves as well.
+ */
+ if (callback != NULL)
+ {
+ my_callback = (GAsyncReadyCallback) reply_cb;
+ simple = g_simple_async_result_new (G_OBJECT (proxy),
+ callback,
+ user_data,
+ g_dbus_proxy_call_internal);
+ g_simple_async_result_set_check_cancellable (simple, cancellable);
+ }
+ else
+ {
+ my_callback = NULL;
+ simple = NULL;
+ }
+
+ G_LOCK (properties_lock);
was_split = maybe_split_method_name (method_name, &split_interface_name, &split_method_name);
target_method_name = was_split ? split_method_name : method_name;
@@ -2503,7 +2735,7 @@ g_dbus_proxy_call_internal (GDBusProxy *proxy,
if (!was_split)
{
const GDBusMethodInfo *expected_method_info;
- expected_method_info = lookup_method_info_or_warn (proxy, target_method_name);
+ expected_method_info = lookup_method_info (proxy, target_method_name);
if (expected_method_info != NULL)
reply_type = _g_dbus_compute_complete_signature (expected_method_info->out_args);
}
@@ -2511,17 +2743,25 @@ g_dbus_proxy_call_internal (GDBusProxy *proxy,
destination = NULL;
if (proxy->priv->name != NULL)
{
- destination = get_destination_for_call (proxy);
+ destination = g_strdup (get_destination_for_call (proxy));
if (destination == NULL)
{
- g_simple_async_result_set_error (simple,
- G_IO_ERROR,
- G_IO_ERROR_FAILED,
- _("Cannot invoke method; proxy is for a well-known name without an owner and proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"));
+ if (simple != NULL)
+ {
+ g_simple_async_result_set_error (simple,
+ G_IO_ERROR,
+ G_IO_ERROR_FAILED,
+ _("Cannot invoke method; proxy is for a well-known name without an owner and proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"));
+ g_simple_async_result_complete_in_idle (simple);
+ g_object_unref (simple);
+ }
+ G_UNLOCK (properties_lock);
goto out;
}
}
+ G_UNLOCK (properties_lock);
+
#ifdef G_OS_UNIX
g_dbus_connection_call_with_unix_fd_list (proxy->priv->connection,
destination,
@@ -2534,7 +2774,7 @@ g_dbus_proxy_call_internal (GDBusProxy *proxy,
timeout_msec == -1 ? proxy->priv->timeout_msec : timeout_msec,
fd_list,
cancellable,
- (GAsyncReadyCallback) reply_cb,
+ my_callback,
simple);
#else
g_dbus_connection_call (proxy->priv->connection,
@@ -2547,7 +2787,7 @@ g_dbus_proxy_call_internal (GDBusProxy *proxy,
flags,
timeout_msec == -1 ? proxy->priv->timeout_msec : timeout_msec,
cancellable,
- (GAsyncReadyCallback) reply_cb,
+ my_callback,
simple);
#endif
@@ -2555,6 +2795,7 @@ g_dbus_proxy_call_internal (GDBusProxy *proxy,
if (reply_type != NULL)
g_variant_type_free (reply_type);
+ g_free (destination);
g_free (split_interface_name);
}
@@ -2607,7 +2848,7 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
const gchar *split_method_name;
const gchar *target_method_name;
const gchar *target_interface_name;
- const gchar *destination;
+ gchar *destination;
GVariantType *reply_type;
g_return_val_if_fail (G_IS_DBUS_PROXY (proxy), NULL);
@@ -2623,6 +2864,8 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
reply_type = NULL;
+ G_LOCK (properties_lock);
+
was_split = maybe_split_method_name (method_name, &split_interface_name, &split_method_name);
target_method_name = was_split ? split_method_name : method_name;
target_interface_name = was_split ? split_interface_name : proxy->priv->interface_name;
@@ -2631,7 +2874,7 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
if (!was_split)
{
const GDBusMethodInfo *expected_method_info;
- expected_method_info = lookup_method_info_or_warn (proxy, target_method_name);
+ expected_method_info = lookup_method_info (proxy, target_method_name);
if (expected_method_info != NULL)
reply_type = _g_dbus_compute_complete_signature (expected_method_info->out_args);
}
@@ -2639,7 +2882,7 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
destination = NULL;
if (proxy->priv->name != NULL)
{
- destination = get_destination_for_call (proxy);
+ destination = g_strdup (get_destination_for_call (proxy));
if (destination == NULL)
{
g_set_error_literal (error,
@@ -2647,10 +2890,13 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
G_IO_ERROR_FAILED,
_("Cannot invoke method; proxy is for a well-known name without an owner and proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"));
ret = NULL;
+ G_UNLOCK (properties_lock);
goto out;
}
}
+ G_UNLOCK (properties_lock);
+
#ifdef G_OS_UNIX
ret = g_dbus_connection_call_with_unix_fd_list_sync (proxy->priv->connection,
destination,
@@ -2683,6 +2929,7 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
if (reply_type != NULL)
g_variant_type_free (reply_type);
+ g_free (destination);
g_free (split_interface_name);
return ret;
@@ -2698,8 +2945,8 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
* @flags: Flags from the #GDBusCallFlags enumeration.
* @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning
* "infinite") or -1 to use the proxy default timeout.
- * @cancellable: A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: (allow-none): A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't
* care about the result of the method invocation.
* @user_data: The data to pass to @callback.
*
@@ -2718,7 +2965,7 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
*
* If the @parameters #GVariant is floating, it is consumed. This allows
* convenient 'inline' use of g_variant_new(), e.g.:
- * |[
+ * |[
* g_dbus_proxy_call (proxy,
* "TwoStrings",
* g_variant_new ("(ss)",
@@ -2728,17 +2975,24 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
* -1,
* NULL,
* (GAsyncReadyCallback) two_strings_done,
- * &data);
+ * &data);
* ]|
*
+ * If @proxy has an expected interface (see
+ * #GDBusProxy:g-interface-info) and @method_name is referenced by it,
+ * then the return value is checked against the return type.
+ *
* This is an asynchronous method. When the operation is finished,
* @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_proxy_call_finish() to get the result of
* the operation. See g_dbus_proxy_call_sync() for the synchronous
* version of this method.
*
+ * If @callback is %NULL then the D-Bus method call message will be sent with
+ * the %G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED flag set.
+ *
* Since: 2.26
*/
void
@@ -2751,7 +3005,7 @@ g_dbus_proxy_call (GDBusProxy *proxy,
GAsyncReadyCallback callback,
gpointer user_data)
{
- return g_dbus_proxy_call_internal (proxy, method_name, parameters, flags, timeout_msec, NULL, cancellable, callback, user_data);
+ g_dbus_proxy_call_internal (proxy, method_name, parameters, flags, timeout_msec, NULL, cancellable, callback, user_data);
}
/**
@@ -2784,7 +3038,7 @@ g_dbus_proxy_call_finish (GDBusProxy *proxy,
* @flags: Flags from the #GDBusCallFlags enumeration.
* @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning
* "infinite") or -1 to use the proxy default timeout.
- * @cancellable: A #GCancellable or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Synchronously invokes the @method_name method on @proxy.
@@ -2802,7 +3056,7 @@ g_dbus_proxy_call_finish (GDBusProxy *proxy,
*
* If the @parameters #GVariant is floating, it is consumed. This allows
* convenient 'inline' use of g_variant_new(), e.g.:
- * |[
+ * |[
* g_dbus_proxy_call_sync (proxy,
* "TwoStrings",
* g_variant_new ("(ss)",
@@ -2811,13 +3065,17 @@ g_dbus_proxy_call_finish (GDBusProxy *proxy,
* G_DBUS_CALL_FLAGS_NONE,
* -1,
* NULL,
- * &error);
+ * &error);
* ]|
*
* The calling thread is blocked until a reply is received. See
* g_dbus_proxy_call() for the asynchronous version of this
* method.
*
+ * If @proxy has an expected interface (see
+ * #GDBusProxy:g-interface-info) and @method_name is referenced by it,
+ * then the return value is checked against the return type.
+ *
* Returns: %NULL if @error is set. Otherwise a #GVariant tuple with
* return values. Free with g_variant_unref().
*
@@ -2848,8 +3106,8 @@ g_dbus_proxy_call_sync (GDBusProxy *proxy,
* @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning
* "infinite") or -1 to use the proxy default timeout.
* @fd_list: (allow-none): A #GUnixFDList or %NULL.
- * @cancellable: A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @callback: (allow-none): A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't
* care about the result of the method invocation.
* @user_data: The data to pass to @callback.
*
@@ -2870,13 +3128,13 @@ g_dbus_proxy_call_with_unix_fd_list (GDBusProxy *proxy,
GAsyncReadyCallback callback,
gpointer user_data)
{
- return g_dbus_proxy_call_internal (proxy, method_name, parameters, flags, timeout_msec, fd_list, cancellable, callback, user_data);
+ g_dbus_proxy_call_internal (proxy, method_name, parameters, flags, timeout_msec, fd_list, cancellable, callback, user_data);
}
/**
* g_dbus_proxy_call_with_unix_fd_list_finish:
* @proxy: A #GDBusProxy.
- * @out_fd_list: (out): Return location for a #GUnixFDList or %NULL.
+ * @out_fd_list: (out) (allow-none): Return location for a #GUnixFDList or %NULL.
* @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to g_dbus_proxy_call_with_unix_fd_list().
* @error: Return location for error or %NULL.
*
@@ -2906,8 +3164,8 @@ g_dbus_proxy_call_with_unix_fd_list_finish (GDBusProxy *proxy,
* @timeout_msec: The timeout in milliseconds (with %G_MAXINT meaning
* "infinite") or -1 to use the proxy default timeout.
* @fd_list: (allow-none): A #GUnixFDList or %NULL.
- * @out_fd_list: (out): Return location for a #GUnixFDList or %NULL.
- * @cancellable: A #GCancellable or %NULL.
+ * @out_fd_list: (out) (allow-none): Return location for a #GUnixFDList or %NULL.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
* @error: Return location for error or %NULL.
*
* Like g_dbus_proxy_call_sync() but also takes and returns #GUnixFDList objects.
@@ -2951,16 +3209,31 @@ _g_dbus_proxy_get_object (GDBusInterface *interface)
return proxy->priv->object;
}
+static GDBusObject *
+_g_dbus_proxy_dup_object (GDBusInterface *interface)
+{
+ GDBusProxy *proxy = G_DBUS_PROXY (interface);
+ GDBusObject *ret = NULL;
+
+ G_LOCK (properties_lock);
+ if (proxy->priv->object != NULL)
+ ret = g_object_ref (proxy->priv->object);
+ G_UNLOCK (properties_lock);
+ return ret;
+}
+
static void
_g_dbus_proxy_set_object (GDBusInterface *interface,
GDBusObject *object)
{
GDBusProxy *proxy = G_DBUS_PROXY (interface);
+ G_LOCK (properties_lock);
if (proxy->priv->object != NULL)
g_object_remove_weak_pointer (G_OBJECT (proxy->priv->object), (gpointer *) &proxy->priv->object);
proxy->priv->object = object;
if (proxy->priv->object != NULL)
g_object_add_weak_pointer (G_OBJECT (proxy->priv->object), (gpointer *) &proxy->priv->object);
+ G_UNLOCK (properties_lock);
}
static void
@@ -2968,6 +3241,7 @@ dbus_interface_iface_init (GDBusInterfaceIface *dbus_interface_iface)
{
dbus_interface_iface->get_info = _g_dbus_proxy_get_info;
dbus_interface_iface->get_object = _g_dbus_proxy_get_object;
+ dbus_interface_iface->dup_object = _g_dbus_proxy_dup_object;
dbus_interface_iface->set_object = _g_dbus_proxy_set_object;
}