diff options
author | Carlos Garcia Campos <carlosgc@gnome.org> | 2007-07-29 16:10:27 (GMT) |
---|---|---|
committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2007-07-29 16:10:27 (GMT) |
commit | 0de4e4076b4198674b6fa77c8281cd62a293f2fe (patch) | |
tree | f07dac3c125ed3c1d615b954afb9dc9407ccc20b /cut-n-paste/totem-screensaver/totem-scrsaver.c | |
parent | 5a3601d1ccfc1adf3f91e60f6de27e3ee1a5c6a2 (diff) |
Use g_timeout_add_seconds instead of g_timeout_add when available.
2007-07-29 Carlos Garcia Campos <carlosgc@gnome.org>
* cut-n-paste/totem-screensaver/totem-scrsaver.c:
(screensaver_disable_x11):
* shell/ev-metadata-manager.c: (ev_metadata_arm_timeout):
* shell/ev-window.c: (presentation_set_timeout):
* shell/ev-view.c: (ev_view_presentation_transition_start):
Use g_timeout_add_seconds instead of g_timeout_add when
available.
svn path=/trunk/; revision=2594
Diffstat (limited to 'cut-n-paste/totem-screensaver/totem-scrsaver.c')
-rw-r--r-- | cut-n-paste/totem-screensaver/totem-scrsaver.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.c b/cut-n-paste/totem-screensaver/totem-scrsaver.c index 1990b0c..3924430 100644 --- a/cut-n-paste/totem-screensaver/totem-scrsaver.c +++ b/cut-n-paste/totem-screensaver/totem-scrsaver.c @@ -294,11 +294,21 @@ 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); + (GSourceFunc) fake_event, scr); +#endif } else { - g_timeout_add (XSCREENSAVER_MIN_TIMEOUT / 2 * 1000, +#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; |