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 --- hcid/dbus-test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'hcid/dbus-test.c') diff --git a/hcid/dbus-test.c b/hcid/dbus-test.c index 1085d5c8..78766a49 100644 --- a/hcid/dbus-test.c +++ b/hcid/dbus-test.c @@ -156,7 +156,7 @@ static void audit_requestor_exited(const char *name, struct audit *audit) g_io_channel_close(audit->io); } if (audit->timeout) - g_timeout_remove(audit->timeout); + g_source_remove(audit->timeout); audit_free(audit); } @@ -282,7 +282,7 @@ static gboolean l2raw_data_callback(GIOChannel *io, GIOCondition cond, struct au return TRUE; if (audit->timeout) { - g_timeout_remove(audit->timeout); + g_source_remove(audit->timeout); audit->timeout = 0; } @@ -311,7 +311,7 @@ static gboolean l2raw_data_callback(GIOChannel *io, GIOCondition cond, struct au return TRUE; if (audit->timeout) { - g_timeout_remove(audit->timeout); + g_source_remove(audit->timeout); audit->timeout = 0; } @@ -325,7 +325,7 @@ static gboolean l2raw_data_callback(GIOChannel *io, GIOCondition cond, struct au failed: if (audit->timeout) { - g_timeout_remove(audit->timeout); + g_source_remove(audit->timeout); audit->timeout = 0; } @@ -546,7 +546,7 @@ static DBusHandlerResult cancel_audit_remote_device(DBusConnection *conn, g_io_channel_close(audit->io); } if (audit->timeout) - g_timeout_remove(audit->timeout); + g_source_remove(audit->timeout); audits = g_slist_remove(audits, audit); name_listener_remove(audit->conn, audit->requestor, -- cgit