[Gaim-commits] CVS: gaim/src conversation.c,1.461,1.462

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15202/src

Modified Files:
	conversation.c 
Log Message:
(18:14:14) faceprint: http://faceprint.com/code/gaim/fix-tabs.20030105.1729.diff  <-- fixes the tabs + incoming IM focus problem, and gives the 
right-click menu for the tabs meaningful names


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -d -r1.461 -r1.462
--- conversation.c	4 Jan 2003 21:01:17 -0000	1.461
+++ conversation.c	5 Jan 2003 23:21:50 -0000	1.462
@@ -2723,7 +2723,7 @@
 			convo_menubar = menubar;
 
 			gtk_container_add(GTK_CONTAINER(win), testidea);
-			g_signal_connect(GTK_OBJECT(convo_notebook), "switch-page",
+			g_signal_connect_after(GTK_OBJECT(convo_notebook), "switch-page",
 					   G_CALLBACK(convo_switch), NULL);
 		} else
 			win = c->window = all_convos;
@@ -2745,7 +2745,9 @@
 		gtk_box_pack_start(GTK_BOX(tabby), c->close, FALSE, FALSE, 0);
 		gtk_widget_show_all(tabby);
 		gtk_notebook_insert_page(GTK_NOTEBOOK(convo_notebook), cont, tabby,
-					 g_list_index(conversations, c));
+				g_list_index(conversations, c));
+		gtk_notebook_set_menu_label_text(GTK_NOTEBOOK(convo_notebook), cont,
+				c->name);
 
 		gtk_widget_show(cont);
 	} else {
@@ -2953,7 +2955,6 @@
 	update_buttons_by_protocol(c);
 
 	gtk_widget_show(win);
-
 	if (!(im_options & OPT_IM_ONE_WINDOW)
 			|| ((gtk_notebook_get_current_page(GTK_NOTEBOOK(convo_notebook)) == 0)
 				&& (c == g_list_nth_data(conversations, 0))))