[gnome-settings-daemon/docking-stations] Fix compilation

[Federico Mena Quintero <federico src gnome org>]

commit ff7ccafcad3b3f19ec27042b3a83cd30dd35f92e
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Nov 15 20:26:43 2011 -0600

    Fix compilation
    
    Signed-off-by: Federico Mena Quintero <federico gnome org>

 plugins/xrandr/gsd-xrandr-manager.c |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 5b36c30..dd6e81b 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -357,6 +357,16 @@ print_configuration (GnomeRRConfig *config, const char *header)
                 print_output (outputs[i]);
 }
 
+static gboolean
+is_laptop (GnomeRRScreen *screen, GnomeRROutputInfo *output)
+{
+        GnomeRROutput *rr_output;
+
+        rr_output = gnome_rr_screen_get_output_by_name (screen, gnome_rr_output_info_get_name (output));
+
+        return gnome_rr_output_is_laptop (rr_output);
+}
+
 static GnomeRROutputInfo *
 get_laptop_output_info (GnomeRRScreen *screen, GnomeRRConfig *config)
 {
@@ -394,7 +404,7 @@ turn_off_laptop_display_in_configuration (GnomeRRScreen *screen, GnomeRRConfig *
 {
         GnomeRROutputInfo *laptop_info;
 
-        laptop_info = get_laptop_output_info (priv->rw_screen, config);
+        laptop_info = get_laptop_output_info (screen, config);
         if (laptop_info) {
                 /* Turn off the laptop's screen only if other displays are on.  This is to avoid an all-black-screens scenario. */
                 if (non_laptop_outputs_are_active (config, laptop_info))
@@ -779,16 +789,6 @@ gsd_xrandr_manager_2_rotate_to (GsdXrandrManager *manager,
 }
 
 static gboolean
-is_laptop (GnomeRRScreen *screen, GnomeRROutputInfo *output)
-{
-        GnomeRROutput *rr_output;
-
-        rr_output = gnome_rr_screen_get_output_by_name (screen, gnome_rr_output_info_get_name (output));
-
-        return gnome_rr_output_is_laptop (rr_output);
-}
-
-static gboolean
 get_clone_size (GnomeRRScreen *screen, int *width, int *height)
 {
         GnomeRRMode **modes = gnome_rr_screen_list_clone_modes (screen);
@@ -1892,6 +1892,7 @@ static void
 turn_off_laptop_display (GsdXrandrManager *manager, guint32 timestamp)
 {
         GsdXrandrManagerPrivate *priv = manager->priv;
+        GnomeRRConfig *config;
         
         config = gnome_rr_config_new_current (priv->rw_screen, NULL);