[eog] Enable TotemScreensaver unconditionally

[Felix Riemann <friemann src gnome org>]

commit 4c32882cc5d71ca7cc41e6843b4f36533d3ada68
Author: Felix Riemann <friemann gnome org>
Date:   Wed Mar 16 19:23:40 2011 +0100

    Enable TotemScreensaver unconditionally
    
    It uses GDBus instead of libdbus now. It can be enabled even if
    libdbus is not available as GDBus/GIO is always present.

 src/eog-application.c |    4 ----
 src/eog-application.h |    7 +------
 src/eog-window.c      |    4 ----
 3 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/src/eog-application.c b/src/eog-application.c
index 7046d7c..64270ea 100644
--- a/src/eog-application.c
+++ b/src/eog-application.c
@@ -32,9 +32,7 @@
 #include "eog-application.h"
 #include "eog-util.h"
 
-#ifdef HAVE_DBUS
 #include "totem-scrsaver.h"
-#endif
 
 #include <string.h>
 #include <glib.h>
@@ -516,7 +514,6 @@ eog_application_reset_toolbars_model (EogApplication *app)
 				      EGG_TB_MODEL_NOT_REMOVABLE);
 }
 
-#ifdef HAVE_DBUS
 /**
  * eog_application_screensaver_enable:
  * @application: an #EogApplication.
@@ -544,7 +541,6 @@ eog_application_screensaver_disable (EogApplication *application)
         if (application->scr_saver)
                 totem_scrsaver_disable (application->scr_saver);
 }
-#endif
 
 static void
 eog_application_load_accelerators (void)
diff --git a/src/eog-application.h b/src/eog-application.h
index 1385dbd..2d36b3c 100644
--- a/src/eog-application.h
+++ b/src/eog-application.h
@@ -29,9 +29,7 @@
 #include "egg-toolbars-model.h"
 #include "eog-plugin-engine.h"
 
-#ifdef HAVE_DBUS
 #include "totem-scrsaver.h"
-#endif
 
 #include <glib.h>
 #include <glib-object.h>
@@ -57,9 +55,8 @@ struct _EogApplication {
 	EggToolbarsModel *toolbars_model;
 	gchar            *toolbars_file;
 	EogPluginEngine  *plugin_engine;
-#ifdef HAVE_DBUS
+
 	TotemScrsaver    *scr_saver;
-#endif
 };
 
 struct _EogApplicationClass {
@@ -109,11 +106,9 @@ void              eog_application_save_toolbars_model (EogApplication *applicati
 
 void		  eog_application_reset_toolbars_model (EogApplication *app);
 
-#ifdef HAVE_DBUS
 void              eog_application_screensaver_enable  (EogApplication *application);
 
 void              eog_application_screensaver_disable (EogApplication *application);
-#endif
 
 G_END_DECLS
 
diff --git a/src/eog-window.c b/src/eog-window.c
index 397667c..b1a87f8 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -2089,9 +2089,7 @@ eog_window_run_fullscreen (EogWindow *window, gboolean slideshow)
 	gtk_window_fullscreen (GTK_WINDOW (window));
 	eog_window_update_fullscreen_popup (window);
 
-#ifdef HAVE_DBUS
 	eog_application_screensaver_disable (EOG_APP);
-#endif
 
 	/* Update both actions as we could've already been in one those modes */
 	eog_window_update_slideshow_action (window);
@@ -2157,9 +2155,7 @@ eog_window_stop_fullscreen (EogWindow *window, gboolean slideshow)
 
 	eog_scroll_view_show_cursor (EOG_SCROLL_VIEW (priv->view));
 
-#ifdef HAVE_DBUS
 	eog_application_screensaver_enable (EOG_APP);
-#endif
 }
 
 static void