sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

gdbus: Use a GPtrArray for the match rules

This commit is contained in:
Marcel Holtmann 2012-12-14 18:23:39 +01:00
parent 7ba21da7f3
commit ec448e4d36
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
gdbus/client.c
View File

@ -36,7 +36,7 @@ struct GDBusClient {
char *service_name; char *service_name;
char *unique_name; char *unique_name;
char *base_path; char *base_path;
char *match_rules[4]; GPtrArray *match_rules;
DBusPendingCall *pending_call; DBusPendingCall *pending_call;
GDBusWatchFunction connect_func; GDBusWatchFunction connect_func;
void *connect_data; void *connect_data;
@ -765,7 +765,7 @@ GDBusClient *g_dbus_client_new(DBusConnection *connection,
const char *service, const char *path) const char *service, const char *path)
{ {
GDBusClient *client; GDBusClient *client;
int i; unsigned int i;
if (connection == NULL) if (connection == NULL)
return NULL; return NULL;
@ -786,26 +786,31 @@ GDBusClient *g_dbus_client_new(DBusConnection *connection,
get_name_owner(client, client->service_name); get_name_owner(client, client->service_name);
client->match_rules[0] = g_strdup_printf("type='signal',sender='%s'," client->match_rules = g_ptr_array_new_full(4, g_free);
"path='%s',interface='%s',"
g_ptr_array_add(client->match_rules, g_strdup_printf("type='signal',"
"sender='%s',path='%s',interface='%s',"
"member='NameOwnerChanged',arg0='%s'", "member='NameOwnerChanged',arg0='%s'",
DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS, client->service_name); DBUS_INTERFACE_DBUS, client->service_name));
client->match_rules[1] = g_strdup_printf("type='signal',sender='%s'," g_ptr_array_add(client->match_rules, g_strdup_printf("type='signal',"
"sender='%s',"
"path='/',interface='%s.ObjectManager'," "path='/',interface='%s.ObjectManager',"
"member='InterfacesAdded'", "member='InterfacesAdded'",
client->service_name, DBUS_INTERFACE_DBUS); client->service_name, DBUS_INTERFACE_DBUS));
client->match_rules[2] = g_strdup_printf("type='signal',sender='%s'," g_ptr_array_add(client->match_rules, g_strdup_printf("type='signal',"
"sender='%s',"
"path='/',interface='%s.ObjectManager'," "path='/',interface='%s.ObjectManager',"
"member='InterfacesRemoved'", "member='InterfacesRemoved'",
client->service_name, DBUS_INTERFACE_DBUS); client->service_name, DBUS_INTERFACE_DBUS));
client->match_rules[3] = g_strdup_printf("type='signal',sender='%s'," g_ptr_array_add(client->match_rules, g_strdup_printf("type='signal',"
"path_namespace='%s'", "sender='%s',path_namespace='%s'",
client->service_name, client->base_path); client->service_name, client->base_path));
for (i = 0; i < 4; i++) for (i = 0; i < client->match_rules->len; i++) {
modify_match(client->dbus_conn, "AddMatch", modify_match(client->dbus_conn, "AddMatch",
client->match_rules[i]); g_ptr_array_index(client->match_rules, i));
}
return g_dbus_client_ref(client); return g_dbus_client_ref(client);
} }
@ -822,7 +827,7 @@ GDBusClient *g_dbus_client_ref(GDBusClient *client)
void g_dbus_client_unref(GDBusClient *client) void g_dbus_client_unref(GDBusClient *client)
{ {
int i; unsigned int i;
if (client == NULL) if (client == NULL)
return; return;
@ -835,12 +840,13 @@ void g_dbus_client_unref(GDBusClient *client)
dbus_pending_call_unref(client->pending_call); dbus_pending_call_unref(client->pending_call);
} }
for (i = 0; i < 4; i++) { for (i = 0; i < client->match_rules->len; i++) {
modify_match(client->dbus_conn, "RemoveMatch", modify_match(client->dbus_conn, "RemoveMatch",
client->match_rules[i]); g_ptr_array_index(client->match_rules, i));
g_free(client->match_rules[i]);
} }
g_ptr_array_free(client->match_rules, TRUE);
dbus_connection_remove_filter(client->dbus_conn, dbus_connection_remove_filter(client->dbus_conn,
message_filter, client); message_filter, client);