Index: src/gpm-srv-backlight.c
===================================================================
--- src/gpm-srv-backlight.c	(revision 1877)
+++ src/gpm-srv-backlight.c	(working copy)
@@ -655,6 +655,8 @@ gpm_srv_backlight_init (GpmSrvBacklight 
 	g_signal_connect (srv_backlight->priv->button, "button-pressed",
 			  G_CALLBACK (button_pressed_cb), srv_backlight);
 
+	srv_backlight->priv->ac_adapter = gpm_ac_adapter_new ();
+
 	if (srv_backlight->priv->can_dim == TRUE) {
 		/* watch for manual brightness changes (for the feedback widget) */
 		srv_backlight->priv->brightness = gpm_brightness_lcd_new ();
@@ -670,9 +672,9 @@ gpm_srv_backlight_init (GpmSrvBacklight 
 		}
 		gpm_brightness_lcd_set_std (srv_backlight->priv->brightness, value);
 
-		/* set the default dim */ 	 
-		gpm_conf_get_uint (srv_backlight->priv->conf, GPM_CONF_PANEL_DIM_BRIGHTNESS, &value); 	 
-		gpm_brightness_lcd_set_dim (srv_backlight->priv->brightness, value); 	 
+		/* set the default dim */
+		gpm_conf_get_uint (srv_backlight->priv->conf, GPM_CONF_PANEL_DIM_BRIGHTNESS, &value);
+		gpm_brightness_lcd_set_dim (srv_backlight->priv->brightness, value);
 
 		/* use a visual widget */
 		srv_backlight->priv->feedback = gpm_feedback_new ();
@@ -693,7 +695,6 @@ gpm_srv_backlight_init (GpmSrvBacklight 
 	}
 
 	/* we use ac_adapter for the ac-adapter-changed signal */
-	srv_backlight->priv->ac_adapter = gpm_ac_adapter_new ();
 	g_signal_connect (srv_backlight->priv->ac_adapter, "ac-adapter-changed",
 			  G_CALLBACK (ac_adapter_changed_cb), srv_backlight);
 
Index: src/gpm-brightness-lcd.c
===================================================================
--- src/gpm-brightness-lcd.c	(revision 1877)
+++ src/gpm-brightness-lcd.c	(working copy)
@@ -99,7 +99,7 @@ gpm_brightness_lcd_get_hw (GpmBrightness
 
 	ret = dbus_g_proxy_call (proxy, "GetBrightness", &error,
 				 G_TYPE_INVALID,
-				 G_TYPE_UINT, &level,
+				 G_TYPE_INT, &level,
 				 G_TYPE_INVALID);
 
 	if (brightness_level_hw != NULL) {
