luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 14:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 623538 – GDBusProxy::g-properties-changed emission for corner cases

Browse Source 
Also emit GDBusProxy::g-properties-changed when dropping (when the
name owner vanishes) or populating (when loading properties) the
property cache.

https://bugzilla.gnome.org/show_bug.cgi?id=623538

Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen 2010-07-07 09:50:44 -04:00
parent ea0607438b
commit a38fed1b43
1 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gio/gdbusproxy.c
View File

@ -833,7 +833,7 @@ process_get_all_reply (GDBusProxy *proxy,
gchar *key; gchar *key;
GVariant *value; GVariant *value;
if (strcmp (g_variant_get_type_string (result), "(a{sv})") != 0) 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)); g_variant_get_type_string (result));
@ -843,14 +843,28 @@ process_get_all_reply (GDBusProxy *proxy,
g_variant_get (result, "(a{sv})", &iter); g_variant_get (result, "(a{sv})", &iter);
while (g_variant_iter_next (iter, "{sv}", &key, &value)) while (g_variant_iter_next (iter, "{sv}", &key, &value))
{ {
/*g_print ("got %s -> %s\n", key, g_variant_print (value, FALSE));*/
g_hash_table_insert (proxy->priv->properties, g_hash_table_insert (proxy->priv->properties,
key, /* adopts string */ key, /* adopts string */
value); /* adopts value */ value); /* adopts value */
} }
g_variant_iter_free (iter); g_variant_iter_free (iter);
/* Synthesize ::g-properties-changed changed */
if (g_hash_table_size (proxy->priv->properties) > 0)
{
GVariant *changed_properties;
const gchar *invalidated_properties[1] = {NULL};
g_variant_get (result,
"(@a{sv})",
&changed_properties);
g_signal_emit (proxy, signals[PROPERTIES_CHANGED_SIGNAL],
0,
changed_properties,
invalidated_properties);
g_variant_unref (changed_properties);
}
out: out:
; ;
} }
@ -952,7 +966,37 @@ on_name_owner_changed (GDBusConnection *connection,
{ {
g_free (proxy->priv->name_owner); g_free (proxy->priv->name_owner);
proxy->priv->name_owner = NULL; proxy->priv->name_owner = NULL;
g_hash_table_remove_all (proxy->priv->properties);
/* 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)
{
GVariantBuilder builder;
GVariant *changed_properties;
GPtrArray *invalidated_properties;
GHashTableIter iter;
const gchar *key;
/* Build changed_properties (always empty) and invalidated_properties ... */
g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
changed_properties = g_variant_builder_end (&builder);
invalidated_properties = g_ptr_array_new_with_free_func (g_free);
g_hash_table_iter_init (&iter, proxy->priv->properties);
while (g_hash_table_iter_next (&iter, (gpointer) &key, NULL))
g_ptr_array_add (invalidated_properties, g_strdup (key));
g_ptr_array_add (invalidated_properties, NULL);
/* ... throw out the properties ... */
g_hash_table_remove_all (proxy->priv->properties);
/* ... and finally emit the ::g-properties-changed signal */
g_signal_emit (proxy, signals[PROPERTIES_CHANGED_SIGNAL],
0,
changed_properties,
(const gchar* const *) invalidated_properties->pdata);
g_variant_unref (changed_properties);
g_ptr_array_unref (invalidated_properties);
}
g_object_notify (G_OBJECT (proxy), "g-name-owner"); g_object_notify (G_OBJECT (proxy), "g-name-owner");
} }
else else