← Back to branch summary

~kaozilon/totem/test

« back to all changes in this revision

Viewing changes to lib/totem-scrsaver.c

  • Committer: Bazaar Package Importer
  • Author(s): Sjoerd Simons, Josselin Mouette, Sjoerd Simons, Emilio Pozuelo Monfort
  • Date: 2009-04-19 17:28:51 UTC
  • mfrom: (1.2.52 upstream) (5.1.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090419172851-epoqimnq62akn294
Tags: 2.26.1-1
http://bugs.debian.org/523582
http://bugs.debian.org/523052
[ Josselin Mouette ]
* totem-plugins depends on python-gdbm. Closes: #523582.

[ Sjoerd Simons ]
* New upstream release (2.26.1)
* debian/patches/02_flv.patch: Dropped, fixed upstream
* debian/patches/04_tracker_build.patch: Dropped, fixed upstream
* debian/patches/01_fake_keypresses.patch: Updated and simplified
* debian/patches/70_bbc_plugin.patch: Updated
* debian/patches/90_autotools.patch: Updated

[ Emilio Pozuelo Monfort ]
* Recommend gnome-codec-install rather than gnome-app-install.
  Closes: #523052.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/totem-scrsaver.c
50
50
#define XSCREENSAVER_MIN_TIMEOUT 60
51
51
 
52
52
static GObjectClass *parent_class = NULL;
53
 
static void totem_scrsaver_class_init (TotemScrsaverClass *class);
54
 
static void totem_scrsaver_init       (TotemScrsaver      *parser);
55
53
static void totem_scrsaver_finalize   (GObject *object);
56
54
 
57
55
 
296
294
                                &scr->priv->allow_exposures);
297
295
                XUnlockDisplay (GDK_DISPLAY());
298
296
 
299
 
                if (scr->priv->timeout != 0)
300
 
                {
301
 
                        g_timeout_add (scr->priv->timeout / 2 * 1000,
302
 
                                        (GSourceFunc) fake_event, scr);
 
297
                if (scr->priv->timeout != 0) {
 
298
                        g_timeout_add_seconds (scr->priv->timeout / 2,
 
299
                                               (GSourceFunc) fake_event, scr);
303
300
                } else {
304
 
                        g_timeout_add (XSCREENSAVER_MIN_TIMEOUT / 2 * 1000,
305
 
                                        (GSourceFunc) fake_event, scr);
 
301
                        g_timeout_add_seconds (XSCREENSAVER_MIN_TIMEOUT / 2,
 
302
                                               (GSourceFunc) fake_event, scr);
306
303
                }
307
304
 
308
305
                return;