[gnome-control-center/gnome-3-30] display: Compare configurations without monitor offset

[Benjamin Berg <bberg src gnome org>]

commit cfadf0de649447a9324b7905a5afb21d76519ee7
Author: Benjamin Berg <bberg redhat com>
Date:   Tue Jan 22 13:34:22 2019 +0100

    display: Compare configurations without monitor offset
    
    When comparing configurations, the monitor positions are compared
    directly. This comparison will not work properly if one of the
    configurations has an offset.
    
    This results in the "Apply" button to show up incorrectly after moving
    the top/left monitor position.
    
    (cherry picked from commit d9aab366096a55d6f7a8378da7ad00d455e53af1)

 panels/display/cc-display-config-dbus.c | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/panels/display/cc-display-config-dbus.c b/panels/display/cc-display-config-dbus.c
index b74160fdc..efb91b346 100644
--- a/panels/display/cc-display-config-dbus.c
+++ b/panels/display/cc-display-config-dbus.c
@@ -1049,6 +1049,9 @@ cc_display_config_dbus_equal (CcDisplayConfig *pself,
   CcDisplayConfigDBus *other = CC_DISPLAY_CONFIG_DBUS (pother);
   GList *l;
 
+  cc_display_config_dbus_ensure_non_offset_coords (self);
+  cc_display_config_dbus_ensure_non_offset_coords (other);
+
   for (l = self->monitors; l != NULL; l = l->next)
     {
       CcDisplayMonitorDBus *m1 = l->data;