[mutter/gnome-3-12] MetaMonitorConfig: don't always restore the previous config when opening the laptop lid

[Giovanni Campagna <gcampagna src gnome org>]

commit 554be56639a8e49973b496347ffac8a7e5e2d5de
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Tue May 6 19:59:16 2014 +0200

    MetaMonitorConfig: don't always restore the previous config when opening the laptop lid
    
    Only do it if the current configuration was actually created
    as the result of closing the laptop lid.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=725637

 src/core/monitor-config.c |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/src/core/monitor-config.c b/src/core/monitor-config.c
index 0cf0866..9af0c9d 100644
--- a/src/core/monitor-config.c
+++ b/src/core/monitor-config.c
@@ -77,6 +77,7 @@ struct _MetaMonitorConfig {
   GHashTable *configs;
   MetaConfiguration *current;
   gboolean current_is_stored;
+  gboolean current_is_for_laptop_lid;
   MetaConfiguration *previous;
 
   GFile *file;
@@ -905,6 +906,10 @@ apply_configuration (MetaMonitorConfig  *self,
 
   self->current = config;
   self->current_is_stored = stored;
+  /* If true, we'll be overridden at the end of this call
+     inside turn_off_laptop_display()
+  */
+  self->current_is_for_laptop_lid = FALSE;
 
   if (self->current == self->previous)
     self->previous = NULL;
@@ -1021,8 +1026,16 @@ meta_monitor_config_apply_stored (MetaMonitorConfig  *self,
       if (self->lid_is_closed &&
           stored->n_outputs > 1 &&
           laptop_display_is_on (stored))
-        return apply_configuration (self, make_laptop_lid_config (stored),
-                                    manager, FALSE);
+        {
+          if (apply_configuration (self, make_laptop_lid_config (stored),
+                                   manager, FALSE))
+            {
+              self->current_is_for_laptop_lid = TRUE;
+              return TRUE;
+            }
+          else
+            return FALSE;
+        }
       else
         return apply_configuration (self, stored, manager, TRUE);
     }
@@ -1369,6 +1382,7 @@ turn_off_laptop_display (MetaMonitorConfig  *self,
 
   new = make_laptop_lid_config (self->current);
   apply_configuration (self, new, manager, FALSE);
+  self->current_is_for_laptop_lid = TRUE;
 }
 
 static void
@@ -1388,7 +1402,7 @@ power_client_changed_cb (UpClient   *client,
 
       if (is_closed)
         turn_off_laptop_display (self, manager);
-      else
+      else if (self->current_is_for_laptop_lid)
         meta_monitor_config_restore_previous (self, manager);
     }
 }