X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-application.c;h=381b4e36c8a7788da53e4e4d1264598a97eca08f;hb=872101b786854841e6b32cac322f08d3dde6b946;hp=e3c78a9eb9cc94fa2452e17d1e14a80e311bea84;hpb=70f641411b2fbab930b481ac844984819b48805d;p=evince.git

diff --git a/shell/ev-application.c b/shell/ev-application.c
index e3c78a9e..381b4e36 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -278,13 +278,16 @@ ev_application_open_uri (EvApplication  *application,
 			 guint           timestamp,
 			 GError        **error)
 {
-	ev_application_open_uri_at_dest (application, uri, NULL, timestamp);
 	
 	if (page_label && strcmp (page_label, "") != 0) {
-		EvWindow *window;
-
-		window = ev_application_get_uri_window (application, uri);
-		ev_window_open_page_label (window, page_label);
+		EvLinkDest *dest;
+		
+		dest = ev_link_dest_new_page_label (page_label);
+
+		ev_application_open_uri_at_dest (application, uri, dest, timestamp);
+		g_object_unref (dest);
+	} else {
+		ev_application_open_uri_at_dest (application, uri, NULL, timestamp);
 	}
 
 	return TRUE;
@@ -339,9 +342,12 @@ ev_application_init (EvApplication *ev_application)
 	ev_application->toolbars_file = g_build_filename
 			(ev_dot_dir (), "evince_toolbar.xml", NULL);
 
-	if (!egg_toolbars_model_load (ev_application->toolbars_model,
+	egg_toolbars_model_load_names (ev_application->toolbars_model,
+				       DATADIR "/evince-toolbar.xml");
+
+	if (!egg_toolbars_model_load_toolbars (ev_application->toolbars_model,
 				      ev_application->toolbars_file)) {
-		egg_toolbars_model_load (ev_application->toolbars_model,
+		egg_toolbars_model_load_toolbars (ev_application->toolbars_model,
 					 DATADIR"/evince-toolbar.xml");
 	}
 
@@ -388,8 +394,8 @@ EggRecentModel *ev_application_get_recent_model (EvApplication *application)
 
 void ev_application_save_toolbars_model (EvApplication *application)
 {
-        egg_toolbars_model_save (application->toolbars_model,
-				 application->toolbars_file, "1.0");
+        egg_toolbars_model_save_toolbars (application->toolbars_model,
+			 	          application->toolbars_file, "1.0");
 }
 
 void ev_application_set_chooser_uri (EvApplication *application, const gchar *uri)