GNOME.org
 

[eog] Improve compatibility with GSEALed GtkWidget

commit e9ab49afe4efe94e54b8302136f92226fa4db6c1
Author: Felix Riemann <friemann gnome org>
Date:   Sat Jan 9 23:49:58 2010 +0100

    Improve compatibility with GSEALed GtkWidget
    
    First steps to GSEAL-compatibility of eog's "core".
    Handles some GtkWidget-related seals.

 src/eog-error-message-area.c |    4 +-
 src/eog-plugin-manager.c     |    5 ++-
 src/eog-print-preview.c      |   18 +++++++------
 src/eog-properties-dialog.c  |   10 ++++----
 src/eog-scroll-view.c        |   55 +++++++++++++++++++++--------------------
 src/eog-sidebar.c            |    4 +-
 src/eog-window.c             |   29 +++++++++++----------
 7 files changed, 65 insertions(+), 60 deletions(-)
---
diff --git a/src/eog-error-message-area.c b/src/eog-error-message-area.c
index fb7b999..4e8fb25 100644
--- a/src/eog-error-message-area.c
+++ b/src/eog-error-message-area.c
@@ -71,7 +71,7 @@ set_message_area_text_and_icon (GtkInfoBar   *message_area,
 	gtk_label_set_line_wrap (GTK_LABEL (primary_label), FALSE);
 	gtk_misc_set_alignment (GTK_MISC (primary_label), 0, 0.5);
 
-	GTK_WIDGET_SET_FLAGS (primary_label, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus (primary_label, TRUE);
 
 	gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
 
@@ -85,7 +85,7 @@ set_message_area_text_and_icon (GtkInfoBar   *message_area,
 
 		gtk_box_pack_start (GTK_BOX (vbox), secondary_label, TRUE, TRUE, 0);
 
-		GTK_WIDGET_SET_FLAGS (secondary_label, GTK_CAN_FOCUS);
+		gtk_widget_set_can_focus (secondary_label, TRUE);
 
 		gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE);
 		gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
diff --git a/src/eog-plugin-manager.c b/src/eog-plugin-manager.c
index 916c0d0..1ef5de6 100644
--- a/src/eog-plugin-manager.c
+++ b/src/eog-plugin-manager.c
@@ -564,7 +564,7 @@ menu_position_under_widget (GtkMenu  *menu,
 	GtkWidget *w = GTK_WIDGET (user_data);
 	GtkRequisition requisition;
 
-	gdk_window_get_origin (w->window, x, y);
+	gdk_window_get_origin (gtk_widget_get_window (w), x, y);
 	gtk_widget_size_request (GTK_WIDGET (menu), &requisition);
 
 	if (gtk_widget_get_direction (w) == GTK_TEXT_DIR_RTL) {
@@ -602,7 +602,8 @@ menu_position_under_tree_view (GtkMenu  *menu,
 		GtkTreePath *path;
 		GdkRectangle rect;
 
-		gdk_window_get_origin (GTK_WIDGET (tree)->window, x, y);
+		gdk_window_get_origin (gtk_widget_get_window(GTK_WIDGET (tree)),
+				       x, y);
 
 		path = gtk_tree_model_get_path (model, &iter);
 
diff --git a/src/eog-print-preview.c b/src/eog-print-preview.c
index cf4e722..c5aed3b 100644
--- a/src/eog-print-preview.c
+++ b/src/eog-print-preview.c
@@ -559,7 +559,7 @@ expose_event_cb (GtkDrawingArea *drawing_area,
 
 	update_relative_sizes (EOG_PRINT_PREVIEW (user_data));
 
-	cr = gdk_cairo_create (widget->window);
+	cr = gdk_cairo_create (gtk_widget_get_window (widget));
 
 	eog_print_preview_draw (EOG_PRINT_PREVIEW (user_data), cr);
 
@@ -570,7 +570,7 @@ expose_event_cb (GtkDrawingArea *drawing_area,
 
 	cairo_destroy (cr);
 
-	gdk_window_get_pointer (widget->window, NULL, NULL, NULL);
+	gdk_window_get_pointer (gtk_widget_get_window (widget), NULL, NULL, NULL);
 }
 
 /**
@@ -954,10 +954,12 @@ motion_notify_event_cb (GtkWidget      *widget,
 		  	GdkCursor *cursor;
 			cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
 							     GDK_FLEUR);
-			gdk_window_set_cursor (widget->window, cursor);
+			gdk_window_set_cursor (gtk_widget_get_window (widget),
+					       cursor);
 			gdk_cursor_unref (cursor);
 		} else {
-			gdk_window_set_cursor (widget->window, NULL);
+			gdk_window_set_cursor (gtk_widget_get_window (widget),
+					       NULL);
 		}
 	}
 	return FALSE;
@@ -996,9 +998,9 @@ eog_print_preview_draw (EogPrintPreview *preview, cairo_t *cr)
 	priv = preview->priv;
 	area = priv->area;
 
-	has_focus = GTK_WIDGET_HAS_FOCUS (area);
+	has_focus = gtk_widget_has_focus (area);
 
-	style = area->style;
+	style = gtk_widget_get_style (area);
 
 	w_width = area->allocation.width;
 	w_height = area->allocation.height;
@@ -1051,8 +1053,8 @@ eog_print_preview_draw (EogPrintPreview *preview, cairo_t *cr)
 	}
 
 	if (has_focus) {
-		gtk_paint_focus (style, area->window, GTK_STATE_NORMAL,
-				 NULL, NULL, NULL,
+		gtk_paint_focus (style, gtk_widget_get_window (area),
+				 GTK_STATE_NORMAL, NULL, NULL, NULL,
 				 0, 0, w_width, w_height);
 	}
 }
diff --git a/src/eog-properties-dialog.c b/src/eog-properties-dialog.c
index c519d07..b1469c6 100644
--- a/src/eog-properties-dialog.c
+++ b/src/eog-properties-dialog.c
@@ -353,19 +353,19 @@ pd_update_metadata_tab (EogPropertiesDialog *prop_dlg,
 			gtk_notebook_set_current_page (notebook, EOG_PROPERTIES_DIALOG_PAGE_GENERAL);
 		}
 
-		if (GTK_WIDGET_VISIBLE (priv->exif_box)) {
+		if (gtk_widget_get_visible (priv->exif_box)) {
 			gtk_widget_hide_all (priv->exif_box);
 		}
-		if (GTK_WIDGET_VISIBLE (priv->metadata_details_box)) {
+		if (gtk_widget_get_visible (priv->metadata_details_box)) {
 			gtk_widget_hide_all (priv->metadata_details_box);
 		}
 
 		return;
 	} else {
-		if (!GTK_WIDGET_VISIBLE (priv->exif_box))
+		if (!gtk_widget_get_visible (priv->exif_box))
 			gtk_widget_show_all (priv->exif_box);
 		if (priv->netbook_mode &&
-		    !GTK_WIDGET_VISIBLE (priv->metadata_details_box)) {
+		    !gtk_widget_get_visible (priv->metadata_details_box)) {
 			gtk_widget_show_all (priv->metadata_details_box);
 			gtk_widget_hide_all (priv->exif_details_expander);
 		}
@@ -534,7 +534,7 @@ eog_properties_dialog_set_netbook_mode (EogPropertiesDialog *dlg,
 		gtk_widget_reparent (priv->metadata_details_sw,
 				     priv->metadata_details_box);
 		// Only show details box if metadata is being displayed
-		if (GTK_WIDGET_VISIBLE (priv->exif_box))
+		if (gtk_widget_get_visible (priv->exif_box))
 			gtk_widget_show_all (priv->metadata_details_box);
 
 		gtk_widget_hide_all (priv->exif_details_expander);
diff --git a/src/eog-scroll-view.c b/src/eog-scroll-view.c
index 089d60e..bb4d4e0 100644
--- a/src/eog-scroll-view.c
+++ b/src/eog-scroll-view.c
@@ -255,13 +255,13 @@ update_scrollbar_values (EogScrollView *view)
 
 	priv = view->priv;
 
-	if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (priv->hbar)) && !GTK_WIDGET_VISIBLE (GTK_WIDGET (priv->vbar)))
+	if (!gtk_widget_get_visible (GTK_WIDGET (priv->hbar)) && !gtk_widget_get_visible (GTK_WIDGET (priv->vbar)))
 		return;
 
 	compute_scaled_size (view, priv->zoom, &scaled_width, &scaled_height);
 	allocation = &GTK_WIDGET (priv->display)->allocation;
 
-	if (GTK_WIDGET_VISIBLE (GTK_WIDGET (priv->hbar))) {
+	if (gtk_widget_get_visible (GTK_WIDGET (priv->hbar))) {
 		/* Set scroll increments */
 		priv->hadj->page_size = MIN (scaled_width, allocation->width);
 		priv->hadj->page_increment = allocation->width / 2;
@@ -287,7 +287,7 @@ update_scrollbar_values (EogScrollView *view)
 		}
 	}
 
-	if (GTK_WIDGET_VISIBLE (GTK_WIDGET (priv->vbar))) {
+	if (gtk_widget_get_visible (GTK_WIDGET (priv->vbar))) {
 		priv->vadj->page_size = MIN (scaled_height, allocation->height);
 		priv->vadj->page_increment = allocation->height / 2;
 		priv->vadj->step_increment = SCROLL_STEP_SIZE;
@@ -342,7 +342,7 @@ eog_scroll_view_set_cursor (EogScrollView *view, EogScrollViewCursor new_cursor)
 
 	switch (new_cursor) {
 		case EOG_SCROLL_VIEW_CURSOR_NORMAL:
-			gdk_window_set_cursor (widget->window, NULL);
+			gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
 			break;
                 case EOG_SCROLL_VIEW_CURSOR_HIDDEN:
                         cursor = eog_scroll_view_create_invisible_cursor ();
@@ -353,7 +353,7 @@ eog_scroll_view_set_cursor (EogScrollView *view, EogScrollViewCursor new_cursor)
 	}
 
 	if (cursor) {
-		gdk_window_set_cursor (widget->window, cursor);
+		gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
 		gdk_cursor_unref (cursor);
 		gdk_flush();
 	}
@@ -417,10 +417,10 @@ check_scrollbar_visibility (EogScrollView *view, GtkAllocation *alloc)
 			hbar_visible = TRUE;
 	}
 
-	if (hbar_visible != GTK_WIDGET_VISIBLE (GTK_WIDGET (priv->hbar)))
+	if (hbar_visible != gtk_widget_get_visible (GTK_WIDGET (priv->hbar)))
 		g_object_set (G_OBJECT (priv->hbar), "visible", hbar_visible, NULL);
 
-	if (vbar_visible != GTK_WIDGET_VISIBLE (GTK_WIDGET (priv->vbar)))
+	if (vbar_visible != gtk_widget_get_visible (GTK_WIDGET (priv->vbar)))
 		g_object_set (G_OBJECT (priv->vbar), "visible", vbar_visible, NULL);
 }
 
@@ -467,7 +467,7 @@ is_image_movable (EogScrollView *view)
 
 	priv = view->priv;
 
-	return (GTK_WIDGET_VISIBLE (priv->hbar) || GTK_WIDGET_VISIBLE (priv->vbar));
+	return (gtk_widget_get_visible (priv->hbar) || gtk_widget_get_visible (priv->vbar));
 }
 
 
@@ -530,7 +530,7 @@ paint_background (EogScrollView *view, EogIRect *r, EogIRect *rect)
 
 	eog_irect_intersect (&d, r, rect);
 	if (!eog_irect_empty (&d)) {
-		gdk_window_clear_area (GTK_WIDGET (priv->display)->window,
+		gdk_window_clear_area (gtk_widget_get_window (priv->display),
 				       d.x0, d.y0,
 				       d.x1 - d.x0, d.y1 - d.y0);
 	}
@@ -553,7 +553,7 @@ paint_rectangle (EogScrollView *view, EogIRect *rect, GdkInterpType interp_type)
 
 	priv = view->priv;
 
-	if (!GTK_WIDGET_DRAWABLE (priv->display))
+	if (!gtk_widget_is_drawable (priv->display))
 		return;
 
 	compute_scaled_size (view, priv->zoom, &scaled_width, &scaled_height);
@@ -670,8 +670,8 @@ paint_rectangle (EogScrollView *view, EogIRect *rect, GdkInterpType interp_type)
 			  + (d.y0 - yofs) * rowstride
 			  + 3 * (d.x0 - xofs));
 
-		gdk_draw_rgb_image_dithalign (GTK_WIDGET (priv->display)->window,
-					      GTK_WIDGET (priv->display)->style->black_gc,
+		gdk_draw_rgb_image_dithalign (gtk_widget_get_window (GTK_WIDGET (priv->display)),
+					      gtk_widget_get_style (GTK_WIDGET (priv->display))->black_gc,
 					      d.x0, d.y0,
 					      d.x1 - d.x0, d.y1 - d.y0,
 					      GDK_RGB_DITHER_MAX,
@@ -694,7 +694,7 @@ paint_rectangle (EogScrollView *view, EogIRect *rect, GdkInterpType interp_type)
 	/* Compute transparency parameters */
 	switch (priv->transp_style) {
 	case EOG_TRANSP_BACKGROUND: {
-		GdkColor color = GTK_WIDGET (priv->display)->style->bg[GTK_STATE_NORMAL];
+		GdkColor color = gtk_widget_get_style (GTK_WIDGET (priv->display))->bg[GTK_STATE_NORMAL];
 
 		check_1 = check_2 = (((color.red & 0xff00) << 8)
 				     | (color.green & 0xff00)
@@ -729,8 +729,8 @@ paint_rectangle (EogScrollView *view, EogIRect *rect, GdkInterpType interp_type)
 				    check_size,
 				    check_1, check_2);
 
-	gdk_draw_rgb_image_dithalign (GTK_WIDGET (priv->display)->window,
-				      GTK_WIDGET (priv->display)->style->black_gc,
+	gdk_draw_rgb_image_dithalign (gtk_widget_get_window (priv->display),
+				      gtk_widget_get_style (priv->display)->black_gc,
 				      d.x0, d.y0,
 				      d.x1 - d.x0, d.y1 - d.y0,
 				      GDK_RGB_DITHER_MAX,
@@ -795,7 +795,7 @@ request_paint_area (EogScrollView *view, GdkRectangle *area)
 	eog_debug_message (DEBUG_WINDOW, "x: %i, y: %i, width: %i, height: %i\n",
 			   area->x, area->y, area->width, area->height);
 
-	if (!GTK_WIDGET_DRAWABLE (priv->display))
+	if (!gtk_widget_is_drawable (priv->display))
 		return;
 
 	r.x0 = MAX (0, area->x);
@@ -861,13 +861,13 @@ scroll_to (EogScrollView *view, int x, int y, gboolean change_adjustments)
 	priv = view->priv;
 
 	/* Check bounds & Compute offsets */
-	if (GTK_WIDGET_VISIBLE (priv->hbar)) {
+	if (gtk_widget_get_visible (priv->hbar)) {
 		x = CLAMP (x, 0, priv->hadj->upper - priv->hadj->page_size);
 		xofs = x - priv->xofs;
 	} else
 		xofs = 0;
 
-	if (GTK_WIDGET_VISIBLE (priv->vbar)) {
+	if (gtk_widget_get_visible (priv->vbar)) {
 		y = CLAMP (y, 0, priv->vadj->upper - priv->vadj->page_size);
 		yofs = y - priv->yofs;
 	} else
@@ -879,7 +879,7 @@ scroll_to (EogScrollView *view, int x, int y, gboolean change_adjustments)
 	priv->xofs = x;
 	priv->yofs = y;
 
-	if (!GTK_WIDGET_DRAWABLE (priv->display))
+	if (!gtk_widget_is_drawable (priv->display))
 		goto out;
 
 	width = GTK_WIDGET (priv->display)->allocation.width;
@@ -890,7 +890,7 @@ scroll_to (EogScrollView *view, int x, int y, gboolean change_adjustments)
 		goto out;
 	}
 
-	window = GTK_WIDGET (priv->display)->window;
+	window = gtk_widget_get_window (GTK_WIDGET (priv->display));
 
 	/* Ensure that the uta has the full size */
 
@@ -1229,7 +1229,8 @@ display_key_press_event (GtkWidget *widget, GdkEventKey *event, gpointer data)
 	if (do_zoom) {
 		gint x, y;
 
-		gdk_window_get_pointer (widget->window, &x, &y, NULL);
+		gdk_window_get_pointer (gtk_widget_get_window (widget),
+					&x, &y, NULL);
 		set_zoom (view, zoom, TRUE, x, y);
 	}
 
@@ -1250,7 +1251,7 @@ eog_scroll_view_button_press_event (GtkWidget *widget, GdkEventButton *event, gp
 	view = EOG_SCROLL_VIEW (data);
 	priv = view->priv;
 
-	if (!GTK_WIDGET_HAS_FOCUS (priv->display))
+	if (!gtk_widget_has_focus (priv->display))
 		gtk_widget_grab_focus (GTK_WIDGET (priv->display));
 
 	if (priv->dragging)
@@ -1412,7 +1413,7 @@ eog_scroll_view_motion_event (GtkWidget *widget, GdkEventMotion *event, gpointer
 		return FALSE;
 
 	if (event->is_hint)
-		gdk_window_get_pointer (GTK_WIDGET (priv->display)->window, &x, &y, &mods);
+		gdk_window_get_pointer (gtk_widget_get_window (GTK_WIDGET (priv->display)), &x, &y, &mods);
 	else {
 		x = event->x;
 		y = event->y;
@@ -1931,8 +1932,8 @@ eog_scroll_view_set_image (EogScrollView *view, EogImage *image)
 
 	if (priv->image != NULL) {
 		free_image_resources (view);
-		if (GTK_WIDGET_DRAWABLE (priv->display) && image == NULL) {
-			gdk_window_clear (GTK_WIDGET (priv->display)->window);
+		if (gtk_widget_is_drawable (priv->display) && image == NULL) {
+			gdk_window_clear (gtk_widget_get_window (priv->display));
 		}
 	}
 	g_assert (priv->image == NULL);
@@ -1973,8 +1974,8 @@ eog_scroll_view_set_image (EogScrollView *view, EogImage *image)
 gboolean
 eog_scroll_view_scrollbars_visible (EogScrollView *view)
 {
-	if (!GTK_WIDGET_VISIBLE (GTK_WIDGET (view->priv->hbar)) &&
-	    !GTK_WIDGET_VISIBLE (GTK_WIDGET (view->priv->vbar)))
+	if (!gtk_widget_get_visible (GTK_WIDGET (view->priv->hbar)) &&
+	    !gtk_widget_get_visible (GTK_WIDGET (view->priv->vbar)))
 		return FALSE;
 
 	return TRUE;
diff --git a/src/eog-sidebar.c b/src/eog-sidebar.c
index 55cec89..5ca2e51 100644
--- a/src/eog-sidebar.c
+++ b/src/eog-sidebar.c
@@ -234,11 +234,11 @@ eog_sidebar_menu_position_under (GtkMenu  *menu,
 	GtkWidget *widget;
 
 	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 (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/eog-window.c b/src/eog-window.c
index 9487d1b..c00b934 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -484,7 +484,7 @@ eog_window_collection_mode_changed_cb (GConfClient *client,
 	priv->collection_position = position;
 	priv->collection_resizable = resizable;
 
-	hpaned = priv->sidebar->parent;
+	hpaned = gtk_widget_get_parent (priv->sidebar);
 
 	g_object_ref (hpaned);
 	g_object_ref (priv->nav);
@@ -1048,7 +1048,7 @@ image_thumb_changed_cb (EogImage *image, gpointer data)
 		}
 
 		g_object_unref (thumb);
-	} else if (!GTK_WIDGET_VISIBLE (window->priv->nav)) {
+	} else if (!gtk_widget_get_visible (window->priv->nav)) {
 		gint img_pos = eog_list_store_get_pos_by_image (window->priv->store, image);
 		GtkTreePath *path = gtk_tree_path_new_from_indices (img_pos,-1);
 		GtkTreeIter iter;
@@ -1806,14 +1806,14 @@ eog_window_update_fullscreen_popup (EogWindow *window)
 
 	g_return_if_fail (popup != NULL);
 
-	if (GTK_WIDGET (window)->window == NULL) return;
+	if (gtk_widget_get_window (GTK_WIDGET (window)) == NULL) return;
 
 	screen = gtk_widget_get_screen (GTK_WIDGET (window));
 
 	gdk_screen_get_monitor_geometry (screen,
 			gdk_screen_get_monitor_at_window
                         (screen,
-                         GTK_WIDGET (window)->window),
+                         gtk_widget_get_window (GTK_WIDGET (window))),
                          &screen_rect);
 
 	gtk_widget_set_size_request (popup,
@@ -1954,7 +1954,7 @@ show_fullscreen_popup (EogWindow *window)
 {
 	eog_debug (DEBUG_WINDOW);
 
-	if (!GTK_WIDGET_VISIBLE (window->priv->fullscreen_popup)) {
+	if (!gtk_widget_get_visible (window->priv->fullscreen_popup)) {
 		gtk_widget_show_all (GTK_WIDGET (window->priv->fullscreen_popup));
 	}
 
@@ -2230,17 +2230,18 @@ eog_window_run_fullscreen (EogWindow *window, gboolean slideshow)
 	gtk_widget_grab_focus (priv->view);
 
 	eog_scroll_view_set_bg_color (EOG_SCROLL_VIEW (window->priv->view),
-				      &(GTK_WIDGET (window)->style->black));
+			  &(gtk_widget_get_style (GTK_WIDGET (window))->black));
 
 	{
 		GtkStyle *style;
 
-		style = gtk_style_copy (gtk_widget_get_style (priv->view->parent));
+		style = gtk_style_copy (gtk_widget_get_style (gtk_widget_get_parent (priv->view)));
 
 		style->xthickness = 0;
 		style->ythickness = 0;
 
-		gtk_widget_set_style (priv->view->parent, style);
+		gtk_widget_set_style (gtk_widget_get_parent (priv->view),
+				      style);
 
 		g_object_unref (style);
 	}
@@ -2307,7 +2308,7 @@ eog_window_stop_fullscreen (EogWindow *window, gboolean slideshow)
 	eog_scroll_view_set_zoom_upscale (EOG_SCROLL_VIEW (priv->view), FALSE);
 
 	eog_scroll_view_set_bg_color (EOG_SCROLL_VIEW (window->priv->view), NULL);
-	gtk_widget_set_style (window->priv->view->parent, NULL);
+	gtk_widget_set_style (gtk_widget_get_parent (window->priv->view), NULL);
 	gtk_window_unfullscreen (GTK_WINDOW (window));
 
 	if (slideshow) {
@@ -4087,7 +4088,7 @@ eog_window_sidebar_visibility_changed (GtkWidget *widget, EogWindow *window)
 	GtkAction *action;
 	gboolean visible;
 
-	visible = GTK_WIDGET_VISIBLE (window->priv->sidebar);
+	visible = gtk_widget_get_visible (window->priv->sidebar);
 
 	gconf_client_set_bool (window->priv->client,
 			       EOG_CONF_UI_SIDEBAR,
@@ -4822,7 +4823,7 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
 		}
 		if (tbcontainer->focus_child != NULL)
 			break;
-		if (!GTK_WIDGET_VISIBLE (EOG_WINDOW (widget)->priv->nav)) {
+		if (!gtk_widget_get_visible (EOG_WINDOW (widget)->priv->nav)) {
 			if (is_rtl && event->keyval == GDK_Left) {
 				/* handle RTL fall-through,
 				 * need to behave like GDK_Down then */
@@ -4853,7 +4854,7 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
 		}
 		if (tbcontainer->focus_child != NULL)
 			break;
-		if (!GTK_WIDGET_VISIBLE (EOG_WINDOW (widget)->priv->nav)) {
+		if (!gtk_widget_get_visible (EOG_WINDOW (widget)->priv->nav)) {
 			if (is_rtl && event->keyval == GDK_Right) {
 				/* handle RTL fall-through,
 				 * need to behave like GDK_Up then */
@@ -4868,7 +4869,7 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
 		}
 	case GDK_Page_Up:
 		if (!eog_scroll_view_scrollbars_visible (EOG_SCROLL_VIEW (EOG_WINDOW (widget)->priv->view))) {
-			if (!GTK_WIDGET_VISIBLE (EOG_WINDOW (widget)->priv->nav)) {
+			if (!gtk_widget_get_visible (EOG_WINDOW (widget)->priv->nav)) {
 				/* If the iconview is not visible skip to the
 				 * previous image manually as it won't handle
 				 * the keypress then. */
@@ -4881,7 +4882,7 @@ eog_window_key_press (GtkWidget *widget, GdkEventKey *event)
 		break;
 	case GDK_Page_Down:
 		if (!eog_scroll_view_scrollbars_visible (EOG_SCROLL_VIEW (EOG_WINDOW (widget)->priv->view))) {
-			if (!GTK_WIDGET_VISIBLE (EOG_WINDOW (widget)->priv->nav)) {
+			if (!gtk_widget_get_visible (EOG_WINDOW (widget)->priv->nav)) {
 				/* If the iconview is not visible skip to the
 				 * next image manually as it won't handle
 				 * the keypress then. */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]