Marco Pesenti Gritti <mpg@redhat.com>

[evince.git] / shell / main.c

diff --git a/shell/main.c b/shell/main.c
index 86450d4d85e6cf847dfb29645b97b3699a41bbe6..eb55ecd2c16ead4aef74da64d34a95d36efa6734 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -21,45 +21,105 @@
 #include "config.h"
 
 #include "ev-application.h"
+#include "ev-metadata-manager.h"
 
 #include <glib/gi18n.h>
 #include <gtk/gtkmain.h>
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-ui-init.h>
+#include <libgnomeui/gnome-app-helper.h>
+#include <libgnomeui/gnome-authentication-manager.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
+#ifdef ENABLE_DBUS
+#include <dbus/dbus-glib-bindings.h>
+#endif
+
 #include "ev-stock-icons.h"
 #include "ev-debug.h"
+#include "ev-job-queue.h"
+#include "ev-file-helpers.h"
+
+static char *ev_page_label;
 
 static struct poptOption popt_options[] =
 {
+       { "page-label", 'p', POPT_ARG_STRING, &ev_page_label, 0, N_("The page of the document to display."), N_("PAGE")},
        { NULL, 0, 0, NULL, 0, NULL, NULL }
 };
 
 static void
 load_files (const char **files)
 {
-       GtkWidget *window;
        int i;
 
        if (!files) {
-               window = GTK_WIDGET (ev_application_new_window (EV_APP));
-               gtk_widget_show (window);
+               ev_application_open_window (EV_APP, NULL);
+               return;
+       }
+
+       for (i = 0; files[i]; i++) {
+               char *uri;
+
+               uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
+               ev_application_open_uri (EV_APP, uri, ev_page_label, NULL);             
+               g_free (uri);
+        }
+}
+
+#ifdef ENABLE_DBUS
+static void
+load_files_remote (const char **files)
+{
+       int i;
+       GError *error = NULL;
+       DBusGConnection *connection;
+       DBusGPendingCall *call;
+       DBusGProxy *remote_object;
+
+       connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+       if (connection == NULL) {
+               g_warning (error->message);
+               g_error_free (error);
+               
+               return;
+       }
+
+       remote_object = dbus_g_proxy_new_for_name (connection,
+                                                  "org.gnome.evince.ApplicationService",
+                                                   "/org/gnome/evince/Evince",
+                                                   "org.gnome.evince.Application");
+       if (!files) {
+               call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", G_TYPE_INVALID);
+
+               if (!dbus_g_proxy_end_call (remote_object, call, &error, G_TYPE_INVALID)) {
+                       g_warning (error->message);
+                       g_clear_error (&error);
+               }
                return;
        }
 
        for (i = 0; files[i]; i++) {
+               const char *page_label;
                char *uri;
 
-               uri = gnome_vfs_make_uri_from_shell_arg (files[i]);             
+               uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
+               page_label = ev_page_label ? ev_page_label : ""; 
 
-               window = GTK_WIDGET (ev_application_new_window (EV_APP));
-               gtk_widget_show (window);
-               ev_window_open (EV_WINDOW (window), uri);
+               call = dbus_g_proxy_begin_call (remote_object, "OpenURI",
+                                               G_TYPE_STRING, uri,
+                                               G_TYPE_STRING, page_label,
+                                               G_TYPE_INVALID);
 
+               if (!dbus_g_proxy_end_call (remote_object, call, &error, G_TYPE_INVALID)) {
+                       g_warning (error->message);
+                       g_clear_error (&error);
+               }
+               
                g_free (uri);
         }
 }
+#endif /* ENABLE_DBUS */
 
 int
 main (int argc, char *argv[])
@@ -79,25 +139,44 @@ 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);
+       g_object_get_property (G_OBJECT (program),
+                               GNOME_PARAM_POPT_CONTEXT,
+                               g_value_init (&context_as_value, G_TYPE_POINTER));
+        context = g_value_get_pointer (&context_as_value);
+
+
+#ifdef ENABLE_DBUS
+       if (!ev_application_register_service (EV_APP)) {
+               load_files_remote (poptGetArgs (context));
+               g_warning ("Another process was running.");
+               return 0;
+       } else {
+               g_warning ("Starting evince process.");
+       }
+#endif
+
+       gnome_authentication_manager_init ();
 
+       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));
-        context = g_value_get_pointer (&context_as_value);
-
        load_files (poptGetArgs (context));
 
        gtk_main ();
 
+       gnome_accelerators_sync ();
        poptFreeContext (context);
+       ev_file_helpers_shutdown ();
+#if ENABLE_METADATA
+       ev_metadata_manager_shutdown ();
+#endif
 
        return 0;
 }