[PATCH 0/4] Add bus name to signal watches

[PATCH 0/4] Add bus name to signal watches

[Lucas De Marchi]

[-- Attachment #1: Type: text/plain, Size: 781 bytes --]

First patch is just one that was still pending locally. The other ones fix the
calls to g_dbus_add_signal_watch() to actually watch only the desired bus. It
depends on previous patch for gdbus to be applied first, otherwise libdbus may
call abort() when we exit.

Lucas De Marchi (4):
  README: add information about mailing list and site
  bluetooth: watch for signals only on BLUEZ_SERVICE
  stemgr: watch for signals only on MGR_SERVICE
  tools: watch for signals only on OFONO_SERVICE

 README               |  9 +++++++++
 plugins/bluetooth.c  | 13 ++++++++-----
 plugins/stemgr.c     |  4 ++--
 tools/auto-enable.c  | 20 ++++++++++----------
 tools/huawei-audio.c | 17 +++++++++--------
 5 files changed, 38 insertions(+), 25 deletions(-)

-- 
1.7.11.1

[PATCH 1/4] README: add information about mailing list and site

[Lucas De Marchi]

[-- Attachment #1: Type: text/plain, Size: 528 bytes --]

---
 README | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README b/README
index 413d789..e424157 100644
--- a/README
+++ b/README
@@ -27,3 +27,12 @@ Kernel Dependencies
 
 In order to have the PPP stack working in oFono you need to enable CONFIG_TUN
 (Universal TUN/TAP device driver support) in your kernel .config.
+
+Information
+===========
+
+Mailing list:
+	ofono(a)ofono.org
+
+For additional information about the project visit oFono web site:
+	http://www.ofono.org
-- 
1.7.11.1

[PATCH 2/4] bluetooth: watch for signals only on BLUEZ_SERVICE

[Lucas De Marchi]

[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]

---
 plugins/bluetooth.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index cb5fe24..91c8d18 100644
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -840,22 +840,25 @@ static void bluetooth_ref(void)
 					bluetooth_connect,
 					bluetooth_disconnect, NULL, NULL);
 
-	adapter_added_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
-						BLUEZ_MANAGER_INTERFACE,
+	adapter_added_watch = g_dbus_add_signal_watch(connection, BLUEZ_SERVICE,
+						NULL, BLUEZ_MANAGER_INTERFACE,
 						"AdapterAdded",
 						adapter_added, NULL, NULL);
 
-	adapter_removed_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+	adapter_removed_watch = g_dbus_add_signal_watch(connection,
+						BLUEZ_SERVICE, NULL,
 						BLUEZ_MANAGER_INTERFACE,
 						"AdapterRemoved",
 						adapter_removed, NULL, NULL);
 
-	device_removed_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+	device_removed_watch = g_dbus_add_signal_watch(connection,
+						BLUEZ_SERVICE, NULL,
 						BLUEZ_ADAPTER_INTERFACE,
 						"DeviceRemoved",
 						device_removed, NULL, NULL);
 
-	property_watch = g_dbus_add_signal_watch(connection, NULL, NULL,
+	property_watch = g_dbus_add_signal_watch(connection,
+						BLUEZ_SERVICE, NULL,
 						BLUEZ_DEVICE_INTERFACE,
 						"PropertyChanged",
 						property_changed, NULL, NULL);
-- 
1.7.11.1

[PATCH 3/4] stemgr: watch for signals only on MGR_SERVICE

[Lucas De Marchi]

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

---
 plugins/stemgr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/stemgr.c b/plugins/stemgr.c
index 126ec4e..7e434d3 100644
--- a/plugins/stemgr.c
+++ b/plugins/stemgr.c
@@ -337,8 +337,8 @@ static gboolean property_changed(DBusConnection *connection,
 
 static void mgr_connect(DBusConnection *connection, void *user_data)
 {
-	property_changed_watch = g_dbus_add_signal_watch(connection, NULL,
-						NULL,
+	property_changed_watch = g_dbus_add_signal_watch(connection,
+						MGR_SERVICE, NULL,
 						MGR_MODEM_INTERFACE,
 						PROPERTY_CHANGED,
 						property_changed,
-- 
1.7.11.1

[PATCH 4/4] tools: watch for signals only on OFONO_SERVICE

[Lucas De Marchi]

[-- Attachment #1: Type: text/plain, Size: 3222 bytes --]

---
 tools/auto-enable.c  | 20 ++++++++++----------
 tools/huawei-audio.c | 17 +++++++++--------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/tools/auto-enable.c b/tools/auto-enable.c
index 1d5b53b..87fb0a8 100644
--- a/tools/auto-enable.c
+++ b/tools/auto-enable.c
@@ -246,7 +246,7 @@ static void create_modem(DBusConnection *conn,
 	modem->conn = dbus_connection_ref(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);
 
 	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,
 						NULL, destroy_modem);
 
-	modem_added_watch = g_dbus_add_signal_watch(conn, NULL, NULL,
-				OFONO_MANAGER_INTERFACE, "ModemAdded",
-						modem_added, NULL, NULL);
-	modem_removed_watch = g_dbus_add_signal_watch(conn, NULL, NULL,
-				OFONO_MANAGER_INTERFACE, "ModemRemoved",
-						modem_removed, NULL, NULL);
-	modem_changed_watch = g_dbus_add_signal_watch(conn, NULL, NULL,
-				OFONO_MODEM_INTERFACE, "PropertyChanged",
-						modem_changed, NULL, NULL);
+	modem_added_watch = g_dbus_add_signal_watch(conn, OFONO_SERVICE,
+				NULL, OFONO_MANAGER_INTERFACE, "ModemAdded",
+				modem_added, NULL, NULL);
+	modem_removed_watch = g_dbus_add_signal_watch(conn, OFONO_SERVICE,
+				NULL, OFONO_MANAGER_INTERFACE, "ModemRemoved",
+				modem_removed, NULL, NULL);
+	modem_changed_watch = g_dbus_add_signal_watch(conn, OFONO_SERVICE,
+				NULL, OFONO_MODEM_INTERFACE, "PropertyChanged",
+				modem_changed, NULL, NULL);
 
 	get_modems(conn);
 }
diff --git a/tools/huawei-audio.c b/tools/huawei-audio.c
index 8f3c572..9997a58 100644
--- a/tools/huawei-audio.c
+++ b/tools/huawei-audio.c
@@ -514,17 +514,18 @@ static void create_modem(DBusConnection *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,
 				"CallAdded", call_added, modem, NULL);
-	modem->call_removed_watch = g_dbus_add_signal_watch(conn, NULL,
-				modem->path, OFONO_CALLMANAGER_INTERFACE,
-				"CallRemoved", call_removed, modem, NULL);
-	modem->call_changed_watch = g_dbus_add_signal_watch(conn, NULL,
-				NULL, OFONO_CALL_INTERFACE,
+	modem->call_removed_watch = g_dbus_add_signal_watch(conn,
+				OFONO_SERVICE, modem->path,
+				OFONO_CALLMANAGER_INTERFACE, "CallRemoved",
+				call_removed, modem, NULL);
+	modem->call_changed_watch = g_dbus_add_signal_watch(conn,
+				OFONO_SERVICE, NULL, OFONO_CALL_INTERFACE,
 				"PropertyChanged", call_changed, modem, NULL);
-	modem->audio_changed_watch = g_dbus_add_signal_watch(conn, NULL,
-				NULL, OFONO_AUDIO_INTERFACE,
+	modem->audio_changed_watch = g_dbus_add_signal_watch(conn,
+				OFONO_SERVICE, NULL, OFONO_AUDIO_INTERFACE,
 				"PropertyChanged", audio_changed, modem, NULL);
 
 	g_hash_table_replace(modem_list, modem->path, modem);
-- 
1.7.11.1

Re: [PATCH 0/4] Add bus name to signal watches

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 944 bytes --]

Hi Lucas,

On 06/28/2012 08:59 AM, Lucas De Marchi wrote:
> First patch is just one that was still pending locally. The other ones fix the
> calls to g_dbus_add_signal_watch() to actually watch only the desired bus. It
> depends on previous patch for gdbus to be applied first, otherwise libdbus may
> call abort() when we exit.
>
> Lucas De Marchi (4):
>    README: add information about mailing list and site
>    bluetooth: watch for signals only on BLUEZ_SERVICE
>    stemgr: watch for signals only on MGR_SERVICE
>    tools: watch for signals only on OFONO_SERVICE
>
>   README               |  9 +++++++++
>   plugins/bluetooth.c  | 13 ++++++++-----
>   plugins/stemgr.c     |  4 ++--
>   tools/auto-enable.c  | 20 ++++++++++----------
>   tools/huawei-audio.c | 17 +++++++++--------
>   5 files changed, 38 insertions(+), 25 deletions(-)
>

All patches in this series have been pushed, thanks.

Regards,
-Denis