service: Always zero the timeout id when timer triggers
authorPatrik Flykt <patrik.flykt@linux.intel.com>
Mon, 20 Aug 2012 12:43:52 +0000 (15:43 +0300)
committerPatrik Flykt <patrik.flykt@linux.intel.com>
Wed, 22 Aug 2012 06:05:56 +0000 (09:05 +0300)
The timer id was not cleared in case the signal creation failed.

src/service.c

index d519c73..e2fa389 100644 (file)
@@ -4068,6 +4068,8 @@ static gboolean service_send_changed(gpointer data)
 
        DBG("");
 
+       services_notify->id = 0;
+
        signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
                        CONNMAN_MANAGER_INTERFACE, "ServicesChanged");
        if (signal == NULL)
@@ -4090,7 +4092,6 @@ static gboolean service_send_changed(gpointer data)
        g_hash_table_remove_all(services_notify->remove);
        g_hash_table_remove_all(services_notify->add);
 
-       services_notify->id = 0;
        return FALSE;
 }