[gnome-power-manager] only connect to HAL if there is no xrandr hardware

[Sebastien Bacher <sbacher src gnome org>]

commit 65097823f0b884a1c30ee2517a5270e202eae4a9
Author: Martin Pitt <martin pitt ubuntu com>
Date:   Thu Jan 14 18:12:22 2010 +0100

    only connect to HAL if there is no xrandr hardware
    
    Nowadays it is a valid setup to have hal installed, but only start on demand
    via D-Bus activation (instead of during boot). If we detect xrandr-capable
    hardware, do not try to connect to hal.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=603470

 src/gpm-brightness.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/gpm-brightness.c b/src/gpm-brightness.c
index 6d2d3a1..ecbe819 100644
--- a/src/gpm-brightness.c
+++ b/src/gpm-brightness.c
@@ -439,13 +439,15 @@ gpm_brightness_init (GpmBrightness *brightness)
 	g_signal_connect (brightness->priv->xrandr, "brightness-changed",
 			  G_CALLBACK (gpm_brightness_xrandr_changed_cb), brightness);
 #ifdef HAVE_HAL
-	brightness->priv->hal = gpm_brightness_hal_new ();
-	if (gpm_brightness_hal_has_hw (brightness->priv->hal)) {
-		egg_debug ("detected HAL hardware");
-		brightness->priv->use_hal = TRUE;
+	if (!brightness->priv->use_xrandr) {
+		brightness->priv->hal = gpm_brightness_hal_new ();
+		if (gpm_brightness_hal_has_hw (brightness->priv->hal)) {
+			egg_debug ("detected HAL hardware");
+			brightness->priv->use_hal = TRUE;
+		}
+		g_signal_connect (brightness->priv->hal, "brightness-changed",
+				  G_CALLBACK (gpm_brightness_hal_changed_cb), brightness);
 	}
-	g_signal_connect (brightness->priv->hal, "brightness-changed",
-			  G_CALLBACK (gpm_brightness_hal_changed_cb), brightness);
 #endif
 }