Update news for 2.23.4 release.

[evince.git] / shell / main.c

diff --git a/shell/main.c b/shell/main.c
index cd6429307bb559d59460af84d9e3221cbc71ea75..04aa5ea18ce76b4f58e6f45edbf765f9282964d4 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -21,6 +21,7 @@
 
 #include "ev-application.h"
 #include "ev-metadata-manager.h"
+#include "ev-debug.h"
 
 #include <glib/gi18n.h>
 #include <gdk/gdkx.h>
@@ -35,9 +36,6 @@
 #include <libgnomeui/gnome-authentication-manager.h>
 #endif
 
-#include <libgnomevfs/gnome-vfs-init.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
-
 #ifdef ENABLE_DBUS
 #include <dbus/dbus-glib-bindings.h>
 #endif
@@ -45,8 +43,10 @@
 #include "ev-stock-icons.h"
 #include "ev-job-queue.h"
 #include "ev-file-helpers.h"
+#include "ev-backends-manager.h"
 
 static gchar   *ev_page_label;
+static gchar   *ev_find_string;
 static gboolean preview_mode = FALSE;
 static gboolean fullscren_mode = FALSE;
 static gboolean presentation_mode = FALSE;
@@ -60,6 +60,7 @@ static const GOptionEntry goption_options[] =
        { "fullscreen", 'f', 0, G_OPTION_ARG_NONE, &fullscren_mode, N_("Run evince in fullscreen mode"), NULL },
        { "presentation", 's', 0, G_OPTION_ARG_NONE, &presentation_mode, N_("Run evince in presentation mode"), NULL },
        { "preview", 'w', 0, G_OPTION_ARG_NONE, &preview_mode, N_("Run evince as a previewer"), NULL },
+       { "find", 'l', 0, G_OPTION_ARG_STRING, &ev_find_string, N_("The word or phrase to find in the document"), N_("STRING")},
        { "unlink-tempfile", 'u', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &unlink_temp_file, NULL, NULL },
        { "print-settings", 't', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME, &print_settings, NULL, NULL },
        { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE...]") },
@@ -134,6 +135,17 @@ arguments_parse (void)
                ev_page_label = NULL;
        }
 
+       if (ev_find_string) {
+               value = g_new0 (GValue, 1);
+               g_value_init (value, G_TYPE_STRING);
+               g_value_set_string (value, ev_find_string);
+
+               g_hash_table_insert (args, g_strdup ("find-string"), value);
+
+               g_free (ev_find_string);
+               ev_page_label = NULL;
+       }
+
        if (fullscren_mode)
                mode = EV_WINDOW_MODE_FULLSCREEN;
        else if (presentation_mode)
@@ -189,10 +201,13 @@ load_files (const char **files,
                char   *uri;
                char   *label;
                GValue *old = NULL;
+               GFile  *file;
 
-               uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
+               file = g_file_new_for_commandline_arg (files[i]);
+               uri = g_file_get_uri (file);
+               g_object_unref (file);
                
-               label = strchr (uri, GNOME_VFS_URI_MAGIC_CHR);
+               label = strchr (uri, '#');
 
                if (label) {
                        GValue *new;
@@ -237,7 +252,7 @@ load_files_remote (const char **files,
        connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error);
 
        if (connection == NULL) {
-               g_warning (error->message);
+               g_warning ("%s", error->message);
                g_error_free (error);   
 
                return FALSE;
@@ -253,7 +268,7 @@ load_files_remote (const char **files,
                                        G_TYPE_UINT, timestamp,
                                        G_TYPE_INVALID,
                                        G_TYPE_INVALID)) {
-                       g_warning (error->message);
+                       g_warning ("%s", error->message);
                        g_clear_error (&error);
                        g_object_unref (remote_object);
                        dbus_g_connection_unref (connection);
@@ -268,9 +283,13 @@ load_files_remote (const char **files,
 
        for (i = 0; files[i]; i++) {
                const char *page_label;
+               GFile *file;
                char *uri;
 
-               uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
+               file = g_file_new_for_commandline_arg (files[i]);
+               uri = g_file_get_uri (file);
+               g_object_unref (file);
+
                page_label = ev_page_label ? ev_page_label : "";
 
                if (!dbus_g_proxy_call (remote_object, "OpenURI", &error,
@@ -279,7 +298,7 @@ load_files_remote (const char **files,
                                        G_TYPE_UINT, timestamp,
                                        G_TYPE_INVALID,
                                        G_TYPE_INVALID)) {
-                       g_warning (error->message);
+                       g_warning ("%s", error->message);
                        g_clear_error (&error);
                        g_free (uri);
                        continue;
@@ -339,8 +358,6 @@ main (int argc, char *argv[])
                return 1;
        }
        g_option_context_free (context);
-       
-       gnome_vfs_init ();
 
        accel_filename = g_build_filename (ev_dot_dir (), "accels", NULL);
        gtk_accel_map_load (accel_filename);
@@ -362,10 +379,14 @@ main (int argc, char *argv[])
        }
 #endif
 
+       ev_debug_init ();
+       
 #if WITH_GNOME 
        gnome_authentication_manager_init ();
 #endif
 
+       ev_backends_manager_init ();
+       
        if (enable_metadata) {
                ev_metadata_manager_init ();
        }
@@ -395,6 +416,8 @@ main (int argc, char *argv[])
                ev_metadata_manager_shutdown ();
        }
 
+       ev_backends_manager_shutdown ();
+
 #if WITH_GNOME
        g_object_unref (program);
 #endif