Move mime-type functions from document-facrory to file-helpers so that it

[evince.git] / shell / ev-application.c

diff --git a/shell/ev-application.c b/shell/ev-application.c
index e852561f3009de2b4c202d9d3e1812a0367c7f9c..9637940e6e270ade87a2e321b463e2bf6a507514 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -31,7 +31,6 @@
 
 #include "totem-scrsaver.h"
 #include "eggsmclient.h"
-#include "eggdesktopfile.h"
 
 #include "ev-application.h"
 #include "ev-document-factory.h"
@@ -69,9 +68,7 @@ struct _EvApplication {
 #endif /* ENABLE_DBUS */
 
        GtkPrintSettings *print_settings;
-#if GTK_CHECK_VERSION (2, 11, 0)
        gchar            *print_settings_file;
-#endif
 };
 
 struct _EvApplicationClass {
@@ -229,8 +226,6 @@ smclient_quit_cb (EggSMClient   *client,
 static void
 ev_application_init_session (EvApplication *application)
 {
-       egg_set_desktop_file (GNOMEDATADIR "/applications/evince.desktop");
-       
        application->smclient = egg_sm_client_get ();
        g_signal_connect (application->smclient, "save_state",
                          G_CALLBACK (smclient_save_state_cb),
@@ -696,7 +691,6 @@ ev_application_shutdown (EvApplication *application)
                application->toolbars_file = NULL;
        }
 
-#if GTK_CHECK_VERSION (2, 11, 0)
        if (application->print_settings_file) {
                if (application->print_settings) {
                        GError *error = NULL;
@@ -716,12 +710,6 @@ ev_application_shutdown (EvApplication *application)
                g_free (application->print_settings_file);
                application->print_settings_file = NULL;
        }
-#else /* ! GTK 2.11.0 */
-       if (application->print_settings) {
-               g_object_unref (application->print_settings);
-               application->print_settings = NULL;
-       }
-#endif /* GTK 2.11.0 */
 
 #ifdef ENABLE_DBUS
        if (application->keys) {
@@ -888,7 +876,6 @@ ev_application_get_print_settings (EvApplication *application)
        if (application->print_settings)
                return application->print_settings;
        
-#if GTK_CHECK_VERSION (2, 11, 0)
        if (!application->print_settings_file) {
                application->print_settings_file =
                        g_build_filename (ev_dot_dir (), "print-settings", NULL);
@@ -907,7 +894,6 @@ ev_application_get_print_settings (EvApplication *application)
                        return application->print_settings;
                }
        }
-#endif /* GTK 2.11.0 */
        
        application->print_settings = gtk_print_settings_new ();