X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=9b38ee6bbf9851de9555456567f8aa19f6b0388a;hb=2eecd9167f17b9b0506675a9dc05dff487779afa;hp=0b50cbd0df0381e259b3a63b4fa573024fc1339c;hpb=d0e4d9279d7aa4be1ddec50c2a87c63638632712;p=evince.git

diff --git a/shell/main.c b/shell/main.c
index 0b50cbd0..9b38ee6b 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -24,10 +24,12 @@
 #include "ev-metadata-manager.h"
 
 #include <glib/gi18n.h>
+#include <gdk/gdkx.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
@@ -53,7 +55,7 @@ load_files (const char **files)
 	int i;
 
 	if (!files) {
-		ev_application_open_window (EV_APP);
+		ev_application_open_window (EV_APP, GDK_CURRENT_TIME, NULL);
 		return;
 	}
 
@@ -61,25 +63,36 @@ load_files (const char **files)
 		char *uri;
 
 		uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
-		ev_application_open_uri (EV_APP, uri, ev_page_label);		
+		ev_application_open_uri (EV_APP, uri, ev_page_label,
+					 GDK_CURRENT_TIME, NULL);
 		g_free (uri);
         }
 }
 
 #ifdef ENABLE_DBUS
-static void
+static gboolean
 load_files_remote (const char **files)
 {
 	int i;
-	GError *error;
+	GError *error = NULL;
 	DBusGConnection *connection;
+	gboolean result = FALSE;
+#if DBUS_VERSION < 35
 	DBusGPendingCall *call;
+#endif
 	DBusGProxy *remote_object;
+	GdkDisplay *display;
+	guint32 timestamp;
+
+	display = gdk_display_get_default();
+	timestamp = gdk_x11_display_get_user_time (display);
 
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 	if (connection == NULL) {
 		g_warning (error->message);
-		return;
+		g_error_free (error);	
+
+		return FALSE;
 	}
 
 	remote_object = dbus_g_proxy_new_for_name (connection,
@@ -87,11 +100,37 @@ load_files_remote (const char **files)
                                                    "/org/gnome/evince/Evince",
                                                    "org.gnome.evince.Application");
 	if (!files) {
-		call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", DBUS_TYPE_INVALID);
+#if DBUS_VERSION <= 33
+		call = dbus_g_proxy_begin_call (remote_object, "OpenWindow",
+						DBUS_TYPE_UINT32, timestamp,
+						DBUS_TYPE_INVALID);
+
 		if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) {
 			g_warning (error->message);
+			g_clear_error (&error);
+			return FALSE;
 		}
-		return;
+#elif DBUS_VERSION == 34
+		call = dbus_g_proxy_begin_call (remote_object, "OpenWindow",
+						G_TYPE_UINT, timestamp,
+						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_UINT, timestamp,
+					G_TYPE_INVALID,
+					G_TYPE_INVALID)) {
+			g_warning (error->message);
+			g_clear_error (&error);
+			return FALSE;
+		}
+#endif
+		return TRUE;
 	}
 
 	for (i = 0; files[i]; i++) {
@@ -100,23 +139,59 @@ load_files_remote (const char **files)
 
 		uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
 		page_label = ev_page_label ? ev_page_label : ""; 
-
+#if DBUS_VERSION <= 33
 		call = dbus_g_proxy_begin_call (remote_object, "OpenURI",
 						DBUS_TYPE_STRING, &uri,
 						DBUS_TYPE_STRING, &page_label,
+						DBUS_TYPE_UINT32, timestamp,
 						DBUS_TYPE_INVALID);
+
 		if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) {
 			g_warning (error->message);
+			g_clear_error (&error);
+			g_free (uri);
+			continue;
+		}
+#elif DBUS_VERSION == 34
+		call = dbus_g_proxy_begin_call (remote_object, "OpenURI",
+						G_TYPE_STRING, uri,
+						G_TYPE_STRING, page_label,
+						G_TYPE_UINT, timestamp,
+						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);
+			continue;
+		}
+#else
+		if (!dbus_g_proxy_call (remote_object, "OpenURI", &error,
+					G_TYPE_STRING, uri,
+					G_TYPE_STRING, page_label,
+					G_TYPE_UINT, timestamp,
+					G_TYPE_INVALID,
+					G_TYPE_INVALID)) {
+			g_warning (error->message);
+			g_clear_error (&error);
+			g_free (uri);
+			continue;
 		}
-		
+#endif
 		g_free (uri);
+		result = TRUE;
         }
+
+	gdk_notify_startup_complete ();
+
+	return result;
 }
-#endif
+#endif /* ENABLE_DBUS */
 
 int
 main (int argc, char *argv[])
 {
+	gboolean enable_metadata = FALSE;
 	poptContext context;
         GValue context_as_value = { 0 };
 	GnomeProgram *program;
@@ -142,14 +217,21 @@ main (int argc, char *argv[])
 
 #ifdef ENABLE_DBUS
 	if (!ev_application_register_service (EV_APP)) {
-		load_files_remote (poptGetArgs (context));
-		g_warning ("Another process was running.");
-		return 0;
+		if (load_files_remote (poptGetArgs (context))) {
+			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"));
 
@@ -165,9 +247,10 @@ main (int argc, char *argv[])
 	gnome_accelerators_sync ();
 	poptFreeContext (context);
 	ev_file_helpers_shutdown ();
-#if ENABLE_METADATA
-	ev_metadata_manager_shutdown ();
-#endif
+
+	if (enable_metadata) {
+		ev_metadata_manager_shutdown ();
+	}
 
 	return 0;
 }