From f2fdd9fee9109cb0fa7f37a26acd0b1eaf2f40f2 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Sat, 20 Jan 2007 14:43:59 +0000 Subject: Get rid of g_timeout_remove and g_io_remove_watch in favor for g_source_remove --- common/dbus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/dbus.c') diff --git a/common/dbus.c b/common/dbus.c index bdcb1684..b6d852c3 100644 --- a/common/dbus.c +++ b/common/dbus.c @@ -453,7 +453,7 @@ static void remove_watch(DBusWatch *watch, void *data) dbus_watch_set_data(watch, NULL, NULL); if (info) { - g_io_remove_watch(info->watch_id); + g_source_remove(info->watch_id); g_io_channel_unref(info->io); dbus_connection_unref(info->conn); free(info); @@ -489,7 +489,7 @@ static void timeout_handler_free(void *data) if (!handler) return; - g_timeout_remove(handler->id); + g_source_remove(handler->id); free(handler); } -- cgit