Use accessor functions instead direct access.

Some functions still remaining because there is not API
in GTK+ 2.19.0 yet.

http://bugzilla.gnome.org/show_bug.cgi?id=586476

Reviewed-By: Danielle Madeley <danielle.madeley@collabora.co.uk>

1 files changed, 8 insertions, 4 deletions

diff --git a/src/empathy-sidebar.c b/src/empathy-sidebar.c
index 11fcbd6bb..7960c4ad9 100644
--- a/src/empathy-sidebar.c
+++ b/src/empathy-sidebar.c
@@ -238,16 +238,18 @@ empathy_sidebar_menu_position_under (GtkMenu *menu,
                                          gpointer user_data)
 {
   GtkWidget *widget;
+  GtkAllocation allocation;
 
   g_return_if_fail (GTK_IS_BUTTON (user_data));
-  g_return_if_fail (GTK_WIDGET_NO_WINDOW (user_data));
+  g_return_if_fail (gtk_widget_get_has_window (user_data));
 
   widget = GTK_WIDGET (user_data);
 
   gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
 
-  *x += widget->allocation.x;
-  *y += widget->allocation.y + widget->allocation.height;
+  gtk_widget_get_allocation (widget, &allocation);
+  *x += allocation.x;
+  *y += allocation.y + allocation.height;
 
   *push_in = FALSE;
 }
@@ -263,8 +265,10 @@ empathy_sidebar_select_button_press_cb (GtkWidget *widget,
     {
       GtkRequisition requisition;
       gint width;
+      GtkAllocation allocation;
 
-      width = widget->allocation.width;
+      gtk_widget_get_allocation (widget, &allocation);
+      width = allocation.width;
 
       gtk_widget_set_size_request (sidebar->priv->menu, -1, -1);
       gtk_widget_size_request (sidebar->priv->menu, &requisition);