[evince/gnome-2-30] [build] Fix build with gtk+ < 2.16



commit 85e76e93b35c9bab4e2604d49db72f7f4f6da3dd
Author: Carlos Garcia Campos <carlosgc gnome org>
Date:   Sun Apr 4 12:57:24 2010 +0200

    [build] Fix build with gtk+ < 2.16

 shell/ev-window.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 1f527b5..127105d 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -6093,11 +6093,13 @@ ev_window_init (EvWindow *ev_window)
 	GtkAccelGroup *accel_group;
 	GError *error = NULL;
 	GtkWidget *sidebar_widget;
-	GtkWidget *menuitem;
 	EggToolbarsModel *toolbars_model;
 	GObject *mpkeys;
 	gchar *ui_path;
 	gdouble dpi;
+#if GTK_CHECK_VERSION (2, 16, 0)
+	GtkWidget *menuitem;
+#endif
 
 	g_signal_connect (ev_window, "configure_event",
 			  G_CALLBACK (window_configure_event_cb), NULL);
@@ -6188,13 +6190,14 @@ ev_window_init (EvWindow *ev_window)
 	gtk_box_pack_start (GTK_BOX (ev_window->priv->main_box),
 			    ev_window->priv->menubar,
 			    FALSE, FALSE, 0);
+#if GTK_CHECK_VERSION (2, 16, 0)
 	menuitem = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
 					      "/MainMenu/EditMenu/EditRotateLeftMenu");
 	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
 	menuitem = gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
 					      "/MainMenu/EditMenu/EditRotateRightMenu");
 	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (menuitem), TRUE);
-
+#endif
 	toolbars_model = get_toolbars_model ();
 	ev_window->priv->toolbar = GTK_WIDGET
 		(g_object_new (EGG_TYPE_EDITABLE_TOOLBAR,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]