Reorganize source tree.

[evince.git] / shell / main.c

diff --git a/shell/main.c b/shell/main.c
index a8903f76e02bd9bda029688c20c726a923fcd8b3..3c5a83d33b1226c0646aa2f33ec61970e9451062 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -15,7 +15,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- *  $Id$
  */
 
 #include "config.h"
@@ -39,7 +38,6 @@
 #endif
 
 #include "ev-stock-icons.h"
-#include "ev-debug.h"
 #include "ev-job-queue.h"
 #include "ev-file-helpers.h"
 
@@ -47,6 +45,7 @@ static gchar   *ev_page_label;
 static gboolean preview_mode = FALSE;
 static gboolean fullscren_mode = FALSE;
 static gboolean presentation_mode = FALSE;
+static gboolean unlink_temp_file = FALSE;
 static const char **file_arguments = NULL;
 
 static const GOptionEntry goption_options[] =
@@ -55,6 +54,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 },
+       { "unlink-temp-file", '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 }
 };
@@ -72,11 +72,31 @@ arguments_parse (void)
        GHashTable      *args;
        GValue          *value;
        EvWindowRunMode  mode;
+       GdkScreen       *screen;
+       GdkDisplay      *display;
+       const gchar     *display_name;
+       gint             screen_number;
 
        args = g_hash_table_new_full (g_str_hash,
                                      g_str_equal,
                                      (GDestroyNotify)g_free,
                                      (GDestroyNotify)value_free);
+       
+       screen = gdk_screen_get_default ();
+       display = gdk_screen_get_display (screen);
+
+       display_name = gdk_display_get_name (display);
+       screen_number = gdk_screen_get_number (screen);
+
+       value = g_new0 (GValue, 1);
+       g_value_init (value, G_TYPE_STRING);
+       g_value_set_string (value, display_name);
+       g_hash_table_insert (args, g_strdup ("display"), value);
+
+       value = g_new0 (GValue, 1);
+       g_value_init (value, G_TYPE_INT);
+       g_value_set_int (value, screen_number);
+       g_hash_table_insert (args, g_strdup ("screen"), value);
 
        if (ev_page_label) {
                value = g_new0 (GValue, 1);
@@ -101,6 +121,16 @@ arguments_parse (void)
 
        g_hash_table_insert (args, g_strdup ("mode"), value);
 
+       if (mode == EV_WINDOW_MODE_PREVIEW && unlink_temp_file) {
+               value = g_new0 (GValue, 1);
+               g_value_init (value, G_TYPE_BOOLEAN);
+               g_value_set_boolean (value, unlink_temp_file);
+
+               g_hash_table_insert (args,
+                                    g_strdup ("unlink-temp-file"),
+                                    value);
+       }
+
        return args;
 }
 
@@ -111,7 +141,7 @@ load_files (const char **files,
        int i;
 
        if (!files) {
-               ev_application_open_window (EV_APP, GDK_CURRENT_TIME, NULL);
+               ev_application_open_window (EV_APP, args, GDK_CURRENT_TIME, NULL);
                return;
        }
 
@@ -166,7 +196,7 @@ load_files_remote (const char **files,
        GdkDisplay *display;
        guint32 timestamp;
 
-       display = gdk_display_get_default();
+       display = gdk_display_get_default ();
        timestamp = gdk_x11_display_get_user_time (display);
        connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error);
 
@@ -208,6 +238,7 @@ load_files_remote (const char **files,
                }
 #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,
                                        G_TYPE_INVALID,
                                        G_TYPE_INVALID)) {
@@ -315,6 +346,7 @@ main (int argc, char *argv[])
        if (!ev_application_register_service (EV_APP)) {
                if (load_files_remote (file_arguments, args)) {
                        g_hash_table_destroy (args);
+                       g_object_unref (program);
                        
                        return 0;
                }
@@ -334,7 +366,6 @@ main (int argc, char *argv[])
        g_set_application_name (_("Evince Document Viewer"));
 
        ev_file_helpers_init ();
-       ev_debug_init ();
        ev_stock_icons_init ();
        gtk_window_set_default_icon_name ("evince");