Mercurial > pidgin.yaz
changeset 18645:9e55f853a6fa
merge of '7099b827f2d0a6de2abb5d567f444adc1d13fc03'
and 'aa3ef1b650f50d978cde30fae0ff6690b83bd877'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Wed, 25 Jul 2007 21:01:29 +0000 |
| parents | 3597903cf8ff (diff) a5b37b3f02c6 (current diff) |
| children | 05cab350d1fb 24e3cca6b03c |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntconv.c Wed Jul 25 21:01:21 2007 +0000 +++ b/finch/gntconv.c Wed Jul 25 21:01:29 2007 +0000 @@ -259,7 +259,7 @@ gnt_text_view_scroll(GNT_TEXT_VIEW(ggc->tv), 0); } else { title = get_conversation_title(conv, account); - gnt_text_view_tag_change(GNT_TEXT_VIEW(ggc->tv), "typing", NULL, TRUE); + gnt_text_view_tag_change(GNT_TEXT_VIEW(ggc->tv), "typing", " ", TRUE); } gnt_screen_rename_widget(ggc->window, title); g_free(title); @@ -588,7 +588,6 @@ char *strip, *newline; GntTextFormatFlags fl = 0; int pos; - gboolean notify; g_return_if_fail(ggconv != NULL); @@ -601,7 +600,7 @@ pos = gnt_text_view_get_lines_below(GNT_TEXT_VIEW(ggconv->tv)); - notify = !!gnt_text_view_tag_change(GNT_TEXT_VIEW(ggconv->tv), "typing", NULL, TRUE); + gnt_text_view_tag_change(GNT_TEXT_VIEW(ggconv->tv), "typing", NULL, TRUE); gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), "\n", GNT_TEXT_FLAG_NORMAL); /* Unnecessary to print the timestamp for delayed message */ @@ -643,7 +642,8 @@ g_free(newline); g_free(strip); - if (notify) { + if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM && + purple_conv_im_get_typing_state(PURPLE_CONV_IM(conv)) == PURPLE_TYPING) { strip = g_strdup_printf(_("\n%s is typing..."), purple_conversation_get_name(conv)); gnt_text_view_append_text_with_tag(GNT_TEXT_VIEW(ggconv->tv), strip, GNT_TEXT_FLAG_DIM, "typing");