changeset 20316:4f6afc4c79cb

merge of '2af9cd4957f255e5640362a54527c26a829fa371' and '93d058425a5fc4b776f6ec36a2989a5d45836bc0'
author Luke Schierer <lschiere@pidgin.im>
date Fri, 19 Oct 2007 17:28:43 +0000
parents 6531c165dc94 (current diff) 2c9303933770 (diff)
children ac46ffeb5b2b
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/plugins/ticker/ticker.c	Fri Oct 19 17:28:11 2007 +0000
+++ b/pidgin/plugins/ticker/ticker.c	Fri Oct 19 17:28:43 2007 +0000
@@ -124,8 +124,10 @@
 static gboolean buddy_ticker_set_pixmap_cb(gpointer data) {
 	TickerData *td = data;
 
-	buddy_ticker_update_contact(td->contact);
-	td->timeout = 0;
+	if (g_list_find(tickerbuds, td) != NULL) {
+		buddy_ticker_update_contact(td->contact);
+		td->timeout = 0;
+	}
 
 	return FALSE;
 }