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;
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");
}
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)