#include "ev-metadata-manager.h"
#include <glib/gi18n.h>
+#include <gdk/gdkx.h>
#include <gtk/gtkmain.h>
+#include <stdlib.h>
+#include <string.h>
#include <libgnome/gnome-program.h>
#include <libgnomeui/gnome-ui-init.h>
#include <libgnomeui/gnome-app-helper.h>
int i;
if (!files) {
- ev_application_open_window (EV_APP, NULL);
+ ev_application_open_window (EV_APP, GDK_CURRENT_TIME, NULL);
return;
}
char *uri;
uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
- ev_application_open_uri (EV_APP, uri, ev_page_label, NULL);
+ ev_application_open_uri (EV_APP, uri, ev_page_label,
+ GDK_CURRENT_TIME, NULL);
g_free (uri);
}
}
#ifdef ENABLE_DBUS
-static void
+
+#ifndef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
+static guint32
+get_startup_time (void)
+{
+ const char *envvar, *timestamp;
+ unsigned long value;
+ char *end;
+
+ envvar = getenv ("DESKTOP_STARTUP_ID");
+
+ if (envvar == NULL)
+ return 0;
+
+/* DESKTOP_STARTUP_ID is of form "<unique>_TIME<timestamp>".
+ *
+ * <unique> might contain a T but <timestamp> is an integer. As such,
+ * the last 'T' in the string must be the start of "TIME".
+ */
+ timestamp = rindex (envvar, 'T');
+
+/* Maybe the word "TIME" was not found... */
+ if (timestamp == NULL || strncmp (timestamp, "TIME", 4))
+ return 0;
+
+ timestamp += 4;
+
+/* strtoul sets errno = ERANGE on overflow, but it is not specified
+ * if it sets it to 0 on success. Doing so ourselves is the only
+ * way to know for sure.
+ */
+ errno = 0;
+ value = strtoul (timestamp, &end, 10);
+
+/* unsigned long might be 64bit, so double-check! */
+ if (errno != 0 || *end != '\0' || value > G_MAXINT32)
+ return 0;
+
+ return value;
+}
+#endif
+
+static gboolean
load_files_remote (const char **files)
{
int i;
GError *error = NULL;
DBusGConnection *connection;
+ gboolean result = FALSE;
+#if DBUS_VERSION < 35
DBusGPendingCall *call;
+#endif
DBusGProxy *remote_object;
+#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
+ GdkDisplay *display;
+#endif
+ guint32 timestamp;
- connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+#ifdef HAVE_GTK_WINDOW_PRESENT_WITH_TIME
+ display = gdk_display_get_default();
+ timestamp = gdk_x11_display_get_user_time (display);
+#else
+ /* Fake it for GTK+2.6 */
+ timestamp = get_startup_time ();
+#endif
+ connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error);
if (connection == NULL) {
g_warning (error->message);
- g_error_free (error);
-
- return;
+ g_error_free (error);
+
+ return FALSE;
}
remote_object = dbus_g_proxy_new_for_name (connection,
"/org/gnome/evince/Evince",
"org.gnome.evince.Application");
if (!files) {
- call = dbus_g_proxy_begin_call (remote_object, "OpenWindow", G_TYPE_INVALID);
+#if DBUS_VERSION <= 33
+ call = dbus_g_proxy_begin_call (remote_object, "OpenWindow",
+ DBUS_TYPE_UINT32, ×tamp,
+ 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;
+ }
+#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;
}
- return;
+#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++) {
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, ×tamp,
+ 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 /* ENABLE_DBUS */
int
main (int argc, char *argv[])
{
+ gboolean enable_metadata = FALSE;
poptContext context;
GValue context_as_value = { 0 };
GnomeProgram *program;
#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"));
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;
}
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff