Mercurial > pidgin
changeset 22442:49976f4b5005
merge of '83a8dbf04d73ded7b026f8b63a26f5656d8fb25b'
and 'ad54253e8a27e07bd353bd4353692d0f765b5b98'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sat, 08 Mar 2008 01:07:04 +0000 |
| parents | 0702ad071616 (current diff) ca6bc025aabb (diff) |
| children | fb54dacfea62 8445ea581a6e |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Fri Mar 07 20:52:43 2008 +0000 +++ b/COPYRIGHT Sat Mar 08 01:07:04 2008 +0000 @@ -403,6 +403,7 @@ Tom Tromey Todd Troxell Brad Turcotte +Kyle Turman Junichi Uekawa Igor Vlasenko István Váradi
--- a/finch/gntconv.c Fri Mar 07 20:52:43 2008 +0000 +++ b/finch/gntconv.c Sat Mar 08 01:07:04 2008 +0000 @@ -293,7 +293,7 @@ g_free(str); scroll = gnt_text_view_get_lines_below(GNT_TEXT_VIEW(ggc->tv)); - str = g_strdup_printf(_("\n%s is typing..."), purple_conversation_get_name(conv)); + str = g_strdup_printf(_("\n%s is typing..."), purple_conversation_get_title(conv)); /* Updating is a little buggy. So just remove and add a new one */ gnt_text_view_tag_change(GNT_TEXT_VIEW(ggc->tv), "typing", NULL, TRUE); gnt_text_view_append_text_with_tag(GNT_TEXT_VIEW(ggc->tv), @@ -879,7 +879,7 @@ 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)); + strip = g_strdup_printf(_("\n%s is typing..."), purple_conversation_get_title(conv)); gnt_text_view_append_text_with_tag(GNT_TEXT_VIEW(ggconv->tv), strip, GNT_TEXT_FLAG_DIM, "typing"); g_free(strip);