Mercurial > pidgin.yaz
changeset 2834:66b1112d948f
[gaim-migrate @ 2847]
eh
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Sun, 02 Dec 2001 11:30:20 +0000 |
| parents | cdbe6e2f0ff2 |
| children | d8e67ff8022f |
| files | src/conversation.c src/prefs.c |
| diffstat | 2 files changed, 13 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Sun Dec 02 10:08:09 2001 +0000 +++ b/src/conversation.c Sun Dec 02 11:30:20 2001 +0000 @@ -2509,24 +2509,23 @@ int index; GtkNotebook *nb; - if (!convo_notebook) { - char buf[256]; - if ((find_log_info(c->name)) || (logging_options & OPT_LOG_ALL)) - g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, c->name); - else - g_snprintf(buf, sizeof(buf), CONVERSATION_TITLE, c->name); - gtk_window_set_title(GTK_WINDOW(c->window), buf); - return; - } - if ((im_options & OPT_IM_ALIAS_TAB) && c->gc && ((b = find_buddy(c->gc, c->name)) != NULL)) text = b->show; else text = c->name; - nb = GTK_NOTEBOOK(convo_notebook); - index = g_list_index(conversations, c); - gtk_notebook_set_tab_label_text(nb, gtk_notebook_get_nth_page(nb, index), text); + if (!convo_notebook) { + char buf[256]; + if ((find_log_info(c->name)) || (logging_options & OPT_LOG_ALL)) + g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, text); + else + g_snprintf(buf, sizeof(buf), CONVERSATION_TITLE, text); + gtk_window_set_title(GTK_WINDOW(c->window), buf); + } else { + nb = GTK_NOTEBOOK(convo_notebook); + index = g_list_index(conversations, c); + gtk_notebook_set_tab_label_text(nb, gtk_notebook_get_nth_page(nb, index), text); + } } void set_convo_titles()
--- a/src/prefs.c Sun Dec 02 10:08:09 2001 +0000 +++ b/src/prefs.c Sun Dec 02 11:30:20 2001 +0000 @@ -907,7 +907,7 @@ vbox2); gaim_button(_("Raise windows on events"), &im_options, OPT_IM_POPUP, vbox2); gaim_button(_("Show logins in window"), &im_options, OPT_IM_LOGON, vbox2); - gaim_button(_("Show aliases in tabs"), &im_options, OPT_IM_ALIAS_TAB, vbox2); + gaim_button(_("Show aliases in tabs/titles"), &im_options, OPT_IM_ALIAS_TAB, vbox2); gaim_button(_("Hide window on send"), &im_options, OPT_IM_POPDOWN, vbox2); frame = gtk_frame_new(_("Window Sizes"));