Mercurial > pidgin3 / file diff

--- a/pidgin/plugins/ticker/ticker.c	Sun Nov 03 20:33:05 2019 +0300
+++ b/pidgin/plugins/ticker/ticker.c	Sun Nov 03 20:37:07 2019 +0300
@@ -188,12 +188,16 @@
 	td->timeout = g_timeout_add(11000, buddy_ticker_set_pixmap_cb, td);
 }
 
+static void ticker_data_free(TickerData *td) {
+	if (td->timeout != 0)
+		g_source_remove(td->timeout);
+	g_free(td);
+}
+
 static void buddy_ticker_remove(TickerData *td) {
 	gtk_ticker_remove(GTK_TICKER(ticker), td->ebox);
 	tickerbuds = g_list_remove(tickerbuds, td);
-	if (td->timeout != 0)
-		g_source_remove(td->timeout);
-	g_free(td);
+	ticker_data_free(td);
 }
 
 static void buddy_ticker_update_contact(PurpleContact *contact) {
@@ -287,20 +291,14 @@
 static void
 signoff_cb(PurpleConnection *gc)
 {
-	TickerData *td;
 	if (!purple_connections_get_all()) {
-		while (tickerbuds) {
-			td = tickerbuds->data;
-			tickerbuds = g_list_delete_link(tickerbuds, tickerbuds);
-			if (td->timeout != 0)
-				g_source_remove(td->timeout);
-			g_free(td);
-		}
+		g_list_free_full(tickerbuds, (GDestroyNotify)ticker_data_free);
 		gtk_widget_destroy(tickerwindow);
 		tickerwindow = NULL;
 		ticker = NULL;
 	} else {
 		GList *t = tickerbuds;
+		TickerData *td;
 		while (t) {
 			td = t->data;
 			t = t->next;
@@ -361,15 +359,7 @@
 static gboolean
 plugin_unload(PurplePlugin *plugin, GError **error)
 {
-	TickerData *td;
-
-	while (tickerbuds) {
-		td = tickerbuds->data;
-		tickerbuds = g_list_delete_link(tickerbuds, tickerbuds);
-		if (td->timeout != 0)
-			g_source_remove(td->timeout);
-		g_free(td);
-	}
+	g_list_free_full(tickerbuds, (GDestroyNotify)ticker_data_free);
 
 	if (tickerwindow != NULL) {
 		gtk_widget_destroy(tickerwindow);