diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2012-07-15 20:19:28 -0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-07-15 20:19:28 -0300 |
| commit | 38bea83fda1343af6cfd24353ef0081982c8371f (patch) | |
| tree | 9b63907c25770af1460b3b3d556370a7b475494a | |
| parent | dd3db6f6bd3c9171596ccce343ad718691897a64 (diff) | |
| download | ofono-38bea83fda1343af6cfd24353ef0081982c8371f.tar.bz2 | |
stemgr: Avoid shadowing of connection variable
| -rw-r--r-- | plugins/stemgr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/stemgr.c b/plugins/stemgr.c index 7e434d36..0a3e4d2d 100644 --- a/plugins/stemgr.c +++ b/plugins/stemgr.c @@ -305,7 +305,7 @@ error: dbus_message_unref(message); } -static gboolean property_changed(DBusConnection *connection, +static gboolean property_changed(DBusConnection *conn, DBusMessage *message, void *user_data) { DBusMessageIter iter; @@ -335,9 +335,9 @@ static gboolean property_changed(DBusConnection *connection, return TRUE; } -static void mgr_connect(DBusConnection *connection, void *user_data) +static void mgr_connect(DBusConnection *conn, void *user_data) { - property_changed_watch = g_dbus_add_signal_watch(connection, + property_changed_watch = g_dbus_add_signal_watch(conn, MGR_SERVICE, NULL, MGR_MODEM_INTERFACE, PROPERTY_CHANGED, @@ -346,10 +346,10 @@ static void mgr_connect(DBusConnection *connection, void *user_data) get_modems(); } -static void mgr_disconnect(DBusConnection *connection, void *user_data) +static void mgr_disconnect(DBusConnection *conn, void *user_data) { g_hash_table_remove_all(modem_list); - g_dbus_remove_watch(connection, property_changed_watch); + g_dbus_remove_watch(conn, property_changed_watch); property_changed_watch = 0; } |