Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
12830:3b4a6e426b99 | 12831:1bb4837b527e |
---|---|
1984 | 1984 |
1985 static void | 1985 static void |
1986 gaim_gtkconv_set_active_conversation(GaimConversation *conv) | 1986 gaim_gtkconv_set_active_conversation(GaimConversation *conv) |
1987 { | 1987 { |
1988 GaimGtkConversation *gtkconv; | 1988 GaimGtkConversation *gtkconv; |
1989 const char *protocol_name; | |
1989 | 1990 |
1990 g_return_if_fail(conv != NULL); | 1991 g_return_if_fail(conv != NULL); |
1991 | 1992 |
1992 gtkconv = GAIM_GTK_CONVERSATION(conv); | 1993 gtkconv = GAIM_GTK_CONVERSATION(conv); |
1993 | 1994 |
1999 gtkconv->active_conv = conv; | 2000 gtkconv->active_conv = conv; |
2000 | 2001 |
2001 gaim_conversation_set_logging(conv, | 2002 gaim_conversation_set_logging(conv, |
2002 gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(gtkconv->win->menu.logging))); | 2003 gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(gtkconv->win->menu.logging))); |
2003 | 2004 |
2005 protocol_name = gaim_account_get_protocol_name(conv->account); | |
2006 gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry), protocol_name); | |
2007 gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->imhtml), protocol_name); | |
2008 | |
2004 gaim_signal_emit(gaim_gtk_conversations_get_handle(), "conversation-switched", conv); | 2009 gaim_signal_emit(gaim_gtk_conversations_get_handle(), "conversation-switched", conv); |
2005 } | 2010 } |
2006 | 2011 |
2007 void | 2012 void |
2008 gaim_gtkconv_switch_active_conversation(GaimConversation *conv) | 2013 gaim_gtkconv_switch_active_conversation(GaimConversation *conv) |
2018 gray_stuff_out(gtkconv); | 2023 gray_stuff_out(gtkconv); |
2019 update_typing_icon(gtkconv); | 2024 update_typing_icon(gtkconv); |
2020 | 2025 |
2021 gtk_window_set_title(GTK_WINDOW(gtkconv->win->window), | 2026 gtk_window_set_title(GTK_WINDOW(gtkconv->win->window), |
2022 gtk_label_get_text(GTK_LABEL(gtkconv->tab_label))); | 2027 gtk_label_get_text(GTK_LABEL(gtkconv->tab_label))); |
2023 | |
2024 gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry), | |
2025 gaim_account_get_protocol_name(conv->account)); | |
2026 } | 2028 } |
2027 | 2029 |
2028 static void | 2030 static void |
2029 menu_conv_sel_send_cb(GObject *m, gpointer data) | 2031 menu_conv_sel_send_cb(GObject *m, gpointer data) |
2030 { | 2032 { |