#include "config.h"
#include "ev-application.h"
+#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
+#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 *page_label;
+static char *ev_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")},
+ { "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, GDK_CURRENT_TIME, 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,
+ GDK_CURRENT_TIME, NULL);
+ g_free (uri);
+ }
+}
+
+#ifdef ENABLE_DBUS
+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;
+ 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);
+ 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 <= 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;
+ }
+#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++) {
+ 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 <= 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);
- window = GTK_WIDGET (ev_application_new_window (EV_APP));
- gtk_widget_show (window);
- ev_window_open_uri (EV_WINDOW (window), uri);
-
- if (page_label != NULL)
- ev_window_open_page_label (EV_WINDOW (window), page_label);
+ 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;
}
- g_free (page_label);
+ 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;
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))) {
+ return 0;
+ }
+ } else {
+ 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"));
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 ();
poptFreeContext (context);
ev_file_helpers_shutdown ();
+ if (enable_metadata) {
+ ev_metadata_manager_shutdown ();
+ }
+
return 0;
}
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff