diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2007-01-20 14:43:59 +0000 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2007-01-20 14:43:59 +0000 |
| commit | f2fdd9fee9109cb0fa7f37a26acd0b1eaf2f40f2 (patch) | |
| tree | 1140b225e33ef166d7a256e7ad0efd3195161f57 /hcid/dbus-service.c | |
| parent | 72c746b089906cafd0c10880aca3fbe78198054b (diff) | |
Get rid of g_timeout_remove and g_io_remove_watch in favor for g_source_remove
Diffstat (limited to 'hcid/dbus-service.c')
| -rw-r--r-- | hcid/dbus-service.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c index ac3e4cc8..e1be0797 100644 --- a/hcid/dbus-service.c +++ b/hcid/dbus-service.c @@ -293,7 +293,7 @@ static DBusHandlerResult service_filter(DBusConnection *conn, } if (service->startup_timer) { - g_timeout_remove(service->startup_timer); + g_source_remove(service->startup_timer); service->startup_timer = 0; } else debug("service_filter: timeout was already removed!"); @@ -322,7 +322,7 @@ static void abort_startup(struct service *service, DBusConnection *conn, int eco dbus_connection_remove_filter(get_dbus_connection(), service_filter, service); - g_timeout_remove(service->startup_timer); + g_source_remove(service->startup_timer); service->startup_timer = 0; if (service->action) { @@ -350,7 +350,7 @@ static void service_died(GPid pid, gint status, gpointer data) abort_startup(service, get_dbus_connection(), ECANCELED); if (service->shutdown_timer) { - g_timeout_remove(service->shutdown_timer); + g_source_remove(service->shutdown_timer); service->shutdown_timer = 0; } |