# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1055709240 0
# Node ID 6889b89cab90f7414011a2ff3ea9c297cc529597
# Parent  74e273e22f94a1d47399837440598d73b6c29ecf
[gaim-migrate @ 6334]
When adding a conversation to a window or moving it off a window, we
were registering a signal handler for an object that was NULL. We only
wanted to register this for new conversations, not ones being moved. This
is now fixed.

committer: Tailor Script <tailor@pidgin.im>

diff -r 74e273e22f94 -r 6889b89cab90 src/gtkconv.c
--- a/src/gtkconv.c	Sun Jun 15 20:23:52 2003 +0000
+++ b/src/gtkconv.c	Sun Jun 15 20:34:00 2003 +0000
@@ -2248,7 +2248,7 @@
 			g_object_set_data(G_OBJECT(menuitem), "gaim_account", account);
 
 			g_signal_connect(G_OBJECT(menuitem), "activate",
-					G_CALLBACK(menu_conv_sel_send_cb), NULL);
+							 G_CALLBACK(menu_conv_sel_send_cb), NULL);
 
 			gtk_widget_show(menuitem);
 			gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -3617,11 +3617,12 @@
 		new_ui = TRUE;
 		
 		gtkconv->make_sound = TRUE;
+
+		g_signal_connect_swapped(G_OBJECT(pane), "focus",
+								 G_CALLBACK(gtk_widget_grab_focus),
+								 gtkconv->entry);
 	}
 
-	g_signal_connect_swapped(G_OBJECT(pane), "focus",
-							 G_CALLBACK(gtk_widget_grab_focus), gtkconv->entry);
-
 	gtkconv->tabby = tabby = gtk_hbox_new(FALSE, 5);
 
 	/* Close button. */