at Jul 30 19:09:34 2005 Jonathan Blandford <jrb@redhat.com>

[evince.git] / shell / main.c

diff --git a/shell/main.c b/shell/main.c
index eb55ecd2c16ead4aef74da64d34a95d36efa6734..4fff6dfebfae1887ffd6fed01825b0477327d2a9 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -68,21 +68,24 @@ load_files (const char **files)
 }
 
 #ifdef ENABLE_DBUS
-static void
+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;
 
        connection = dbus_g_bus_get (DBUS_BUS_SESSION, &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,
@@ -90,13 +93,30 @@ load_files_remote (const char **files)
                                                    "/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_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_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_INVALID)) {
+                       g_warning (error->message);
+                       g_clear_error (&error);
+                       return FALSE;
+               }
+#endif
+               return TRUE;
        }
 
        for (i = 0; files[i]; i++) {
@@ -105,7 +125,19 @@ 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_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,
@@ -114,16 +146,32 @@ load_files_remote (const char **files)
                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_INVALID)) {
+                       g_warning (error->message);
+                       g_clear_error (&error);
+                       g_free (uri);
+                       continue;
+               }
+#endif
                g_free (uri);
+               result = TRUE;
         }
+
+       return result;
 }
 #endif /* ENABLE_DBUS */
 
 int
 main (int argc, char *argv[])
 {
+       gboolean enable_metadata = FALSE;
        poptContext context;
         GValue context_as_value = { 0 };
        GnomeProgram *program;
@@ -149,16 +197,23 @@ 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))) {
+                       g_warning ("Another process was running.");
+                       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"));
 
@@ -174,9 +229,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;
 }