comparison src/conversation.c @ 4208:da30c4977c43

[gaim-migrate @ 4445] (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 committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 05 Jan 2003 23:21:50 +0000
parents 511c2b63caa4
children a614423c648f
comparison
equal deleted inserted replaced
4207:bda7855fa32f 4208:da30c4977c43
2721 gtk_widget_show(testidea); 2721 gtk_widget_show(testidea);
2722 gtk_widget_show(convo_notebook); 2722 gtk_widget_show(convo_notebook);
2723 convo_menubar = menubar; 2723 convo_menubar = menubar;
2724 2724
2725 gtk_container_add(GTK_CONTAINER(win), testidea); 2725 gtk_container_add(GTK_CONTAINER(win), testidea);
2726 g_signal_connect(GTK_OBJECT(convo_notebook), "switch-page", 2726 g_signal_connect_after(GTK_OBJECT(convo_notebook), "switch-page",
2727 G_CALLBACK(convo_switch), NULL); 2727 G_CALLBACK(convo_switch), NULL);
2728 } else 2728 } else
2729 win = c->window = all_convos; 2729 win = c->window = all_convos;
2730 2730
2731 cont = gtk_vbox_new(FALSE, 5); 2731 cont = gtk_vbox_new(FALSE, 5);
2743 2743
2744 gtk_box_pack_start(GTK_BOX(tabby), c->tab_label, FALSE, FALSE, 0); 2744 gtk_box_pack_start(GTK_BOX(tabby), c->tab_label, FALSE, FALSE, 0);
2745 gtk_box_pack_start(GTK_BOX(tabby), c->close, FALSE, FALSE, 0); 2745 gtk_box_pack_start(GTK_BOX(tabby), c->close, FALSE, FALSE, 0);
2746 gtk_widget_show_all(tabby); 2746 gtk_widget_show_all(tabby);
2747 gtk_notebook_insert_page(GTK_NOTEBOOK(convo_notebook), cont, tabby, 2747 gtk_notebook_insert_page(GTK_NOTEBOOK(convo_notebook), cont, tabby,
2748 g_list_index(conversations, c)); 2748 g_list_index(conversations, c));
2749 gtk_notebook_set_menu_label_text(GTK_NOTEBOOK(convo_notebook), cont,
2750 c->name);
2749 2751
2750 gtk_widget_show(cont); 2752 gtk_widget_show(cont);
2751 } else { 2753 } else {
2752 cont = win = gtk_window_new(GTK_WINDOW_TOPLEVEL); 2754 cont = win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
2753 c->window = win; 2755 c->window = win;
2951 2953
2952 2954
2953 update_buttons_by_protocol(c); 2955 update_buttons_by_protocol(c);
2954 2956
2955 gtk_widget_show(win); 2957 gtk_widget_show(win);
2956
2957 if (!(im_options & OPT_IM_ONE_WINDOW) 2958 if (!(im_options & OPT_IM_ONE_WINDOW)
2958 || ((gtk_notebook_get_current_page(GTK_NOTEBOOK(convo_notebook)) == 0) 2959 || ((gtk_notebook_get_current_page(GTK_NOTEBOOK(convo_notebook)) == 0)
2959 && (c == g_list_nth_data(conversations, 0)))) 2960 && (c == g_list_nth_data(conversations, 0))))
2960 gtk_widget_grab_focus(c->entry); 2961 gtk_widget_grab_focus(c->entry);
2961 } 2962 }