From bcaa521f593f12d497df457701ced61e5297573c Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Sat, 26 Jan 2008 16:31:10 +0000
Subject: Removed

2008-01-26  Carlos Garcia Campos  <carlosgc@gnome.org>
	* cut-n-paste/totem-screensaver/totem-scrsaver.c:
	(screensaver_disable_x11):
	* shell/Makefile.am:
	* shell/xdg-user-dir-lookup.c: Removed
	* shell/ev-metadata-manager.c: (ev_metadata_arm_timeout):
	* shell/ev-view.c: (ev_view_presentation_transition_start):
	* shell/ev-window.c: (ev_window_cmd_file_open),
	(ev_window_cmd_save_as), (presentation_set_timeout):
	Remove #ifdefs that are no longer needed.

svn path=/trunk/; revision=2861
---
(limited to 'cut-n-paste/totem-screensaver')

diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.c b/cut-n-paste/totem-screensaver/totem-scrsaver.c
index 3924430..c7011cf 100644
--- a/cut-n-paste/totem-screensaver/totem-scrsaver.c
+++ b/cut-n-paste/totem-screensaver/totem-scrsaver.c
@@ -294,21 +294,11 @@ screensaver_disable_x11 (TotemScrsaver *scr)
 
 		if (scr->priv->timeout != 0)
 		{
-#if GLIB_CHECK_VERSION (2, 13, 0)
 			g_timeout_add_seconds (scr->priv->timeout / 2,
 					       (GSourceFunc) fake_event, scr);
-#else
-			g_timeout_add (scr->priv->timeout / 2 * 1000,
-				       (GSourceFunc) fake_event, scr);
-#endif
 		} else {
-#if GLIB_CHECK_VERSION (2, 13, 0)
 			g_timeout_add_seconds (XSCREENSAVER_MIN_TIMEOUT / 2,
 					(GSourceFunc) fake_event, scr);
-#else
-			g_timeout_add (XSCREENSAVER_MIN_TIMEOUT / 2 * 1000,
-				       (GSourceFunc) fake_event, scr);
-#endif
 		}
 
 		return;
--
cgit v0.9.1