comparison src/gtkconv.c @ 10053:a4ceacb1816d

[gaim-migrate @ 11016] noif made toggling the option to show close buttons on tabs work better committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 20 Sep 2004 02:35:36 +0000
parents c9f95600d6ce
children 79fafe47d919
comparison
equal deleted inserted replaced
10052:eaec201b2688 10053:a4ceacb1816d
4644 GaimGtkConversation *gtkconv, *focus_gtkconv; 4644 GaimGtkConversation *gtkconv, *focus_gtkconv;
4645 GaimConversation *focus_conv; 4645 GaimConversation *focus_conv;
4646 GtkWidget *pane = NULL; 4646 GtkWidget *pane = NULL;
4647 GtkWidget *tab_cont; 4647 GtkWidget *tab_cont;
4648 GtkWidget *tabby, *menu_tabby; 4648 GtkWidget *tabby, *menu_tabby;
4649 GtkWidget *close_image;
4649 gboolean new_ui; 4650 gboolean new_ui;
4650 GaimConversationType conv_type; 4651 GaimConversationType conv_type;
4651 const char *name; 4652 const char *name;
4652 4653
4653 name = gaim_conversation_get_name(conv); 4654 name = gaim_conversation_get_name(conv);
4749 4750
4750 /* Close button. */ 4751 /* Close button. */
4751 gtkconv->close = gtk_button_new(); 4752 gtkconv->close = gtk_button_new();
4752 gtk_widget_set_size_request(GTK_WIDGET(gtkconv->close), 16, 16); 4753 gtk_widget_set_size_request(GTK_WIDGET(gtkconv->close), 16, 16);
4753 gtk_button_set_relief(GTK_BUTTON(gtkconv->close), GTK_RELIEF_NONE); 4754 gtk_button_set_relief(GTK_BUTTON(gtkconv->close), GTK_RELIEF_NONE);
4754 gtk_container_add(GTK_CONTAINER(gtkconv->close), 4755 close_image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
4755 gtk_image_new_from_stock(GTK_STOCK_CLOSE, 4756 gtk_widget_show(close_image);
4756 GTK_ICON_SIZE_MENU)); 4757 gtk_container_add(GTK_CONTAINER(gtkconv->close), close_image);
4757 gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close, 4758 gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close,
4758 _("Close conversation"), NULL); 4759 _("Close conversation"), NULL);
4759 4760
4760 g_signal_connect(G_OBJECT(gtkconv->close), "clicked", 4761 g_signal_connect(G_OBJECT(gtkconv->close), "clicked",
4761 G_CALLBACK(close_conv_cb), conv); 4762 G_CALLBACK(close_conv_cb), conv);
4794 gtk_widget_show(gtkconv->menu_label); 4795 gtk_widget_show(gtkconv->menu_label);
4795 gtk_misc_set_alignment(GTK_MISC(gtkconv->menu_label), 0, 0); 4796 gtk_misc_set_alignment(GTK_MISC(gtkconv->menu_label), 0, 0);
4796 4797
4797 gtk_box_pack_start(GTK_BOX(tabby), gtkconv->close, FALSE, FALSE, 0); 4798 gtk_box_pack_start(GTK_BOX(tabby), gtkconv->close, FALSE, FALSE, 0);
4798 if (gaim_prefs_get_bool("/gaim/gtk/conversations/close_on_tabs")) 4799 if (gaim_prefs_get_bool("/gaim/gtk/conversations/close_on_tabs"))
4799 gtk_widget_show_all(gtkconv->close); 4800 gtk_widget_show(gtkconv->close);
4800 4801
4801 gtk_widget_show(tabby); 4802 gtk_widget_show(tabby);
4802 gtk_widget_show(menu_tabby); 4803 gtk_widget_show(menu_tabby);
4803 4804
4804 if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) 4805 if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)