projects
/
framework
/
connectivity
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
59f52fa
)
ofono: Watch for signals only on OFONO_SERVICE
author
Lucas De Marchi
<lucas.demarchi@profusion.mobi>
Thu, 28 Jun 2012 14:20:53 +0000
(11:20 -0300)
committer
Marcel Holtmann
<marcel@holtmann.org>
Sat, 30 Jun 2012 08:36:49 +0000
(10:36 +0200)
plugins/ofono.c
patch
|
blob
|
history
diff --git
a/plugins/ofono.c
b/plugins/ofono.c
index
d284c2b
..
d9696d7
100644
(file)
--- a/
plugins/ofono.c
+++ b/
plugins/ofono.c
@@
-2553,68
+2553,71
@@
static int ofono_init(void)
OFONO_SERVICE, ofono_connect,
ofono_disconnect, NULL, NULL);
OFONO_SERVICE, ofono_connect,
ofono_disconnect, NULL, NULL);
- modem_added_watch = g_dbus_add_signal_watch(connection,
NULL, NULL
,
- OFONO_MANAGER_INTERFACE,
+ modem_added_watch = g_dbus_add_signal_watch(connection,
OFONO_SERVICE
,
+
NULL,
OFONO_MANAGER_INTERFACE,
MODEM_ADDED,
modem_added,
NULL, NULL);
MODEM_ADDED,
modem_added,
NULL, NULL);
- modem_removed_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ modem_removed_watch = g_dbus_add_signal_watch(connection,
+ OFONO_SERVICE, NULL,
OFONO_MANAGER_INTERFACE,
MODEM_REMOVED,
modem_removed,
NULL, NULL);
OFONO_MANAGER_INTERFACE,
MODEM_REMOVED,
modem_removed,
NULL, NULL);
- modem_watch = g_dbus_add_signal_watch(connection,
NULL
, NULL,
+ modem_watch = g_dbus_add_signal_watch(connection,
OFONO_SERVICE
, NULL,
OFONO_MODEM_INTERFACE,
PROPERTY_CHANGED,
modem_changed,
NULL, NULL);
OFONO_MODEM_INTERFACE,
PROPERTY_CHANGED,
modem_changed,
NULL, NULL);
- cm_watch = g_dbus_add_signal_watch(connection,
NULL
, NULL,
+ cm_watch = g_dbus_add_signal_watch(connection,
OFONO_SERVICE
, NULL,
OFONO_CM_INTERFACE,
PROPERTY_CHANGED,
cm_changed,
NULL, NULL);
OFONO_CM_INTERFACE,
PROPERTY_CHANGED,
cm_changed,
NULL, NULL);
- sim_watch = g_dbus_add_signal_watch(connection,
NULL
, NULL,
+ sim_watch = g_dbus_add_signal_watch(connection,
OFONO_SERVICE
, NULL,
OFONO_SIM_INTERFACE,
PROPERTY_CHANGED,
sim_changed,
NULL, NULL);
OFONO_SIM_INTERFACE,
PROPERTY_CHANGED,
sim_changed,
NULL, NULL);
- context_added_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ context_added_watch = g_dbus_add_signal_watch(connection,
+ OFONO_SERVICE, NULL,
OFONO_CM_INTERFACE,
CONTEXT_ADDED,
cm_context_added,
NULL, NULL);
OFONO_CM_INTERFACE,
CONTEXT_ADDED,
cm_context_added,
NULL, NULL);
- context_removed_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+ context_removed_watch = g_dbus_add_signal_watch(connection,
+ OFONO_SERVICE, NULL,
OFONO_CM_INTERFACE,
CONTEXT_REMOVED,
cm_context_removed,
NULL, NULL);
OFONO_CM_INTERFACE,
CONTEXT_REMOVED,
cm_context_removed,
NULL, NULL);
- context_watch = g_dbus_add_signal_watch(connection,
NULL, NULL
,
- OFONO_CONTEXT_INTERFACE,
+ context_watch = g_dbus_add_signal_watch(connection,
OFONO_SERVICE
,
+
NULL,
OFONO_CONTEXT_INTERFACE,
PROPERTY_CHANGED,
context_changed,
NULL, NULL);
PROPERTY_CHANGED,
context_changed,
NULL, NULL);
- netreg_watch = g_dbus_add_signal_watch(connection,
NULL
, NULL,
+ netreg_watch = g_dbus_add_signal_watch(connection,
OFONO_SERVICE
, NULL,
OFONO_NETREG_INTERFACE,
PROPERTY_CHANGED,
netreg_changed,
NULL, NULL);
OFONO_NETREG_INTERFACE,
PROPERTY_CHANGED,
netreg_changed,
NULL, NULL);
- cdma_cm_watch = g_dbus_add_signal_watch(connection,
NULL, NULL
,
- OFONO_CDMA_CM_INTERFACE,
+ cdma_cm_watch = g_dbus_add_signal_watch(connection,
OFONO_SERVICE
,
+
NULL,
OFONO_CDMA_CM_INTERFACE,
PROPERTY_CHANGED,
cdma_cm_changed,
NULL, NULL);
PROPERTY_CHANGED,
cdma_cm_changed,
NULL, NULL);
- cdma_netreg_watch = g_dbus_add_signal_watch(connection,
NULL, NULL
,
- OFONO_CDMA_NETREG_INTERFACE,
+ cdma_netreg_watch = g_dbus_add_signal_watch(connection,
OFONO_SERVICE
,
+
NULL,
OFONO_CDMA_NETREG_INTERFACE,
PROPERTY_CHANGED,
cdma_netreg_changed,
NULL, NULL);
PROPERTY_CHANGED,
cdma_netreg_changed,
NULL, NULL);