changeset 20314:2c9303933770

merge of '029866e9fec9b313cae45784eb3e016ed27f0caa' and '800279cffbdd3f77820741bcecee364d3391b204'
author Luke Schierer <lschiere@pidgin.im>
date Fri, 19 Oct 2007 17:28:40 +0000
parents eda97aca0b24 (diff) 8e54d39743cd (current diff)
children 4f6afc4c79cb
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:26 2007 +0000
+++ b/pidgin/plugins/ticker/ticker.c	Fri Oct 19 17:28:40 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;
 }