Return-Path: From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ 02/10] gdbus: Remove connection from g_dbus_remove_watch Date: Mon, 1 Oct 2012 20:53:33 +0300 Message-Id: <1349114021-19067-2-git-send-email-luiz.dentz@gmail.com> In-Reply-To: <1349114021-19067-1-git-send-email-luiz.dentz@gmail.com> References: <1349114021-19067-1-git-send-email-luiz.dentz@gmail.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: From: Luiz Augusto von Dentz The connection is not really needed since the list of listeners is global not per connection, besides it is more convenient this way as only the id is needed. --- gdbus/gdbus.h | 2 +- gdbus/watch.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 0a8a27c..3bd8986 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -217,7 +217,7 @@ guint g_dbus_add_signal_watch(DBusConnection *connection, const char *interface, const char *member, GDBusSignalFunction function, void *user_data, GDBusDestroyFunction destroy); -gboolean g_dbus_remove_watch(DBusConnection *connection, guint tag); +gboolean g_dbus_remove_watch(guint id); void g_dbus_remove_all_watches(DBusConnection *connection); #ifdef __cplusplus diff --git a/gdbus/watch.c b/gdbus/watch.c index 07feb61..00cedae 100644 --- a/gdbus/watch.c +++ b/gdbus/watch.c @@ -285,7 +285,7 @@ static void filter_data_free(struct filter_data *data) g_free(l->data); g_slist_free(data->callbacks); - g_dbus_remove_watch(data->connection, data->name_watch); + g_dbus_remove_watch(data->name_watch); g_free(data->name); g_free(data->owner); g_free(data->path); @@ -752,7 +752,7 @@ guint g_dbus_add_signal_watch(DBusConnection *connection, return cb->id; } -gboolean g_dbus_remove_watch(DBusConnection *connection, guint id) +gboolean g_dbus_remove_watch(guint id) { struct filter_data *data; struct filter_callback *cb; -- 1.7.11.4