Modified webpage: now tinymail repository is in gitorious.

[modest] / src / widgets / modest-scroll-text.c

diff --git a/src/widgets/modest-scroll-text.c b/src/widgets/modest-scroll-text.c
index 25f6426..c5b33ae 100644 (file)
--- a/src/widgets/modest-scroll-text.c
+++ b/src/widgets/modest-scroll-text.c
@@ -31,7 +31,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <gtk/gtktextview.h>
+#include <gtk/gtk.h>
 
 #include <modest-scroll-text.h>
 
@@ -97,14 +97,12 @@ size_request (GtkWidget *widget,
 
        /* Count lines in text view */
        for (line = 0; line < line_limit; line++) {
-               if (!gtk_text_view_forward_display_line (GTK_TEXT_VIEW (text_view), &iter))
+               if (!gtk_text_view_forward_display_line_end (GTK_TEXT_VIEW (text_view), &iter))
                        break;
+               else 
+                       gtk_text_view_forward_display_line (GTK_TEXT_VIEW (text_view), &iter);
        }
 
-       /* Put again the cursor in the first character. Also scroll to first line */
-       gtk_text_buffer_place_cursor (buffer, &insert_iter);
-       gtk_text_view_place_cursor_onscreen (GTK_TEXT_VIEW (text_view));
-
        /* Change the adjustment properties for one line per step behavior */
        adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
        if (adj != NULL) {
@@ -125,6 +123,10 @@ size_request (GtkWidget *widget,
                
        priv->line_height = iter_rectangle.height;
 
+       /* Put again the cursor in the first character. Also scroll to first line */
+       gtk_text_buffer_place_cursor (buffer, &insert_iter);
+       gtk_text_view_scroll_mark_onscreen (GTK_TEXT_VIEW (text_view), insert_mark);
+
 }
 
 static void
@@ -238,11 +240,9 @@ static void
 modest_scroll_text_class_init (ModestScrollTextClass *klass)
 {
        GObjectClass *object_class;
-       GtkWidgetClass *widget_class;
 
        parent_class = g_type_class_peek_parent (klass);
        object_class = (GObjectClass*) klass;
-       widget_class = GTK_WIDGET_CLASS (klass);
 
        object_class->finalize = modest_scroll_text_finalize;