diff src/conversation.c @ 3374:3cd2fbddf95a

[gaim-migrate @ 3393] I had terrible days today and yesterday--a really terrible weekend. No cool stuff from me--the prefs away message page works a bit better. Ari and Chip both sent some patches to make things work a bit better in GTK 2, and Etan rewrote the notify plugin so it's really cool now! Thanks, guys! committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Mon, 05 Aug 2002 07:33:09 +0000
parents 3b00d97d59aa
children d59394b4c5a6
line wrap: on
line diff
--- a/src/conversation.c	Fri Aug 02 21:25:34 2002 +0000
+++ b/src/conversation.c	Mon Aug 05 07:33:09 2002 +0000
@@ -2601,7 +2601,9 @@
 		return;
 	if (c->unseen == -1) return;
 	style = gtk_style_new();
+#if !GTK_CHECK_VERSION(1,3,0)
 	gdk_font_unref(gtk_style_get_font(style));
+#endif
 	gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style)));
 	gtk_widget_set_style(label, style);
 	gtk_style_unref(style);
@@ -3574,7 +3576,8 @@
 		gtk_timeout_remove(c->icon_timer);
 	c->icon_timer = 0;
 #if GTK_CHECK_VERSION(1,3,0)
-	g_object_unref(c->iter);
+	if(c->iter)
+		g_object_unref(c->iter);
 #else
 	c->frame = 0;
 #endif