X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=b0cc803df9dfbe86dbbea139f5abe85159f5b02d;hb=bca369672136e5ff831ece9832afd42085808fba;hp=6cd14e882b1cdc55d42038177d30ae648871d948;hpb=1c0d19bd22598eca159c3febdcdaf4168891cb8f;p=evince.git

diff --git a/shell/main.c b/shell/main.c
index 6cd14e88..b0cc803d 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -26,14 +26,19 @@
 #include <gtk/gtkmain.h>
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-ui-init.h>
+#include <libgnomeui/gnome-app-helper.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
 #include "ev-stock-icons.h"
 #include "ev-debug.h"
 #include "ev-job-queue.h"
+#include "ev-file-helpers.h"
+
+static char *page_label;
 
 static struct poptOption popt_options[] =
 {
+	{ "page-label", 'p', POPT_ARG_STRING, &page_label, 0, N_("The page of the document to display."), N_("PAGE")},
 	{ NULL, 0, 0, NULL, 0, NULL, NULL }
 };
 
@@ -56,10 +61,15 @@ load_files (const char **files)
 
 		window = GTK_WIDGET (ev_application_new_window (EV_APP));
 		gtk_widget_show (window);
-		ev_window_open (EV_WINDOW (window), uri);
+		ev_window_open_uri (EV_WINDOW (window), uri);
+		
+		if (page_label != NULL)
+			ev_window_open_page_label (EV_WINDOW (window), page_label);
 
 		g_free (uri);
         }
+
+	g_free (page_label);
 }
 
 int
@@ -80,12 +90,13 @@ main (int argc, char *argv[])
                                       LIBGNOMEUI_MODULE, argc, argv,
                                       GNOME_PARAM_POPT_TABLE, popt_options,
                                       GNOME_PARAM_HUMAN_READABLE_NAME, _("Evince"),
-				      GNOME_PARAM_APP_DATADIR, DATADIR,
+				      GNOME_PARAM_APP_DATADIR, GNOMEDATADIR,
                                       NULL);
 
 	ev_job_queue_init ();
 	g_set_application_name (_("Evince Document Viewer"));
 
+	ev_file_helpers_init ();
 	ev_debug_init ();
 	ev_stock_icons_init ();
 	gtk_window_set_default_icon_name ("postscript-viewer");
@@ -99,7 +110,9 @@ main (int argc, char *argv[])
 
 	gtk_main ();
 
+	gnome_accelerators_sync ();
 	poptFreeContext (context);
+	ev_file_helpers_shutdown ();
 
 	return 0;
 }