Use g_clear_handle_id everywhere

Testing Done:
Compiled and ran tests in valgrind.

Reviewed at https://reviews.imfreedom.org/r/2374/

4 files changed, 8 insertions, 22 deletions

diff --git a/pidgin/gtkmedia.c b/pidgin/gtkmedia.c
index bd4ab55d25..4955ab96a1 100644
--- a/pidgin/gtkmedia.c
+++ b/pidgin/gtkmedia.c
@@ -388,9 +388,7 @@ pidgin_media_dispose(GObject *media)
 
 	g_clear_object(&gtkmedia->priv->ui);
 
-	if (gtkmedia->priv->timeout_id != 0) {
-		g_source_remove(gtkmedia->priv->timeout_id);
-	}
+	g_clear_handle_id(&gtkmedia->priv->timeout_id, g_source_remove);
 
 	g_clear_pointer(&gtkmedia->priv->recv_progressbars, g_hash_table_destroy);
 	g_clear_pointer(&gtkmedia->priv->remote_videos, g_hash_table_destroy);
@@ -768,8 +766,7 @@ pidgin_media_ready_cb(PurpleMedia *media, PidginMedia *gtkmedia, const gchar *si
 	}
 
 	if (purple_media_is_initiator(media, sid, NULL) == FALSE) {
-		if (gtkmedia->priv->timeout_id != 0)
-			g_source_remove(gtkmedia->priv->timeout_id);
+		g_clear_handle_id(&gtkmedia->priv->timeout_id, g_source_remove);
 		gtkmedia->priv->request_type |= type;
 		gtkmedia->priv->timeout_id = g_timeout_add(500,
 				(GSourceFunc)pidgin_request_timeout_cb,
diff --git a/pidgin/gtkroomlist.c b/pidgin/gtkroomlist.c
index cf48bcc315..4c1066bd25 100644
--- a/pidgin/gtkroomlist.c
+++ b/pidgin/gtkroomlist.c
@@ -80,9 +80,6 @@ pidgin_roomlist_close(PidginRoomlistDialog *dialog)
 	if (dialog->roomlist && purple_roomlist_get_in_progress(dialog->roomlist))
 		purple_roomlist_cancel_get_list(dialog->roomlist);
 
-	if (dialog->pg_update_to > 0)
-		g_source_remove(dialog->pg_update_to);
-
 	if (dialog->roomlist) {
 		PidginRoomlist *rl = NULL;
 
@@ -98,6 +95,8 @@ pidgin_roomlist_close(PidginRoomlistDialog *dialog)
 		g_object_unref(dialog->roomlist);
 	}
 
+	g_clear_handle_id(&dialog->pg_update_to, g_source_remove);
+
 	dialog->progress = NULL;
 }
 
diff --git a/pidgin/pidgindebug.c b/pidgin/pidgindebug.c
index 67ff10cb15..08d662d8e5 100644
--- a/pidgin/pidgindebug.c
+++ b/pidgin/pidgindebug.c
@@ -925,14 +925,8 @@ pidgin_debug_init(void)
 void
 pidgin_debug_uninit(void)
 {
-	if(pref_callback_id != 0) {
-		purple_prefs_disconnect_callback(pref_callback_id);
-	}
-	pref_callback_id = 0;
-	if(debug_enabled_timer != 0) {
-		g_source_remove(debug_enabled_timer);
-	}
-	debug_enabled_timer = 0;
+	g_clear_handle_id(&pref_callback_id, purple_prefs_disconnect_callback);
+	g_clear_handle_id(&debug_enabled_timer, g_source_remove);
 }
 
 void *
diff --git a/pidgin/plugins/gestures/stroke-draw.c b/pidgin/plugins/gestures/stroke-draw.c
index 6aff3ad02a..81e859877a 100644
--- a/pidgin/plugins/gestures/stroke-draw.c
+++ b/pidgin/plugins/gestures/stroke-draw.c
@@ -96,10 +96,7 @@ gstroke_cancel(GtkWidget *widget, GdkEvent *event)
 {
 	last_mouse_position.invalid = TRUE;
 
-	if (timer_id > 0)
-	    g_source_remove (timer_id);
-
-	timer_id = 0;
+	g_clear_handle_id(&timer_id, g_source_remove);
 
 	if (event != NULL) {
 		gdk_seat_ungrab(gdk_event_get_seat(event));
@@ -158,9 +155,8 @@ process_event(GtkWidget *widget, GdkEvent *event, gpointer data)
 
       last_mouse_position.invalid = TRUE;
       original_widget = NULL;
-      g_source_remove (timer_id);
+      g_clear_handle_id(&timer_id, g_source_remove);
 	  gdk_seat_ungrab(gdk_event_get_seat(event));
-      timer_id = 0;
 
 			{
 				GtkWidget *history = data;