Mercurial > pidgin3 / file diff

--- a/libpurple/mediamanager.c	Tue Mar 21 00:46:58 2023 -0500
+++ b/libpurple/mediamanager.c	Tue Mar 21 01:59:19 2023 -0500
@@ -479,15 +479,8 @@
 	info->readable_cb_token = 0;
 	info->writable_cb_token = 0;
 
-	if (info->readable_timer_id) {
-		g_source_remove (info->readable_timer_id);
-		info->readable_timer_id = 0;
-	}
-
-	if (info->writable_timer_id) {
-		g_source_remove (info->writable_timer_id);
-		info->writable_timer_id = 0;
-	}
+	g_clear_handle_id(&info->readable_timer_id, g_source_remove);
+	g_clear_handle_id(&info->writable_timer_id, g_source_remove);
 
 	g_clear_pointer(&info->current_sample, gst_sample_unref);
 
@@ -1582,15 +1575,8 @@
 		info->notify (info->user_data);
 	}
 
-	if (info->readable_cb_token) {
-		g_source_remove (info->readable_timer_id);
-		info->readable_cb_token = 0;
-	}
-
-	if (info->writable_cb_token) {
-		g_source_remove (info->writable_timer_id);
-		info->writable_cb_token = 0;
-	}
+	g_clear_handle_id(&info->readable_cb_token, g_source_remove);
+	g_clear_handle_id(&info->writable_cb_token, g_source_remove);
 
 	if (callbacks) {
 		info->callbacks = *callbacks;