From 92599dd89bbb969c842981fac80ccf2414866c10 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Sun, 28 Oct 2007 18:34:23 +0000
Subject: Add an expander to the open toolbar item which pops up a dropdown menu

2007-10-29  Carlos Garcia Campos  <carlosgc@gnome.org>
	* data/evince-toolbar.xml:
	* shell/Makefile.am:
	* shell/ev-application.c: (ev_application_init):
	* shell/ev-open-recent-action.[ch]:
	* shell/ev-window.c:
	(ev_window_open_recent_action_item_activated),
	(register_custom_actions):
	Add an expander to the open toolbar item which pops up a dropdown
	menu with the recently used documents. Fixes bug #487215.

svn path=/trunk/; revision=2731
---
(limited to 'shell/ev-application.c')

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 2567a8b..deac0ed 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -664,6 +664,8 @@ ev_application_class_init (EvApplicationClass *ev_application_class)
 static void
 ev_application_init (EvApplication *ev_application)
 {
+	gint i;
+	
 #if WITH_GNOME
 	init_session (ev_application);
 #endif
@@ -682,8 +684,24 @@ ev_application_init (EvApplication *ev_application)
 						  DATADIR"/evince-toolbar.xml");
 	}
 
+	/* Open item doesn't exist anymore,
+	 * convert it to OpenRecent for compatibility
+	 */
+	for (i = 0; i < egg_toolbars_model_n_items (ev_application->toolbars_model, 0); i++) {
+		const gchar *item;
+		
+		item = egg_toolbars_model_item_nth (ev_application->toolbars_model, 0, i);
+		if (g_ascii_strcasecmp (item, "FileOpen") == 0) {
+			egg_toolbars_model_remove_item (ev_application->toolbars_model, 0, i);
+			egg_toolbars_model_add_item (ev_application->toolbars_model, 0, i,
+						     "FileOpenRecent");
+			ev_application_save_toolbars_model (ev_application);
+			break;
+		}
+	}
+
 	egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
-				      EGG_TB_MODEL_NOT_REMOVABLE); 
+				      EGG_TB_MODEL_NOT_REMOVABLE);
 }
 
 /**
--
cgit v0.9.1