Mercurial > pidgin.yaz
changeset 14222:8c13a650cef5
[gaim-migrate @ 16903]
Revert the last commit, because it was retarded.
Make the appropriate changes.
Make sure logging happens if enabled.
committer: Tailor Script <tailor@pidgin.im>
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 20 Aug 2006 16:38:10 +0000 |
| parents | d6d3dbe85a4c |
| children | 7c560c01b8f9 |
| files | console/gntconv.c console/libgnt/gnttextview.c |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/console/gntconv.c Sun Aug 20 16:25:36 2006 +0000 +++ b/console/gntconv.c Sun Aug 20 16:38:10 2006 +0000 @@ -236,6 +236,10 @@ g_return_if_fail(ggconv != NULL); + pos = gnt_text_view_get_lines_below(GNT_TEXT_VIEW(ggconv->tv)); + + gnt_text_view_next_line(GNT_TEXT_VIEW(ggconv->tv)); + if (gaim_prefs_get_bool("/gaim/gnt/conversations/timestamps")) gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), gaim_utf8_strftime("(%H:%M:%S) ", localtime(&mtime)), GNT_TEXT_FLAG_DIM); @@ -254,14 +258,11 @@ if (flags & GAIM_MESSAGE_NICK) fl |= GNT_TEXT_FLAG_UNDERLINE; - pos = gnt_text_view_get_lines_below(GNT_TEXT_VIEW(ggconv->tv)); - /* XXX: Remove this workaround when textview can parse messages. */ newline = gaim_strdup_withhtml(message); strip = gaim_markup_strip_html(newline); gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), strip, fl); - gnt_text_view_next_line(GNT_TEXT_VIEW(ggconv->tv)); if (pos <= 1) gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), 0); @@ -276,7 +277,7 @@ gg_write_chat(GaimConversation *conv, const char *who, const char *message, GaimMessageFlags flags, time_t mtime) { - gg_write_common(conv, who, message, flags, mtime); + gaim_conversation_write(conv, who, message, flags, mtime); } static void @@ -301,7 +302,7 @@ who = gaim_buddy_get_contact_alias(buddy); } - gg_write_common(conv, who, message, flags, mtime); + gaim_conversation_write(conv, who, message, flags, mtime); } static void
--- a/console/libgnt/gnttextview.c Sun Aug 20 16:25:36 2006 +0000 +++ b/console/libgnt/gnttextview.c Sun Aug 20 16:38:10 2006 +0000 @@ -35,7 +35,7 @@ GList *iter; GntTextLine *line = lines->data; - wmove(widget->window, widget->priv.height - i, 0); + wmove(widget->window, widget->priv.height - 1 - i, 0); for (iter = line->segments; iter; iter = iter->next) {