[Gaim-commits] SF.net SVN: gaim: [16903] trunk/console

[<sa...@us...>]

Revision: 16903
Author:   sadrul
Date:     2006-08-20 09:38:10 -0700 (Sun, 20 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16903&view=rev

Log Message:
-----------
Revert the last commit, because it was retarded.
Make the appropriate changes.
Make sure logging happens if enabled.

Modified Paths:
--------------
    trunk/console/gntconv.c
    trunk/console/libgnt/gnttextview.c
Modified: trunk/console/gntconv.c
===================================================================
--- trunk/console/gntconv.c	2006-08-20 16:25:36 UTC (rev 16902)
+++ trunk/console/gntconv.c	2006-08-20 16:38:10 UTC (rev 16903)
@@ -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

Modified: trunk/console/libgnt/gnttextview.c
===================================================================
--- trunk/console/libgnt/gnttextview.c	2006-08-20 16:25:36 UTC (rev 16902)
+++ trunk/console/libgnt/gnttextview.c	2006-08-20 16:38:10 UTC (rev 16903)
@@ -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)
 		{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.