X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=f6600f0f19edafc347dddff103e28797f0ee8066;hb=28df8004a43a579e93ea905a2426fe42e1e6dfa7;hp=b0a0b76a3afc5796b3ae6261fedeba931fecb1a6;hpb=11368f9b50db86ce4f2ae0b549fb575a19af2a74;p=evince.git

diff --git a/shell/main.c b/shell/main.c
index b0a0b76a..f6600f0f 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -21,52 +21,135 @@
 #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]);		
+		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 gboolean
+load_files_remote (const char **files)
+{
+	int i;
+	GError *error = NULL;
+	DBusGConnection *connection;
+#if DBUS_VERSION < 35
+	DBusGPendingCall *call;
+#endif
+	DBusGProxy *remote_object;
+
+	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+	if (connection == NULL) {
+		g_warning (error->message);
+		g_error_free (error);	
+
+		return FALSE;
+	}
+
+	remote_object = dbus_g_proxy_new_for_name (connection,
+						   "org.gnome.evince.ApplicationService",
+                                                   "/org/gnome/evince/Evince",
+                                                   "org.gnome.evince.Application");
+	if (!files) {
+#if DBUS_VERSION < 35
+		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 FALSE;
+		}
+#else
+		if (!dbus_g_proxy_call (remote_object, "OpenWindow", &error, G_TYPE_INVALID)) {
+			g_warning (error->message);
+			g_clear_error (&error);
+			return FALSE;
+		}
+#endif
+		return TRUE;
+	}
 
-		window = GTK_WIDGET (ev_application_new_window (EV_APP));
-		gtk_widget_show (window);
-		ev_window_open (EV_WINDOW (window), uri);
+	for (i = 0; files[i]; i++) {
+		gboolean result = TRUE;
+		const char *page_label;
+		char *uri;
 
+		uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
+		page_label = ev_page_label ? ev_page_label : ""; 
+#if DBUS_VERSION < 35
+		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);
+			result = FALSE;
+		}
+#else
+		if (!dbus_g_proxy_call (remote_object, "OpenURI", &error,
+					G_TYPE_STRING, uri,
+					G_TYPE_STRING, page_label,
+					G_TYPE_INVALID)) {
+			g_warning (error->message);
+			g_clear_error (&error);
+			result = FALSE;
+		}
+#endif
 		g_free (uri);
+		return result;
         }
+
+	return TRUE;
 }
+#endif /* ENABLE_DBUS */
 
 int
 main (int argc, char *argv[])
 {
+	gboolean enable_metadata = FALSE;
 	poptContext context;
         GValue context_as_value = { 0 };
 	GnomeProgram *program;
@@ -84,6 +167,30 @@ main (int argc, char *argv[])
                                       GNOME_PARAM_HUMAN_READABLE_NAME, _("Evince"),
 				      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)) {
+		if (load_files_remote (poptGetArgs (context))) {
+			g_warning ("Another process was running.");
+			return 0;
+		}
+	} else {
+		g_warning ("Starting evince process.");
+		enable_metadata = TRUE;
+	}
+#endif
+
+	gnome_authentication_manager_init ();
+
+
+	if (enable_metadata) {
+		ev_metadata_manager_init ();
+	}
 
 	ev_job_queue_init ();
 	g_set_application_name (_("Evince Document Viewer"));
@@ -93,11 +200,6 @@ main (int argc, char *argv[])
 	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 ();
@@ -106,5 +208,9 @@ main (int argc, char *argv[])
 	poptFreeContext (context);
 	ev_file_helpers_shutdown ();
 
+	if (enable_metadata) {
+		ev_metadata_manager_shutdown ();
+	}
+
 	return 0;
 }