summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2007-01-20 14:43:59 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2007-01-20 14:43:59 +0000
commitf2fdd9fee9109cb0fa7f37a26acd0b1eaf2f40f2 (patch)
tree1140b225e33ef166d7a256e7ad0efd3195161f57 /common
parent72c746b089906cafd0c10880aca3fbe78198054b (diff)
Get rid of g_timeout_remove and g_io_remove_watch in favor for g_source_remove
Diffstat (limited to 'common')
-rw-r--r--common/dbus.c4
1 files changed, 2 insertions, 2 deletions
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);
}