[gtk+/wip/matthiasc/monitor] rename scale to scale_factor

[Matthias Clasen <matthiasc src gnome org>]

commit 544d706e9e748db8e073107803e93a39227d51d6
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Apr 2 14:32:07 2016 -0400

    rename scale to scale_factor

 gdk/gdkmonitor.c                |   29 ++++++++++++++++-------------
 gdk/gdkmonitor.h                |    2 +-
 gdk/gdkmonitorprivate.h         |   24 ++++++++++++------------
 gdk/wayland/gdkscreen-wayland.c |    4 ++--
 4 files changed, 31 insertions(+), 28 deletions(-)
---
diff --git a/gdk/gdkmonitor.c b/gdk/gdkmonitor.c
index 07ca479..71966e9 100644
--- a/gdk/gdkmonitor.c
+++ b/gdk/gdkmonitor.c
@@ -40,7 +40,7 @@ enum {
   PROP_DISPLAY,
   PROP_MANUFACTURER,
   PROP_MODEL,
-  PROP_SCALE,
+  PROP_SCALE_FACTOR,
   PROP_GEOMETRY,
   PROP_WIDTH,
   PROP_HEIGHT,
@@ -54,7 +54,7 @@ G_DEFINE_TYPE (GdkMonitor, gdk_monitor, G_TYPE_OBJECT)
 static void
 gdk_monitor_init (GdkMonitor *monitor)
 {
-  monitor->scale = 1;
+  monitor->scale_factor = 1;
 }
 
 static void
@@ -79,8 +79,8 @@ gdk_monitor_get_property (GObject    *object,
       g_value_set_string (value, monitor->model);
       break;
 
-    case PROP_SCALE:
-      g_value_set_int (value, monitor->scale);
+    case PROP_SCALE_FACTOR:
+      g_value_set_int (value, monitor->scale_factor);
       break;
 
     case PROP_GEOMETRY:
@@ -157,9 +157,9 @@ gdk_monitor_class_init (GdkMonitorClass *class)
                          "The model name",
                          NULL,
                          G_PARAM_READABLE);
-  props[PROP_SCALE] =
-    g_param_spec_int ("scale",
-                      "Scale",
+  props[PROP_SCALE_FACTOR] =
+    g_param_spec_int ("scale-factor",
+                      "Scale factor",
                       "The scale factor",
                       0, G_MAXINT,
                       1,
@@ -234,11 +234,11 @@ gdk_monitor_get_model (GdkMonitor *monitor)
 }
 
 int
-gdk_monitor_get_scale (GdkMonitor *monitor)
+gdk_monitor_get_scale_factor (GdkMonitor *monitor)
 {
   g_return_val_if_fail (GDK_IS_MONITOR (monitor), 0);
 
-  return monitor->scale;
+  return monitor->scale_factor;
 }
 
 GdkMonitor *
@@ -297,10 +297,13 @@ gdk_monitor_set_size (GdkMonitor *monitor,
 }
 
 void
-gdk_monitor_set_scale (GdkMonitor *monitor,
-                       int         scale)
+gdk_monitor_set_scale_factor (GdkMonitor *monitor,
+                              int         scale_factor)
 {
-  monitor->scale = scale;
+  if (monitor->scale_factor == scale_factor)
+    return;
 
-  g_object_notify (G_OBJECT (monitor), "scale");
+  monitor->scale_factor = scale_factor;
+
+  g_object_notify (G_OBJECT (monitor), "scale-factor");
 }
diff --git a/gdk/gdkmonitor.h b/gdk/gdkmonitor.h
index 16a5406..d405dbf 100644
--- a/gdk/gdkmonitor.h
+++ b/gdk/gdkmonitor.h
@@ -57,7 +57,7 @@ const char * gdk_monitor_get_manufacturer     (GdkMonitor   *monitor);
 GDK_AVAILABLE_IN_3_22
 const char * gdk_monitor_get_model            (GdkMonitor   *monitor);
 GDK_AVAILABLE_IN_3_22
-int          gdk_monitor_get_scale            (GdkMonitor   *monitor);
+int          gdk_monitor_get_scale_factor     (GdkMonitor   *monitor);
 
 G_END_DECLS
 
diff --git a/gdk/gdkmonitorprivate.h b/gdk/gdkmonitorprivate.h
index 377649f..95879ce 100644
--- a/gdk/gdkmonitorprivate.h
+++ b/gdk/gdkmonitorprivate.h
@@ -33,7 +33,7 @@ struct _GdkMonitor {
   int height;
   char *manufacturer;
   char *model;
-  int scale;
+  int scale_factor;
 };
 
 struct _GdkMonitorClass {
@@ -42,22 +42,22 @@ struct _GdkMonitorClass {
 
 G_BEGIN_DECLS
 
-GdkMonitor *   gdk_monitor_new                 (GdkDisplay *display);
+GdkMonitor *    gdk_monitor_new                 (GdkDisplay *display);
 
 void            gdk_monitor_set_manufacturer    (GdkMonitor *monitor,
                                                  const char *manufacturer);
 void            gdk_monitor_set_model           (GdkMonitor *monitor,
                                                  const char *model);
-void           gdk_monitor_set_geometry        (GdkMonitor *monitor,
-                                                int         x,
-                                                int         y,
-                                                int         width,
-                                                int         height);
-void           gdk_monitor_set_size            (GdkMonitor *monitor,
-                                                int         width_mm,
-                                                int         height_mm);
-void           gdk_monitor_set_scale           (GdkMonitor *monitor,
-                                                        int         scale);
+void            gdk_monitor_set_geometry        (GdkMonitor *monitor,
+                                                 int         x,
+                                                 int         y,
+                                                 int         width,
+                                                 int         height);
+void            gdk_monitor_set_size            (GdkMonitor *monitor,
+                                                 int         width_mm,
+                                                 int         height_mm);
+void            gdk_monitor_set_scale_factor    (GdkMonitor *monitor,
+                                                 int         scale);
 
 G_END_DECLS
 
diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
index 0fb0e12..62b11c9 100644
--- a/gdk/wayland/gdkscreen-wayland.c
+++ b/gdk/wayland/gdkscreen-wayland.c
@@ -1130,7 +1130,7 @@ output_handle_scale (void             *data,
   GDK_NOTE (MISC,
             g_message ("handle scale output %d, scale %d", monitor->id, scale));
 
-  gdk_monitor_set_scale (GDK_MONITOR (monitor), scale);
+  gdk_monitor_set_scale_factor (GDK_MONITOR (monitor), scale);
 
   if (GDK_MONITOR (monitor)->geometry.width != 0 && monitor->version < OUTPUT_VERSION_WITH_DONE)
     {
@@ -1307,7 +1307,7 @@ _gdk_wayland_screen_get_output_scale (GdkScreen        *screen,
 
   monitor = get_monitor_for_output (screen, output);
   if (monitor != NULL)
-    return gdk_monitor_get_scale (GDK_MONITOR (monitor));
+    return gdk_monitor_get_scale_factor (GDK_MONITOR (monitor));
 
   return 0;
 }