Mercurial > pidgin.yaz
changeset 18306:a3469318cf35
merge of '1021f142edad27e5a1f750f8d439c3bc5bf07b81'
and '194d749288549e6af3c41d354c2196295e8eac5f'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Wed, 27 Jun 2007 17:24:32 +0000 |
| parents | db4b0aa4ed8c (diff) ffd706ec0220 (current diff) |
| children | 4434e5c9d247 cf2fbfa205b1 |
| files | pidgin/gtkconv.c |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Wed Jun 27 09:15:57 2007 +0000 +++ b/pidgin/gtkconv.c Wed Jun 27 17:24:32 2007 +0000 @@ -6205,10 +6205,11 @@ markup = title; } else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) { PurpleConvChat *chat = PURPLE_CONV_CHAT(conv); - markup = g_strdup_printf("%s\n<span color='%s' size='smaller'>%s</span>", + const char *topic = purple_conv_chat_get_topic(chat); + markup = g_strdup_printf("%s%s<span color='%s' size='smaller'>%s</span>", purple_conversation_get_title(conv), pidgin_get_dim_grey_string(gtkconv->infopane), - purple_conv_chat_get_topic(chat)); + topic ? "\n" : "", topic ? topic : ""); } gtk_list_store_set(gtkconv->infopane_model, &(gtkconv->infopane_iter), TEXT_COLUMN, markup, -1);
--- a/pidgin/gtkimhtml.c Wed Jun 27 09:15:57 2007 +0000 +++ b/pidgin/gtkimhtml.c Wed Jun 27 17:24:32 2007 +0000 @@ -1002,11 +1002,12 @@ gtk_imhtml_close_tags(imhtml, &iter); gtk_imhtml_insert_html_at_iter(imhtml, text, flags, &iter); - if (!imhtml->wbfo && !plaintext) - gtk_imhtml_close_tags(imhtml, &iter); gtk_text_buffer_move_mark_by_name(imhtml->text_buffer, "insert", &iter); gtk_text_view_scroll_to_mark(GTK_TEXT_VIEW(imhtml), gtk_text_buffer_get_insert(imhtml->text_buffer), 0, FALSE, 0.0, 0.0); + if (!imhtml->wbfo && !plaintext) + gtk_imhtml_close_tags(imhtml, &iter); + } static void paste_plaintext_received_cb (GtkClipboard *clipboard, const gchar *text, gpointer data)