Mercurial > pidgin.yaz
changeset 18863:f85e3866bf93
Let's try this again. Tabs are not visible if there's only one conversation open
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Fri, 10 Aug 2007 19:17:24 +0000 |
| parents | 5b27ae2413b7 |
| children | c4505e3efa9a |
| files | pidgin/gtkconv.c |
| diffstat | 1 files changed, 7 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Fri Aug 10 15:04:04 2007 +0000 +++ b/pidgin/gtkconv.c Fri Aug 10 19:17:24 2007 +0000 @@ -8562,8 +8562,7 @@ /* Close button. */ gtkconv->close = gtk_event_box_new(); gtk_event_box_set_visible_window(GTK_EVENT_BOX(gtkconv->close), FALSE); - close_image = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(close_image),"<b>×</b>"); + close_image = gtk_label_new("×"); gtk_widget_show(close_image); gtk_container_add(GTK_CONTAINER(gtkconv->close), close_image); gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close, @@ -8616,9 +8615,6 @@ if (pidgin_conv_window_get_gtkconv_count(win) == 1) { /* Er, bug in notebooks? Switch to the page manually. */ gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), 0); - - gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), - purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs")); } else { gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), TRUE); } @@ -8717,6 +8713,12 @@ !tabs_side && !angle && pidgin_conv_window_get_gtkconv_count(win) > 1, TRUE, GTK_PACK_START); + if (pidgin_conv_window_get_gtkconv_count(win) == 1) + gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), + !purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons") || + purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_LEFT || + purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_RIGHT); + /* show the widgets */ /* gtk_widget_show(gtkconv->icon); */ gtk_widget_show(gtkconv->tab_label); @@ -8740,12 +8742,6 @@ gtk_notebook_remove_page(GTK_NOTEBOOK(win->notebook), index); - /* go back to tabless */ - if (pidgin_conv_window_get_gtkconv_count(win) <= 2) { - gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), - purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs")); - } - win->gtkconvs = g_list_remove(win->gtkconvs, gtkconv); if (win->gtkconvs && win->gtkconvs->next == NULL)