Fix flickering on resizing

[evince.git] / shell / main.c

diff --git a/shell/main.c b/shell/main.c
index 4b0c8427b342b30198142cd68241710023ccae5a..827c6968ca1baac77ccc96afd6381d4664bf863c 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -26,10 +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 }
 };
 
@@ -46,22 +55,21 @@ load_files (const char **files)
        }
 
        for (i = 0; files[i]; i++) {
-               const char *uri;
-               char *freeme = NULL;
-               char *scheme;
-
-               if ((scheme = gnome_vfs_get_uri_scheme (files[i])))
-                       uri = files[i];
-               else
-                       uri = freeme = gnome_vfs_get_uri_from_local_path (files[i]);
-                       
+               char *uri;
+
+               uri = gnome_vfs_make_uri_from_shell_arg (files[i]);             
+
                window = GTK_WIDGET (ev_application_new_window (EV_APP));
                gtk_widget_show (window);
                ev_window_open (EV_WINDOW (window), uri);
+               
+               if (page_label != NULL)
+                       ev_window_open_page_label (EV_WINDOW (window), page_label);
 
-               g_free (scheme);
-               g_free (freeme);
+               g_free (uri);
         }
+
+       g_free (page_label);
 }
 
 int
@@ -82,11 +90,17 @@ 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");
+
        g_object_get_property (G_OBJECT (program),
                                GNOME_PARAM_POPT_CONTEXT,
                                g_value_init (&context_as_value, G_TYPE_POINTER));
@@ -96,7 +110,9 @@ main (int argc, char *argv[])
 
        gtk_main ();
 
+       gnome_accelerators_sync ();
        poptFreeContext (context);
+       ev_file_helpers_shutdown ();
 
        return 0;
 }