Use accessor functions instead direct access (Fixes #586476)

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

6 files changed, 12 insertions, 12 deletions

diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c
index 33f4085b3..e1c3d7a39 100644
--- a/src/empathy-call-window-fullscreen.c
+++ b/src/empathy-call-window-fullscreen.c
@@ -71,11 +71,11 @@ empathy_call_window_fullscreen_set_cursor_visible (
 
   if (priv->video_widget != NULL && !show_cursor)
     {
-      gdk_window_set_cursor (priv->video_widget->window,
+      gdk_window_set_cursor (gtk_widget_get_window (priv->video_widget),
           gdk_cursor_new (GDK_BLANK_CURSOR));
     }
   else
-    gdk_window_set_cursor (priv->video_widget->window, NULL);
+    gdk_window_set_cursor (gtk_widget_get_window (priv->video_widget), NULL);
 }
 
 static void
@@ -130,7 +130,7 @@ empathy_call_window_fullscreen_show_popup (EmpathyCallWindowFullscreen *self)
   screen = gtk_window_get_screen (GTK_WINDOW (priv->parent_window));
   gdk_screen_get_monitor_geometry (screen,
       gdk_screen_get_monitor_at_window (screen,
-          GTK_WIDGET (priv->parent_window)->window),
+          gtk_widget_get_window (GTK_WIDGET (priv->parent_window))),
       &fullscreen_rect);
 
   /* Getting the popup window sizes */
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index f9d0b924a..7bc64bb08 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -176,7 +176,7 @@ chat_tab_style_set_cb (GtkWidget *hbox,
 		"chat-window-tab-close-button");
 	context = gtk_widget_get_pango_context (hbox);
 
-	metrics = pango_context_get_metrics (context, hbox->style->font_desc,
+	metrics = pango_context_get_metrics (context, gtk_widget_get_style (hbox)->font_desc,
 		pango_context_get_language (context));
 	char_width = pango_font_metrics_get_approximate_char_width (metrics);
 	pango_font_metrics_unref (metrics);
@@ -1242,7 +1242,7 @@ chat_window_drag_data_received (GtkWidget        *widget,
 		const gchar           *account_id;
 		const gchar           *contact_id;
 
-		id = (const gchar*) selection->data;
+		id = (const gchar*) gtk_selection_data_get_data (selection);
 		account_manager = empathy_account_manager_dup_singleton ();
 
 		DEBUG ("DND contact from roster with id:'%s'", id);
@@ -1299,7 +1299,7 @@ chat_window_drag_data_received (GtkWidget        *widget,
 
 		DEBUG ("DND tab");
 
-		chat = (void *) selection->data;
+		chat = (void *) gtk_selection_data_get_data (selection);
 		old_window = chat_window_find_chat (*chat);
 
 		if (old_window) {
diff --git a/src/empathy-debug-dialog.c b/src/empathy-debug-dialog.c
index cd0d925f9..9d047bab1 100644
--- a/src/empathy-debug-dialog.c
+++ b/src/empathy-debug-dialog.c
@@ -212,7 +212,7 @@ debug_dialog_set_toolbar_sensitivity (EmpathyDebugDialog *debug_dialog,
     gboolean sensitive)
 {
   EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
-  GtkWidget *vbox = GTK_DIALOG (debug_dialog)->vbox;
+  GtkWidget *vbox = gtk_dialog_get_content_area (GTK_DIALOG (debug_dialog));
 
   gtk_widget_set_sensitive (GTK_WIDGET (priv->save_button), sensitive);
   gtk_widget_set_sensitive (GTK_WIDGET (priv->copy_button), sensitive);
@@ -948,7 +948,7 @@ debug_dialog_constructor (GType type,
   gtk_window_set_title (GTK_WINDOW (object), _("Debug Window"));
   gtk_window_set_default_size (GTK_WINDOW (object), 800, 400);
 
-  vbox = GTK_DIALOG (object)->vbox;
+  vbox = gtk_dialog_get_content_area (GTK_DIALOG (object));
 
   toolbar = gtk_toolbar_new ();
   gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
diff --git a/src/empathy-sidebar.c b/src/empathy-sidebar.c
index 7b70229e2..85a38267a 100644
--- a/src/empathy-sidebar.c
+++ b/src/empathy-sidebar.c
@@ -243,7 +243,7 @@ empathy_sidebar_menu_position_under (GtkMenu *menu,
 
   widget = GTK_WIDGET (user_data);
 
-  gdk_window_get_origin (widget->window, x, y);
+  gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
 
   *x += widget->allocation.x;
   *y += widget->allocation.y + widget->allocation.height;
diff --git a/src/empathy.c b/src/empathy.c
index 40626b532..aef361052 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -357,7 +357,7 @@ on_bacon_message_received (const char *message,
 				gtk_widget_realize (GTK_WIDGET (window));
 			}
 
-			startup_timestamp = gdk_x11_get_server_time (window->window);
+			startup_timestamp = gdk_x11_get_server_time (gtk_widget_get_window (window));
 		}
 
 		gtk_window_present_with_time (GTK_WINDOW (window), startup_timestamp);
diff --git a/src/ephy-spinner.c b/src/ephy-spinner.c
index 30ffa57c1..e7285bc0d 100644
--- a/src/ephy-spinner.c
+++ b/src/ephy-spinner.c
@@ -666,8 +666,8 @@ ephy_spinner_expose (GtkWidget *widget,
 		return FALSE;
 	}
 
-	gc = gdk_gc_new (widget->window);
-	gdk_draw_pixbuf (widget->window, gc, pixbuf,
+	gc = gdk_gc_new (gtk_widget_get_window (widget));
+	gdk_draw_pixbuf (gtk_widget_get_window (widget), gc, pixbuf,
 			 dest.x - x_offset - widget->allocation.x,
 			 dest.y - y_offset - widget->allocation.y,
 			 dest.x, dest.y,