From 0548c9e7d57751872cf233680621fabdf30d68ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Tue, 14 Feb 2017 18:19:09 +0800
Subject: [PATCH] MetaMonitorConfig: Rename is_underscanning to
 enable_underscanning

Use better terminology to imply that the configuration enables
underscanning, not what already "is".

https://bugzilla.gnome.org/show_bug.cgi?id=777732
---
 src/backends/meta-monitor-config-manager.c | 4 ++--
 src/backends/meta-monitor-config-manager.h | 2 +-
 src/backends/meta-monitor-config-store.c   | 2 +-
 src/tests/monitor-store-unit-tests.c       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c
index 85951c386..6996cd76e 100644
--- a/src/backends/meta-monitor-config-manager.c
+++ b/src/backends/meta-monitor-config-manager.c
@@ -181,7 +181,7 @@ assign_monitor_crtc (MetaMonitor         *monitor,
     .output = output,
     .is_primary = assign_output_as_primary,
     .is_presentation = assign_output_as_presentation,
-    .is_underscanning = data->monitor_config->is_underscanning
+    .is_underscanning = data->monitor_config->enable_underscanning
   };
 
   g_ptr_array_add (data->crtc_infos, crtc_info);
@@ -454,7 +454,7 @@ create_monitor_config (MetaMonitor     *monitor,
   *monitor_config = (MetaMonitorConfig) {
     .monitor_spec = meta_monitor_spec_clone (monitor_spec),
     .mode_spec = g_memdup (mode_spec, sizeof (MetaMonitorModeSpec)),
-    .is_underscanning = meta_monitor_is_underscanning (monitor)
+    .enable_underscanning = meta_monitor_is_underscanning (monitor)
   };
 
   return monitor_config;
diff --git a/src/backends/meta-monitor-config-manager.h b/src/backends/meta-monitor-config-manager.h
index 574aaf931..baa119e0c 100644
--- a/src/backends/meta-monitor-config-manager.h
+++ b/src/backends/meta-monitor-config-manager.h
@@ -33,7 +33,7 @@ typedef struct _MetaMonitorConfig
 {
   MetaMonitorSpec *monitor_spec;
   MetaMonitorModeSpec *mode_spec;
-  gboolean is_underscanning;
+  gboolean enable_underscanning;
 } MetaMonitorConfig;
 
 typedef struct _MetaLogicalMonitorConfig
diff --git a/src/backends/meta-monitor-config-store.c b/src/backends/meta-monitor-config-store.c
index 1785b8f07..44bdce7ea 100644
--- a/src/backends/meta-monitor-config-store.c
+++ b/src/backends/meta-monitor-config-store.c
@@ -761,7 +761,7 @@ handle_text (GMarkupParseContext *context,
     case STATE_MONITOR_UNDERSCANNING:
       {
         read_bool (text, text_len,
-                   &parser->current_monitor_config->is_underscanning,
+                   &parser->current_monitor_config->enable_underscanning,
                    error);
         return;
       }
diff --git a/src/tests/monitor-store-unit-tests.c b/src/tests/monitor-store-unit-tests.c
index 65a1bc87c..37bd22161 100644
--- a/src/tests/monitor-store-unit-tests.c
+++ b/src/tests/monitor-store-unit-tests.c
@@ -184,7 +184,7 @@ check_monitor_configuration (MetaMonitorConfigStore        *config_store,
           g_assert_cmpfloat (monitor_config->mode_spec->refresh_rate,
                              ==,
                              test_monitor->mode.refresh_rate);
-          g_assert_cmpint (monitor_config->is_underscanning,
+          g_assert_cmpint (monitor_config->enable_underscanning,
                            ==,
                            test_monitor->is_underscanning);
         }