← Back to branch summary

~ubuntu-branches/ubuntu/lucid/gnome-power-manager/lucid-updates

« back to all changes in this revision

Viewing changes to src/gpm-brightness.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-02-05 13:28:09 UTC
  • mfrom: (2.1.49 upstream)
  • Revision ID: james.westby@ubuntu.com-20100205132809-jfmqtr00ri6flcv2
Tags: 2.29.2-0ubuntu1
https://launchpad.net/bugs/425411
* New upstream release:
  - Move the power management preferences into the hardware section of the
    control center.
  - Use the name of 'Power' for the power management preferences capplet
  - Don't rely on the cached value of the lid status, to fix a double
    suspend issue (LP: #425411)
  - Add a flag to inhibit consolekit events just after we resumed
  - Don't automatically suspend if there are suspend inhibits
  - Do not exit if hal is not available
  - Only connect to HAL if there is no xrandr backlight hardware
  - Fix compile when using an ld that defaults to --as-needed
  - Enable the help action in gnome-power-statistics. Fixes #607005
  - Ensure the window is realized before we invalidate it. Fixes #604918
  - Don't show the user a sleep failed link pointing to the quirk site
  - Show the device name even when using UPower
  - Translation updates.
* Drop patches accepted upstream: 
  + 03-run-without-hal.patch
  + 04-dont-connect-to-hal-with-xrandr.patch
  + 09-fix-double-suspend.patch
* Regenerate 90-autotools.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gpm-brightness.c
16
16
 *
17
17
 * You should have received a copy of the GNU General Public License
18
18
 * along with this program; if not, write to the Free Software
19
 
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20
20
 */
21
21
 
22
22
#ifdef HAVE_CONFIG_H
439
439
        g_signal_connect (brightness->priv->xrandr, "brightness-changed",
440
440
                          G_CALLBACK (gpm_brightness_xrandr_changed_cb), brightness);
441
441
#ifdef HAVE_HAL
442
 
        brightness->priv->hal = gpm_brightness_hal_new ();
443
 
        if (gpm_brightness_hal_has_hw (brightness->priv->hal)) {
444
 
                egg_debug ("detected HAL hardware");
445
 
                brightness->priv->use_hal = TRUE;
 
442
        if (!brightness->priv->use_xrandr) {
 
443
                brightness->priv->hal = gpm_brightness_hal_new ();
 
444
                if (gpm_brightness_hal_has_hw (brightness->priv->hal)) {
 
445
                        egg_debug ("detected HAL hardware");
 
446
                        brightness->priv->use_hal = TRUE;
 
447
                }
 
448
                g_signal_connect (brightness->priv->hal, "brightness-changed",
 
449
                                  G_CALLBACK (gpm_brightness_hal_changed_cb), brightness);
446
450
        }
447
 
        g_signal_connect (brightness->priv->hal, "brightness-changed",
448
 
                          G_CALLBACK (gpm_brightness_hal_changed_cb), brightness);
449
451
#endif
450
452
}
451
453