Mercurial > pidgin
diff src/gtkconv.c @ 12831:1bb4837b527e
[gaim-migrate @ 15179]
I think we should be setting the protocol name on both imhtmls in a gtkconv and I think we should be doing it in gaim_gtkconv_set_active_conversation().
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Wed, 11 Jan 2006 22:52:05 +0000 |
parents | 7b8e885c1be3 |
children | 1096bdfef887 |
line wrap: on
line diff
--- a/src/gtkconv.c Wed Jan 11 21:36:26 2006 +0000 +++ b/src/gtkconv.c Wed Jan 11 22:52:05 2006 +0000 @@ -1986,6 +1986,7 @@ gaim_gtkconv_set_active_conversation(GaimConversation *conv) { GaimGtkConversation *gtkconv; + const char *protocol_name; g_return_if_fail(conv != NULL); @@ -2001,6 +2002,10 @@ gaim_conversation_set_logging(conv, gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(gtkconv->win->menu.logging))); + protocol_name = gaim_account_get_protocol_name(conv->account); + gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry), protocol_name); + gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->imhtml), protocol_name); + gaim_signal_emit(gaim_gtk_conversations_get_handle(), "conversation-switched", conv); } @@ -2020,9 +2025,6 @@ gtk_window_set_title(GTK_WINDOW(gtkconv->win->window), gtk_label_get_text(GTK_LABEL(gtkconv->tab_label))); - - gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry), - gaim_account_get_protocol_name(conv->account)); } static void