tools: watch for signals only on OFONO_SERVICE

This commit is contained in:
Lucas De Marchi 2012-06-28 10:59:21 -03:00 committed by Denis Kenzior
parent d00e030f80
commit 8f29b3a4c8
2 changed files with 19 additions and 18 deletions

View File

@ -246,7 +246,7 @@ static void create_modem(DBusConnection *conn,
modem->conn = dbus_connection_ref(conn); modem->conn = dbus_connection_ref(conn);
modem->sim_changed_watch = g_dbus_add_signal_watch(conn, modem->sim_changed_watch = g_dbus_add_signal_watch(conn,
NULL, NULL, OFONO_SIM_INTERFACE, OFONO_SERVICE, NULL, OFONO_SIM_INTERFACE,
"PropertyChanged", sim_changed, modem, NULL); "PropertyChanged", sim_changed, modem, NULL);
g_hash_table_replace(modem_list, modem->path, modem); g_hash_table_replace(modem_list, modem->path, modem);
@ -420,15 +420,15 @@ static void ofono_connect(DBusConnection *conn, void *user_data)
modem_list = g_hash_table_new_full(g_str_hash, g_str_equal, modem_list = g_hash_table_new_full(g_str_hash, g_str_equal,
NULL, destroy_modem); NULL, destroy_modem);
modem_added_watch = g_dbus_add_signal_watch(conn, NULL, NULL, modem_added_watch = g_dbus_add_signal_watch(conn, OFONO_SERVICE,
OFONO_MANAGER_INTERFACE, "ModemAdded", NULL, OFONO_MANAGER_INTERFACE, "ModemAdded",
modem_added, NULL, NULL); modem_added, NULL, NULL);
modem_removed_watch = g_dbus_add_signal_watch(conn, NULL, NULL, modem_removed_watch = g_dbus_add_signal_watch(conn, OFONO_SERVICE,
OFONO_MANAGER_INTERFACE, "ModemRemoved", NULL, OFONO_MANAGER_INTERFACE, "ModemRemoved",
modem_removed, NULL, NULL); modem_removed, NULL, NULL);
modem_changed_watch = g_dbus_add_signal_watch(conn, NULL, NULL, modem_changed_watch = g_dbus_add_signal_watch(conn, OFONO_SERVICE,
OFONO_MODEM_INTERFACE, "PropertyChanged", NULL, OFONO_MODEM_INTERFACE, "PropertyChanged",
modem_changed, NULL, NULL); modem_changed, NULL, NULL);
get_modems(conn); get_modems(conn);
} }

View File

@ -514,17 +514,18 @@ static void create_modem(DBusConnection *conn,
modem->conn = conn; modem->conn = conn;
modem->call_added_watch = g_dbus_add_signal_watch(conn, NULL, modem->call_added_watch = g_dbus_add_signal_watch(conn, OFONO_SERVICE,
modem->path, OFONO_CALLMANAGER_INTERFACE, modem->path, OFONO_CALLMANAGER_INTERFACE,
"CallAdded", call_added, modem, NULL); "CallAdded", call_added, modem, NULL);
modem->call_removed_watch = g_dbus_add_signal_watch(conn, NULL, modem->call_removed_watch = g_dbus_add_signal_watch(conn,
modem->path, OFONO_CALLMANAGER_INTERFACE, OFONO_SERVICE, modem->path,
"CallRemoved", call_removed, modem, NULL); OFONO_CALLMANAGER_INTERFACE, "CallRemoved",
modem->call_changed_watch = g_dbus_add_signal_watch(conn, NULL, call_removed, modem, NULL);
NULL, OFONO_CALL_INTERFACE, modem->call_changed_watch = g_dbus_add_signal_watch(conn,
OFONO_SERVICE, NULL, OFONO_CALL_INTERFACE,
"PropertyChanged", call_changed, modem, NULL); "PropertyChanged", call_changed, modem, NULL);
modem->audio_changed_watch = g_dbus_add_signal_watch(conn, NULL, modem->audio_changed_watch = g_dbus_add_signal_watch(conn,
NULL, OFONO_AUDIO_INTERFACE, OFONO_SERVICE, NULL, OFONO_AUDIO_INTERFACE,
"PropertyChanged", audio_changed, modem, NULL); "PropertyChanged", audio_changed, modem, NULL);
g_hash_table_replace(modem_list, modem->path, modem); g_hash_table_replace(modem_list, modem->path, modem);