Bug 710797 - Name all the timeouts added with g_timeout_add()

5 files changed, 22 insertions, 13 deletions

diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 31aebceff2..7eccb31415 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -91,8 +91,10 @@ e_plugin_lib_enable (EPlugin *ep,
 		g_idle_add (bbdb_timeout, ep);
 
 		interval = get_check_interval ();
-		if (interval > 0)
-			update_source = g_timeout_add_seconds (interval, (GSourceFunc) bbdb_timeout, NULL);
+		if (interval > 0) {
+			update_source = e_named_timeout_add_seconds (
+				interval, bbdb_timeout, NULL);
+		}
 	}
 
 	return 0;
diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c
index 53060b768d..e21c59fd48 100644
--- a/plugins/dbx-import/dbx-importer.c
+++ b/plugins/dbx-import/dbx-importer.c
@@ -808,8 +808,8 @@ org_gnome_evolution_readdbx_import (EImport *ei,
 	m->folder_name = NULL;
 	m->folder_uri = NULL;
 
-	m->status_timeout_id = g_timeout_add (100, dbx_status_timeout, m);
-	/*m->status_timeout_id = NULL;*/
+	m->status_timeout_id =
+		e_named_timeout_add (100, dbx_status_timeout, m);
 	g_mutex_init (&m->status_lock);
 	m->cancellable = camel_operation_new ();
 
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index f68cf35c41..1d26f742af 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -190,7 +190,7 @@ connection_closed_cb (GDBusConnection *pconnection,
 	g_object_unref (connection);
 	connection = NULL;
 
-	g_timeout_add (3000, reinit_gdbus, NULL);
+	e_named_timeout_add (3000, reinit_gdbus, NULL);
 }
 
 static gboolean
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 0e4d1f68eb..914ceb7631 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -2157,8 +2157,8 @@ pst_import (EImport *ei,
 	m->journal = NULL;
 	m->waiting_open = 0;
 
-	m->status_timeout_id = g_timeout_add (100, pst_status_timeout, m);
-	/*m->status_timeout_id = NULL;*/
+	m->status_timeout_id =
+		e_named_timeout_add (100, pst_status_timeout, m);
 	g_mutex_init (&m->status_lock);
 	m->cancellable = camel_operation_new ();
 
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 2713f00dd2..b5dab40acf 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -151,7 +151,7 @@ update_publish_notification (GtkMessageType msg_type,
 			notify_notification_set_hint (
 				notify, "desktop-entry",
 				g_variant_new_string (PACKAGE));
-			g_timeout_add (500, show_notify_cb, NULL);
+			e_named_timeout_add (500, show_notify_cb, NULL);
 
 			g_signal_connect (
 				notify, "closed",
@@ -160,7 +160,8 @@ update_publish_notification (GtkMessageType msg_type,
 	}
 #endif
 
-	status_icon_timeout_id = g_timeout_add_seconds (15, remove_notification, NULL);
+	status_icon_timeout_id =
+		e_named_timeout_add_seconds (15, remove_notification, NULL);
 
 	if (new_icon) {
 		g_signal_connect (
@@ -509,11 +510,13 @@ add_timeout (EPublishUri *uri)
 	/* Set the timeout for now+frequency */
 	switch (uri->publish_frequency) {
 	case URI_PUBLISH_DAILY:
-		id = g_timeout_add_seconds (24 * 60 * 60, (GSourceFunc) publish, uri);
+		id = e_named_timeout_add_seconds (
+			24 * 60 * 60, (GSourceFunc) publish, uri);
 		g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id));
 		break;
 	case URI_PUBLISH_WEEKLY:
-		id = g_timeout_add_seconds (7 * 24 * 60 * 60, (GSourceFunc) publish, uri);
+		id = e_named_timeout_add_seconds (
+			7 * 24 * 60 * 60, (GSourceFunc) publish, uri);
 		g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id));
 		break;
 	}
@@ -587,7 +590,9 @@ add_offset_timeout (EPublishUri *uri)
 			publish (uri, FALSE);
 			add_timeout (uri);
 		} else {
-			id = g_timeout_add_seconds (24 * 60 * 60 - elapsed, (GSourceFunc) publish, uri);
+			id = e_named_timeout_add_seconds (
+				24 * 60 * 60 - elapsed,
+				(GSourceFunc) publish, uri);
 			g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id));
 			break;
 		}
@@ -597,7 +602,9 @@ add_offset_timeout (EPublishUri *uri)
 			publish (uri, FALSE);
 			add_timeout (uri);
 		} else {
-			id = g_timeout_add_seconds (7 * 24 * 60 * 60 - elapsed, (GSourceFunc) publish, uri);
+			id = e_named_timeout_add_seconds (
+				7 * 24 * 60 * 60 - elapsed,
+				(GSourceFunc) publish, uri);
 			g_hash_table_insert (uri_timeouts, uri, GUINT_TO_POINTER (id));
 			break;
 		}