# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 1034618560 0
# Node ID b401bd1701b4425d10cc9ed7d0e315f1ff930ce0
# Parent  507eb0a2c7b2b0b9dec5b42e140bfa9e001f8989
[gaim-migrate @ 3830]
blah

committer: Tailor Script <tailor@pidgin.im>

diff -r 507eb0a2c7b2 -r b401bd1701b4 src/conversation.c
--- a/src/conversation.c	Mon Oct 14 17:49:14 2002 +0000
+++ b/src/conversation.c	Mon Oct 14 18:02:40 2002 +0000
@@ -2101,7 +2101,6 @@
 		style = gtk_style_new();
 		if (!GTK_WIDGET_REALIZED(label))
 			gtk_widget_realize(label);
-		gdk_font_unref(gtk_style_get_font(style));
 		gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(label->style)));
 		if (!unhighlight && flags & WFLAG_NICK) {
 			style->fg[0].red = 0x0000;
@@ -2188,10 +2187,12 @@
 	c->log_button = menuitem;  /* We should save this */
 	
 	state_lock = 1;
+
 	if (find_log_info(c->name))
-		 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(menuitem), TRUE);
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);	
 	else
-		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(menuitem), FALSE);
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE);	
+
 	state_lock = 0;
 
 	gtk_signal_connect(GTK_OBJECT(menuitem), "toggled", GTK_SIGNAL_FUNC(toggle_loggle), c);
@@ -3571,7 +3572,7 @@
 		gtk_timeout_remove(c->icon_timer);
 	c->icon_timer = 0;
 	if(c->iter)
-		g_object_unref(c->iter);
+		g_object_unref(G_OBJECT(c->iter));
 }
 
 void update_smilies(struct conversation *c)
diff -r 507eb0a2c7b2 -r b401bd1701b4 src/util.c
--- a/src/util.c	Mon Oct 14 17:49:14 2002 +0000
+++ b/src/util.c	Mon Oct 14 18:02:40 2002 +0000
@@ -1601,10 +1601,10 @@
 	gtk_label_set_pattern(GTK_LABEL(label), "_");
 	gtk_container_add(GTK_CONTAINER(menuitem), label);
 	gtk_widget_show(label);
-
+/* FIXME: Go back and fix this 
 	gtk_widget_add_accelerator(menuitem, "activate", accel, str[0],
 				   GDK_MOD1_MASK, GTK_ACCEL_LOCKED);
-
+*/
 	return menuitem;
 }