No need for a configure check; just use the GTK_CHECK_VERSION macro. Bug

[evince.git] / shell / main.c

diff --git a/shell/main.c b/shell/main.c
index 3c5a83d33b1226c0646aa2f33ec61970e9451062..64b86dfa05c99826021289017183c736ece12df4 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -27,10 +27,15 @@
 #include <gtk/gtkmain.h>
 #include <stdlib.h>
 #include <string.h>
 #include <gtk/gtkmain.h>
 #include <stdlib.h>
 #include <string.h>

+
+#if WITH_GNOME

 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnomeui/gnome-app-helper.h>
 #include <libgnomeui/gnome-authentication-manager.h>
 #include <libgnome/gnome-program.h>
 #include <libgnomeui/gnome-ui-init.h>
 #include <libgnomeui/gnome-app-helper.h>
 #include <libgnomeui/gnome-authentication-manager.h>

+#endif
+
+#include <libgnomevfs/gnome-vfs-init.h>

 #include <libgnomevfs/gnome-vfs-utils.h>
 
 #ifdef ENABLE_DBUS
 #include <libgnomevfs/gnome-vfs-utils.h>
 
 #ifdef ENABLE_DBUS


@@ -54,7 +59,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 },
        { "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 },

-       { "unlink-temp-file", 'u', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &unlink_temp_file, NULL, NULL },
+       { "unlink-tempfile", 'u', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &unlink_temp_file, NULL, NULL },

        { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE...]") },
        { NULL }
 };
        { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &file_arguments, NULL, N_("[FILE...]") },
        { NULL }
 };


@@ -66,6 +71,24 @@ value_free (GValue *value)
        g_free (value);
 }
 
        g_free (value);
 }
 

+/**
+ * arguments_parse:
+ *
+ * Parses the arguments and creates a #GHashTable with this data.
+ *
+ *  key                 ->  value
+ *
+ *  dislay              ->  display at the default screen.
+ *  screen              ->  screen number.
+ *  page-label          ->  only if the page label argument has been passed,
+ *                          the page of the document to display.
+ *  mode                ->  only if the view mode is one of the availables,
+ *                          the view mode.
+ *  unlink-temp-file    ->  only if the view mode is preview mode and
+ *                          unlink-temp-file has been passed, unlink-temp-file.
+ *
+ * Returns: a pointer into #GHashTable with data from the arguments.
+ */

 static GHashTable *
 arguments_parse (void)
 {
 static GHashTable *
 arguments_parse (void)
 {


@@ -180,7 +203,6 @@ load_files (const char **files,
 }
 
 #ifdef ENABLE_DBUS
 }
 
 #ifdef ENABLE_DBUS

-

 static gboolean
 load_files_remote (const char **files,
                   GHashTable  *args)
 static gboolean
 load_files_remote (const char **files,
                   GHashTable  *args)


@@ -189,9 +211,6 @@ load_files_remote (const char **files,
        GError *error = NULL;
        DBusGConnection *connection;
        gboolean result = FALSE;
        GError *error = NULL;
        DBusGConnection *connection;
        gboolean result = FALSE;

-#if DBUS_VERSION < 35
-       DBusGPendingCall *call;
-#endif

        DBusGProxy *remote_object;
        GdkDisplay *display;
        guint32 timestamp;
        DBusGProxy *remote_object;
        GdkDisplay *display;
        guint32 timestamp;


@@ -212,31 +231,6 @@ load_files_remote (const char **files,
                                                    "/org/gnome/evince/Evince",
                                                    "org.gnome.evince.Application");
        if (!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_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);
-                       g_object_unref (remote_object);
-                       dbus_g_connection_unref (connection);
-                       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);
-                       g_object_unref (remote_object);
-                       dbus_g_connection_unref (connection);
-                       return FALSE;
-               }
-#else

                if (!dbus_g_proxy_call (remote_object, "OpenWindow", &error,
                                        dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), args,
                                        G_TYPE_UINT, timestamp,
                if (!dbus_g_proxy_call (remote_object, "OpenWindow", &error,
                                        dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), args,
                                        G_TYPE_UINT, timestamp,


@@ -248,7 +242,7 @@ load_files_remote (const char **files,
                        dbus_g_connection_unref (connection);
                        return FALSE;
                }
                        dbus_g_connection_unref (connection);
                        return FALSE;
                }

-#endif
+

                g_object_unref (remote_object);
                dbus_g_connection_unref (connection);
                
                g_object_unref (remote_object);
                dbus_g_connection_unref (connection);
                


@@ -261,33 +255,7 @@ load_files_remote (const char **files,
 
                uri = gnome_vfs_make_uri_from_shell_arg (files[i]);
                page_label = ev_page_label ? ev_page_label : "";
 
                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);
-
-               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,
                                        dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), args,
                if (!dbus_g_proxy_call (remote_object, "OpenURI", &error,
                                        G_TYPE_STRING, uri,
                                        dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), args,


@@ -299,7 +267,7 @@ load_files_remote (const char **files,
                        g_free (uri);
                        continue;
                }
                        g_free (uri);
                        continue;
                }

