Package: gnome-power-manager
Version: 2.16.0-1
Severity: normal
Tags: patch fixed-upstream

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

There's a bug in g-p-m that prevents gnome-screensaver from displaying
any screensavers after g-p-m has put the display into power saving mode.

http://bugzilla.gnome.org/show_bug.cgi?id=355279

This has been fixed in HEAD and in the 2.16 branch, though I don't know
which released version (if any) has the fix.

Attached is the patch for 2.16.0 which I have been using for a while.

- -- System Information:
Debian Release: 4.0
  APT prefers testing
  APT policy: (530, 'testing'), (520, 'unstable'), (510, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-1-k7
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)

Versions of packages gnome-power-manager depends on:
ii  gconf2                     2.16.0-2      GNOME configuration database syste
ii  hal                        0.5.8.1-3     Hardware Abstraction Layer
ii  libart-2.0-2               2.3.17-1      Library of functions for 2D graphi
ii  libatk1.0-0                1.12.3-1      The ATK accessibility toolkit
ii  libbonobo2-0               2.16.0-1      Bonobo CORBA interfaces library
ii  libbonoboui2-0             2.16.0-1      The Bonobo UI library
ii  libc6                      2.3.6.ds1-7   GNU C Library: Shared libraries
ii  libcairo2                  1.2.4-4       The Cairo 2D vector graphics libra
ii  libdbus-1-3                0.94-1        simple interprocess messaging syst
ii  libdbus-glib-1-2           0.71-2        simple interprocess messaging syst
ii  libfontconfig1             2.4.1-2       generic font configuration library
ii  libfreetype6               2.2.1-5       FreeType 2 font engine, shared lib
ii  libgconf2-4                2.16.0-2      GNOME configuration database syste
ii  libglade2-0                1:2.6.0-2     library to load .glade files at ru
ii  libglib2.0-0               2.12.4-1      The GLib library of C routines
ii  libgnome-keyring0          0.6.0-2       GNOME keyring services library
ii  libgnome2-0                2.16.0-2      The GNOME 2 library - runtime file
ii  libgnomecanvas2-0          2.14.0-2      A powerful object-oriented display
ii  libgnomeui-0               2.16.1-1      The GNOME 2 libraries (User Interf
ii  libgnomevfs2-0             2.16.1-1      GNOME virtual file-system (runtime
ii  libgtk2.0-0                2.10.6-2      The GTK+ graphical user interface 
ii  libhal1                    0.5.8.1-3     Hardware Abstraction Layer - share
ii  libice6                    1:1.0.1-2     X11 Inter-Client Exchange library
ii  libnotify1                 0.4.2-1+b1    sends desktop notifications to a n
ii  liborbit2                  1:2.14.3-0.1  libraries for ORBit2 - a CORBA ORB
ii  libpango1.0-0              1.14.7-1      Layout and rendering of internatio
ii  libpng12-0                 1.2.8rel-7    PNG library - runtime
ii  libpopt0                   1.10-3        lib for parsing cmdline parameters
ii  libsm6                     1:1.0.1-3     X11 Session Management library
ii  libwnck18                  2.14.3-1      Window Navigator Construction Kit 
ii  libx11-6                   2:1.0.3-2     X11 client-side library
ii  libxcursor1                1.1.7-4       X cursor management library
ii  libxext6                   1:1.0.1-2     X11 miscellaneous extension librar
ii  libxfixes3                 1:4.0.1-4     X11 miscellaneous 'fixes' extensio
ii  libxi6                     1:1.0.1-3     X11 Input extension library
ii  libxinerama1               1:1.0.1-4.1   X11 Xinerama extension library
ii  libxml2                    2.6.27.dfsg-1 GNOME XML library
ii  libxrandr2                 2:1.1.0.2-4   X11 RandR extension library
ii  libxrender1                1:0.9.1-3     X Rendering Extension client libra
ii  notification-daemon        0.3.5-1+b1    a daemon that displays passive pop
ii  zlib1g                     1:1.2.3-13    compression library - runtime

gnome-power-manager recommends no packages.

- -- no debconf information

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)

iD8DBQFFVmPxshl/216gEHgRAlEmAKDZaYTLWHGvPrrLZXnT8XzSltWprgCgvtcA
jOHIQsdNFawYSAVQFcgyQOQ=
=VSYN
-----END PGP SIGNATURE-----
diff -Nur gnome-power-manager-2.16.0/src/gpm-manager.c gnome-power-manager-2.16.0.new/src/gpm-manager.c
--- gnome-power-manager-2.16.0/src/gpm-manager.c	2006-08-15 20:52:23.000000000 +0100
+++ gnome-power-manager-2.16.0.new/src/gpm-manager.c	2006-11-06 19:53:01.000000000 +0000
@@ -680,6 +680,10 @@
 			manager->priv->dpms_throttle_id = 0;
 		}
 	} else {
+		/* if throttle already exists then remove */
+		if (manager->priv->dpms_throttle_id > 0) {
+			gpm_screensaver_remove_throttle (manager->priv->screensaver, manager->priv->dpms_throttle_id);
+		}
 		manager->priv->dpms_throttle_id = gpm_screensaver_add_throttle (manager->priv->screensaver, _("Display power management activated"));
 	}
 }
@@ -2880,6 +2884,9 @@
 	manager->priv->ignore_inhibits = gconf_client_get_bool (manager->priv->gconf_client,
 								GPM_PREF_IGNORE_INHIBITS, NULL);
 
+	/* set no throttle */
+	manager->priv->dpms_throttle_id = -1;
+
 	/* poll the lid periodically to avoid #346082 */
 	g_timeout_add (1000 * 60, (GSourceFunc) manager_rescan_buttons, manager);
 }

Reply via email to