Cleanup many #include statements: reorder so that a generic-to-specific

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

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 6a4b2409f155f30aa1371806379cd437b2110815..bdcdfcd6a6ea8f9a72d1b4a4f4fef7da7b5766cb 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -21,24 +21,24 @@
  */
 
 #include <config.h>
-#include "ev-application.h"
-#include "ev-utils.h"
-#include "ev-file-helpers.h"
-#include "ev-document-factory.h"
-#include "totem-scrsaver.h"
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <glib-object.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 
 #if WITH_GNOME
 #include <libgnomeui/gnome-client.h>
 #endif
 
+#include "ev-application.h"
+#include "ev-utils.h"
+#include "ev-file-helpers.h"
+#include "ev-document-factory.h"
+#ifdef ENABLE_DBUS
+#include "ev-media-player-keys.h"
+#endif /* ENABLE_DBUS */
+#include "totem-scrsaver.h"
+
 #ifdef ENABLE_DBUS
 #include "ev-application-service.h"
 #include <dbus/dbus-glib-bindings.h>
@@ -59,12 +59,14 @@ struct _EvApplication {
 
        gchar *last_chooser_uri;
 
-#ifdef WITH_GTK_PRINT
+#ifdef ENABLE_DBUS
+       EvMediaPlayerKeys *keys;
+#endif /* ENABLE_DBUS */
+
        GtkPrintSettings *print_settings;
 #if GTK_CHECK_VERSION (2, 11, 0)
        gchar            *print_settings_file;
 #endif
-#endif
 };
 
 struct _EvApplicationClass {
@@ -638,7 +640,6 @@ ev_application_shutdown (EvApplication *application)
                application->toolbars_file = NULL;
        }
 
-#ifdef WITH_GTK_PRINT
 #if GTK_CHECK_VERSION (2, 11, 0)
        if (application->print_settings_file) {
                if (application->print_settings) {
@@ -648,7 +649,7 @@ ev_application_shutdown (EvApplication *application)
                                                    application->print_settings_file,
                                                    &error);
                        if (error) {
-                               g_warning (error->message);
+                               g_warning ("%s", error->message);
                                g_error_free (error);
                        }
 
@@ -665,7 +666,6 @@ ev_application_shutdown (EvApplication *application)
                application->print_settings = NULL;
        }
 #endif /* GTK 2.11.0 */
-#endif /* WITH_GTK_PRINT */
        
        g_free (application->last_chooser_uri);
        g_object_unref (application);
@@ -719,6 +719,10 @@ ev_application_init (EvApplication *ev_application)
 
        egg_toolbars_model_set_flags (ev_application->toolbars_model, 0,
                                      EGG_TB_MODEL_NOT_REMOVABLE);
+
+#ifdef ENABLE_DBUS
+       ev_application->keys = ev_media_player_keys_new ();
+#endif /* ENABLE_DBUS */
 }
 
 /**
@@ -748,6 +752,26 @@ ev_application_get_windows (EvApplication *application)
        return windows;
 }
 
+/**
+ * ev_application_get_media_keys:
+ * @application: The instance of the application.
+ *
+ * It gives you access to the media player keys handler object.
+ *
+ * Returns: A #EvMediaPlayerKeys.
+ */
+GObject
+*ev_application_get_media_keys (EvApplication *application)
+{
+#ifdef ENABLE_DBUS
+       if (!application->keys)
+               return NULL;
+       return g_object_ref (G_OBJECT (application->keys));
+#else
+       return NULL;
+#endif /* ENABLE_DBUS */
+}
+
 EggToolbarsModel *
 ev_application_get_toolbars_model (EvApplication *application)
 {
@@ -788,7 +812,6 @@ ev_application_screensaver_disable (EvApplication *application)
                totem_scrsaver_disable (application->scr_saver);        
 }
 
-#ifdef WITH_GTK_PRINT
 GtkPrintSettings *
 ev_application_get_print_settings (EvApplication *application)
 {
@@ -808,7 +831,7 @@ ev_application_get_print_settings (EvApplication *application)
                        gtk_print_settings_new_from_file (application->print_settings_file, &error);
                
                if (error) {
-                       g_warning (error->message);
+                       g_warning ("%s", error->message);
                        g_error_free (error);
                } else {
                        return application->print_settings;
@@ -835,4 +858,4 @@ ev_application_set_print_settings (EvApplication    *application,
        
        application->print_settings = g_object_ref (settings);
 }
-#endif /* WITH_GTK_PRINT */
+