Merge commit 'jtellier/video-call-button-sensitivity'

[empathy.git] / libempathy-gtk / empathy-chat-text-view.c

diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c
index bdf66333ee6f1c2d7967042f5b4b9bbde136466e..d7ebda647f0bd763663728bbcb7e3c4315cbccf1 100644 (file)
--- a/libempathy-gtk/empathy-chat-text-view.c
+++ b/libempathy-gtk/empathy-chat-text-view.c
@@ -34,9 +34,9 @@
 #include <gtk/gtk.h>
 
 #include <telepathy-glib/util.h>
-#include <libmissioncontrol/mc-account.h>
 
 #include <libempathy/empathy-utils.h>
+#include <libempathy/empathy-account.h>
 
 #include "empathy-chat-text-view.h"
 #include "empathy-chat.h"
@@ -495,7 +495,9 @@ chat_text_view_size_allocate (GtkWidget     *widget,
                GtkAdjustment *adj;
 
                adj = GTK_TEXT_VIEW (widget)->vadjustment;
-               gtk_adjustment_set_value (adj, adj->upper - adj->page_size);
+               gtk_adjustment_set_value (adj,
+                                         gtk_adjustment_get_upper (adj) -
+                                         gtk_adjustment_get_page_size (adj));
        }
 }
 
@@ -652,7 +654,7 @@ chat_text_view_scroll_cb (EmpathyChatTextView *view)
 
        priv = GET_PRIV (view);
        adj = GTK_TEXT_VIEW (view)->vadjustment;
-       max_val = adj->upper - adj->page_size;
+       max_val = gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj);
 
        g_return_val_if_fail (priv->scroll_time != NULL, FALSE);