-#endif
+

                g_free (uri);
                result = TRUE;
         }
                g_free (uri);
                result = TRUE;
         }


@@ -319,7 +287,11 @@ main (int argc, char *argv[])
        gboolean enable_metadata = FALSE;
        GOptionContext *context;
        GHashTable *args;
        gboolean enable_metadata = FALSE;
        GOptionContext *context;
        GHashTable *args;

+#if WITH_GNOME

        GnomeProgram *program;
        GnomeProgram *program;

+#else
+       GError *error = NULL;
+#endif

 
        context = g_option_context_new (_("GNOME Document Viewer"));
 
 
        context = g_option_context_new (_("GNOME Document Viewer"));
 


@@ -333,12 +305,24 @@ main (int argc, char *argv[])
        g_option_context_add_main_entries (context, goption_options, NULL);
 #endif
 
        g_option_context_add_main_entries (context, goption_options, NULL);
 #endif
 

+#if WITH_GNOME

        program = gnome_program_init (PACKAGE, VERSION,
        program = gnome_program_init (PACKAGE, VERSION,

-                                      LIBGNOMEUI_MODULE, argc, argv,
-                                      GNOME_PARAM_GOPTION_CONTEXT, context,
-                                      GNOME_PARAM_HUMAN_READABLE_NAME, _("Evince"),
+                                     LIBGNOMEUI_MODULE, argc, argv,
+                                     GNOME_PARAM_GOPTION_CONTEXT, context,
+                                     GNOME_PARAM_HUMAN_READABLE_NAME, _("Evince"),

                                      GNOME_PARAM_APP_DATADIR, GNOMEDATADIR,
                                      GNOME_PARAM_APP_DATADIR, GNOMEDATADIR,

-                                      NULL);
+                                     NULL);
+#else
+       g_option_context_add_group (context, gtk_get_option_group (TRUE));
+       if (!g_option_context_parse (context, &argc, &argv, &error)) {
+               g_warning ("Cannot parse arguments: %s", error->message);
+               g_error_free (error);
+               return 1;
+       }
+       g_option_context_free (context);
+       
+       gnome_vfs_init ();
+#endif

 
        args = arguments_parse ();
 
 
        args = arguments_parse ();
 


@@ -346,17 +330,19 @@ main (int argc, char *argv[])
        if (!ev_application_register_service (EV_APP)) {
                if (load_files_remote (file_arguments, args)) {
                        g_hash_table_destroy (args);
        if (!ev_application_register_service (EV_APP)) {
                if (load_files_remote (file_arguments, args)) {
                        g_hash_table_destroy (args);

+#if WITH_GNOME

                        g_object_unref (program);
                        g_object_unref (program);

-                       
+#endif

                        return 0;
                }
        } else {
                enable_metadata = TRUE;
        }
 #endif
                        return 0;
                }
        } else {
                enable_metadata = TRUE;
        }
 #endif

-       
-       gdk_threads_init ();
+
+#if WITH_GNOME 

        gnome_authentication_manager_init ();
        gnome_authentication_manager_init ();

+#endif

 
        if (enable_metadata) {
                ev_metadata_manager_init ();
 
        if (enable_metadata) {
                ev_metadata_manager_init ();


@@ -374,13 +360,19 @@ main (int argc, char *argv[])
 
        gtk_main ();
 
 
        gtk_main ();
 

+#if WITH_GNOME

        gnome_accelerators_sync ();
        gnome_accelerators_sync ();

+#endif
+

        ev_file_helpers_shutdown ();
 
        if (enable_metadata) {
                ev_metadata_manager_shutdown ();
        }
        ev_file_helpers_shutdown ();
 
        if (enable_metadata) {
                ev_metadata_manager_shutdown ();
        }

-       g_object_unref (program);

 
 

+#if WITH_GNOME
+       g_object_unref (program);
+#endif
+       

        return 0;
 }
        return 0;
 }