summaryrefslogtreecommitdiff
path: root/gdbus
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2013-02-27 12:00:23 (GMT)
committerMarcel Holtmann <marcel@holtmann.org>2013-04-09 03:09:51 (GMT)
commitdcf4ccb94749905c20981e6e5fa25c2e59bbf1e5 (patch)
tree341bb068c4c55eb2548d264067fa34780eb48c03 /gdbus
parentde4aa7266b6e57ece9536031817dd7380ab9e242 (diff)
downloadofono-dcf4ccb94749905c20981e6e5fa25c2e59bbf1e5.tar.gz
ofono-dcf4ccb94749905c20981e6e5fa25c2e59bbf1e5.tar.xz
gdbus: Fix not calling property_changed callback
In case a property did not appear by the time proxy_added was called property_changed has to be called if it appear latter otherwise the application will be unaware of it.
Diffstat (limited to 'gdbus')
-rw-r--r--gdbus/client.c23
1 files changed, 10 insertions, 13 deletions
diff --git a/gdbus/client.c b/gdbus/client.c
index 1998fc8..c2d2346 100644
--- a/gdbus/client.c
+++ b/gdbus/client.c
@@ -205,6 +205,7 @@ static void prop_entry_free(gpointer data)
static void add_property(GDBusProxy *proxy, const char *name,
DBusMessageIter *iter, gboolean send_changed)
{
+ GDBusClient *client = proxy->client;
DBusMessageIter value;
struct prop_entry *prop;
@@ -215,20 +216,8 @@ static void add_property(GDBusProxy *proxy, const char *name,
prop = g_hash_table_lookup(proxy->prop_list, name);
if (prop != NULL) {
- GDBusClient *client = proxy->client;
-
prop_entry_update(prop, &value);
-
- if (proxy->prop_func)
- proxy->prop_func(proxy, name, &value, proxy->prop_data);
-
- if (client == NULL || send_changed == FALSE)
- return;
-
- if (client->property_changed)
- client->property_changed(proxy, name, &value,
- client->user_data);
- return;
+ goto done;
}
prop = prop_entry_new(name, &value);
@@ -237,8 +226,16 @@ static void add_property(GDBusProxy *proxy, const char *name,
g_hash_table_replace(proxy->prop_list, prop->name, prop);
+done:
if (proxy->prop_func)
proxy->prop_func(proxy, name, &value, proxy->prop_data);
+
+ if (client == NULL || send_changed == FALSE)
+ return;
+
+ if (client->property_changed)
+ client->property_changed(proxy, name, &value,
+ client->user_data);
}
static void update_properties(GDBusProxy *proxy, DBusMessageIter *iter,