mirror of git://git.sysmocom.de/ofono
gdbus: Implement PropertiesChanged signal
This commit is contained in:
parent
fd33855e53
commit
a8e02420b4
|
@ -254,6 +254,9 @@ void g_dbus_pending_property_error_valist(DBusConnection *connection,
|
|||
void g_dbus_pending_property_error(DBusConnection *connection,
|
||||
GDBusPendingReply id, const char *name,
|
||||
const char *format, ...);
|
||||
void g_dbus_emit_property_changed(DBusConnection *connection,
|
||||
const char *path, const char *interface,
|
||||
const char *name);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
108
gdbus/object.c
108
gdbus/object.c
|
@ -48,6 +48,7 @@ struct generic_data {
|
|||
GSList *added;
|
||||
GSList *removed;
|
||||
guint process_id;
|
||||
gboolean pending_prop;
|
||||
char *introspect;
|
||||
struct generic_data *parent;
|
||||
};
|
||||
|
@ -57,6 +58,7 @@ struct interface_data {
|
|||
const GDBusMethodTable *methods;
|
||||
const GDBusSignalTable *signals;
|
||||
const GDBusPropertyTable *properties;
|
||||
GSList *pending_prop;
|
||||
void *user_data;
|
||||
GDBusDestroyFunction destroy;
|
||||
};
|
||||
|
@ -74,6 +76,9 @@ struct property_data {
|
|||
};
|
||||
|
||||
static gboolean process_changes(gpointer user_data);
|
||||
static void process_properties_from_interface(struct generic_data *data,
|
||||
struct interface_data *iface);
|
||||
static void process_property_changes(struct generic_data *data);
|
||||
|
||||
static void print_arguments(GString *gstr, const GDBusArgInfo *args,
|
||||
const char *direction)
|
||||
|
@ -952,6 +957,10 @@ static gboolean process_changes(gpointer user_data)
|
|||
if (data->added != NULL)
|
||||
emit_interfaces_added(data);
|
||||
|
||||
/* Flush pending properties */
|
||||
if (data->pending_prop == TRUE)
|
||||
process_property_changes(data);
|
||||
|
||||
if (data->removed != NULL)
|
||||
emit_interfaces_removed(data);
|
||||
|
||||
|
@ -968,8 +977,7 @@ static void generic_unregister(DBusConnection *connection, void *user_data)
|
|||
|
||||
if (data->process_id > 0) {
|
||||
g_source_remove(data->process_id);
|
||||
if (data->removed != NULL)
|
||||
emit_interfaces_removed(data);
|
||||
process_changes(data);
|
||||
}
|
||||
|
||||
g_slist_foreach(data->objects, reset_parent, data->parent);
|
||||
|
@ -1481,3 +1489,99 @@ gboolean g_dbus_emit_signal_valist(DBusConnection *connection,
|
|||
return emit_signal_valist(connection, path, interface,
|
||||
name, type, args);
|
||||
}
|
||||
|
||||
static void process_properties_from_interface(struct generic_data *data,
|
||||
struct interface_data *iface)
|
||||
{
|
||||
GSList *l;
|
||||
DBusMessage *signal;
|
||||
DBusMessageIter iter, dict, array;
|
||||
|
||||
if (iface->pending_prop == NULL)
|
||||
return;
|
||||
|
||||
signal = dbus_message_new_signal(data->path,
|
||||
DBUS_INTERFACE_PROPERTIES, "PropertiesChanged");
|
||||
if (signal == NULL) {
|
||||
error("Unable to allocate new " DBUS_INTERFACE_PROPERTIES
|
||||
".PropertiesChanged signal");
|
||||
return;
|
||||
}
|
||||
|
||||
iface->pending_prop = g_slist_reverse(iface->pending_prop);
|
||||
|
||||
dbus_message_iter_init_append(signal, &iter);
|
||||
dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &iface->name);
|
||||
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
|
||||
DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
|
||||
DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
|
||||
DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
|
||||
|
||||
for (l = iface->pending_prop; l != NULL; l = l->next) {
|
||||
GDBusPropertyTable *p = l->data;
|
||||
|
||||
if (p->get == NULL)
|
||||
continue;
|
||||
|
||||
if (p->exists != NULL && !p->exists(p, iface->user_data))
|
||||
continue;
|
||||
|
||||
append_property(iface, p, &dict);
|
||||
}
|
||||
|
||||
dbus_message_iter_close_container(&iter, &dict);
|
||||
dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,
|
||||
DBUS_TYPE_STRING_AS_STRING, &array);
|
||||
dbus_message_iter_close_container(&iter, &array);
|
||||
|
||||
g_dbus_send_message(data->conn, signal);
|
||||
|
||||
g_slist_free(iface->pending_prop);
|
||||
iface->pending_prop = NULL;
|
||||
}
|
||||
|
||||
static void process_property_changes(struct generic_data *data)
|
||||
{
|
||||
GSList *l;
|
||||
|
||||
for (l = data->interfaces; l != NULL; l = l->next) {
|
||||
struct interface_data *iface = l->data;
|
||||
|
||||
process_properties_from_interface(data, iface);
|
||||
}
|
||||
|
||||
data->pending_prop = FALSE;
|
||||
}
|
||||
|
||||
void g_dbus_emit_property_changed(DBusConnection *connection,
|
||||
const char *path, const char *interface,
|
||||
const char *name)
|
||||
{
|
||||
const GDBusPropertyTable *property;
|
||||
struct generic_data *data;
|
||||
struct interface_data *iface;
|
||||
|
||||
if (!dbus_connection_get_object_path_data(connection, path,
|
||||
(void **) &data) || data == NULL)
|
||||
return;
|
||||
|
||||
iface = find_interface(data->interfaces, interface);
|
||||
if (iface == NULL)
|
||||
return;
|
||||
|
||||
property = find_property(iface->properties, name);
|
||||
if (property == NULL) {
|
||||
error("Could not find property %s in %p", name,
|
||||
iface->properties);
|
||||
return;
|
||||
}
|
||||
|
||||
data->pending_prop = TRUE;
|
||||
iface->pending_prop = g_slist_prepend(iface->pending_prop,
|
||||
(void *) property);
|
||||
|
||||
if (!data->process_id) {
|
||||
data->process_id = g_idle_add(process_changes, data);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue