Don't overwite an error.

[evince.git] / shell / main.c

diff --git a/shell/main.c b/shell/main.c
index c10ac853752e4bab36da169b9b76df414fc39dfb..17e0f647f9fa9f95041982c9a942f4ea49d46dfb 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -33,10 +33,13 @@
 #include "ev-application.h"
 #include "ev-backends-manager.h"
 #include "ev-debug.h"
+#include "ev-init.h"
 #include "ev-file-helpers.h"
 #include "ev-stock-icons.h"
 #include "eggsmclient.h"
+#ifndef G_OS_WIN32
 #include "eggdesktopfile.h"
+#endif
 
 static gchar   *ev_page_label;
 static gchar   *ev_find_string;
@@ -369,13 +372,18 @@ main (int argc, char *argv[])
        }
 #endif /* ENABLE_DBUS */
 
-       ev_debug_init ();
-       ev_backends_manager_init ();
-       
-       ev_file_helpers_init ();
+        if (!ev_init ())
+                return 1;
+
        ev_stock_icons_init ();
-       
+
+#ifdef G_OS_WIN32
+       /* Manually set name and icon in win32 */
+       g_set_application_name (_("Evince"));
+       gtk_window_set_default_icon_name ("evince");
+#else
        egg_set_desktop_file (GNOMEDATADIR "/applications/evince.desktop");
+#endif /* G_OS_WIN32 */
 
        if (!ev_application_load_session (EV_APP))
                load_files (file_arguments, args);
@@ -383,11 +391,7 @@ main (int argc, char *argv[])
 
        gtk_main ();
 
-       ev_file_helpers_shutdown ();
-
-       ev_backends_manager_shutdown ();
-
-       ev_debug_shutdown ();
+       ev_shutdown ();
 
        return 0;
 }