Marco Pesenti Gritti <mpg@redhat.com>

[evince.git] / shell / main.c

diff --git a/shell/main.c b/shell/main.c
index d412a5e570d4d70867fb794492ff0c2265694d2d..eb55ecd2c16ead4aef74da64d34a95d36efa6734 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -21,12 +21,14 @@
 #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
@@ -52,7 +54,7 @@ load_files (const char **files)
        int i;
 
        if (!files) {
-               ev_application_open_window (EV_APP);
+               ev_application_open_window (EV_APP, NULL);
                return;
        }
 
@@ -60,7 +62,7 @@ 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, NULL);             
                g_free (uri);
         }
 }
@@ -70,7 +72,7 @@ static void
 load_files_remote (const char **files)
 {
        int i;
-       GError *error;
+       GError *error = NULL;
        DBusGConnection *connection;
        DBusGPendingCall *call;
        DBusGProxy *remote_object;
@@ -78,6 +80,8 @@ load_files_remote (const char **files)
        connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
        if (connection == NULL) {
                g_warning (error->message);
+               g_error_free (error);
+               
                return;
        }
 
@@ -86,9 +90,11 @@ 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_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) {
+               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;
        }
@@ -101,17 +107,19 @@ load_files_remote (const char **files)
                page_label = ev_page_label ? ev_page_label : ""; 
 
                call = dbus_g_proxy_begin_call (remote_object, "OpenURI",
-                                               DBUS_TYPE_STRING, &uri,
-                                               DBUS_TYPE_STRING, &page_label,
-                                               DBUS_TYPE_INVALID);
-               if (!dbus_g_proxy_end_call (remote_object, call, &error, DBUS_TYPE_INVALID)) {
+                                               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);
                }
                
                g_free (uri);
         }
 }
-#endif
+#endif /* ENABLE_DBUS */
 
 int
 main (int argc, char *argv[])
@@ -149,6 +157,8 @@ main (int argc, char *argv[])
        }
 #endif
 
+       gnome_authentication_manager_init ();
+
        ev_job_queue_init ();
        g_set_application_name (_("Evince Document Viewer"));
 
@@ -164,6 +174,9 @@ main (int argc, char *argv[])
        gnome_accelerators_sync ();
        poptFreeContext (context);
        ev_file_helpers_shutdown ();
+#if ENABLE_METADATA
+       ev_metadata_manager_shutdown ();
+#endif
 
        return 0;
 }