[build] Rename DATADIR with EVINCEDATADIR

[evince.git] / shell / main.c

diff --git a/shell/main.c b/shell/main.c
index dfe6a200db31049a0ad72695aefe8a2f9d3011cb..7d4fb0d317b723f8e713a2deaa8a23b3a6b93e0d 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -41,9 +41,6 @@
 #endif /* WITH_SMCLIENT */
 
 #ifdef G_OS_WIN32
-#ifdef DATADIR
-#undef DATADIR
-#endif
 #include <io.h>
 #include <conio.h>
 #if !(_WIN32_WINNT >= 0x0500)
@@ -146,6 +143,28 @@ launch_previewer (void)
        return retval;
 }
 
+static gchar *
+get_label_from_filename (const gchar *filename)
+{
+       GFile   *file;
+       gchar   *label;
+       gboolean exists;
+
+       label = g_strrstr (filename, "#");
+       if (!label)
+               return NULL;
+
+       /* Filename contains a #, check
+        * whether it's part of the path
+        * or a label
+        */
+       file = g_file_new_for_commandline_arg (filename);
+       exists = g_file_query_exists (file, NULL);
+       g_object_unref (file);
+
+       return exists ? NULL : label;
+}
+
 static void
 load_files (const char **files)
 {
@@ -179,7 +198,7 @@ load_files (const char **files)
                const gchar *app_uri;
 
                filename = files[i];
-               label = strchr (filename, '#');
+               label = get_label_from_filename (filename);
                if (label) {
                        *label = 0;
                        label++;
@@ -247,7 +266,7 @@ main (int argc, char *argv[])
 
 #ifdef ENABLE_NLS
        /* Initialize the i18n stuff */
-       bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+       bindtextdomain (GETTEXT_PACKAGE, ev_get_locale_dir());
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
 #endif
@@ -294,14 +313,13 @@ main (int argc, char *argv[])
 
        ev_application_load_session (EV_APP);
        load_files (file_arguments);
-       if (ev_application_has_window (EV_APP)) {
-               /* Change directory so we don't prevent unmounting in case the initial cwd
-                * is on an external device (see bug #575436)
-                */
-               g_chdir (g_get_home_dir ());
 
-               gtk_main ();
-       }
+       /* Change directory so we don't prevent unmounting in case the initial cwd
+        * is on an external device (see bug #575436)
+        */
+       g_chdir (g_get_home_dir ());
+
+       gtk_main ();
 
        ev_shutdown ();
        ev_stock_icons_shutdown ();