From d04d12e0b5dae3f9c654f6beb3034aa4fc301d49 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 2 Apr 2016 17:08:53 -0400
Subject: [PATCH] Some more renaming

---
 gdk/gdkmonitor.c | 19 ++++++++++++-------
 gdk/gdkmonitor.h |  6 +++---
 gdk/gdkscreen.c  | 10 ++--------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/gdk/gdkmonitor.c b/gdk/gdkmonitor.c
index b7a8a28e1c..5a1ef6c4dc 100644
--- a/gdk/gdkmonitor.c
+++ b/gdk/gdkmonitor.c
@@ -228,15 +228,20 @@ gdk_monitor_get_geometry (GdkMonitor   *monitor,
   *geometry = monitor->geometry;
 }
 
-void
-gdk_monitor_get_physical_size (GdkMonitor *monitor,
-                               int        *width_mm,
-                               int        *height_mm)
+int
+gdk_monitor_get_width_mm (GdkMonitor *monitor)
 {
-  g_return_if_fail (GDK_IS_MONITOR (monitor));
+  g_return_val_if_fail (GDK_IS_MONITOR (monitor), 0);
 
-  *width_mm = monitor->width_mm;
-  *height_mm = monitor->height_mm;
+  return monitor->width_mm;
+}
+
+int
+gdk_monitor_get_height_mm (GdkMonitor *monitor)
+{
+  g_return_val_if_fail (GDK_IS_MONITOR (monitor), 0);
+
+  return monitor->height_mm;
 }
 
 const char *
diff --git a/gdk/gdkmonitor.h b/gdk/gdkmonitor.h
index 5690c98948..e1f8e84c15 100644
--- a/gdk/gdkmonitor.h
+++ b/gdk/gdkmonitor.h
@@ -58,9 +58,9 @@ GDK_AVAILABLE_IN_3_22
 void         gdk_monitor_get_geometry         (GdkMonitor   *monitor,
                                                GdkRectangle *geometry);
 GDK_AVAILABLE_IN_3_22
-void          gdk_monitor_get_physical_size   (GdkMonitor   *monitor,
-                                               int          *width_mm,
-                                               int          *height_mm);
+int          gdk_monitor_get_width_mm         (GdkMonitor   *monitor);
+GDK_AVAILABLE_IN_3_22
+int          gdk_monitor_get_height_mm        (GdkMonitor   *monitor);
 GDK_AVAILABLE_IN_3_22
 const char * gdk_monitor_get_manufacturer     (GdkMonitor   *monitor);
 GDK_AVAILABLE_IN_3_22
diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c
index 9354f7465c..1927734220 100644
--- a/gdk/gdkscreen.c
+++ b/gdk/gdkscreen.c
@@ -768,12 +768,9 @@ gdk_screen_real_get_monitor_width_mm (GdkScreen *screen,
                                       gint       monitor_num)
 {
   GdkMonitor *monitor;
-  int width_mm, height_mm;
 
   monitor = get_monitor (screen, monitor_num);
-  gdk_monitor_get_physical_size (monitor, &width_mm, &height_mm);
-
-  return width_mm;
+  return gdk_monitor_get_width_mm (monitor);
 }
 
 static gint
@@ -781,12 +778,9 @@ gdk_screen_real_get_monitor_height_mm (GdkScreen *screen,
                                        gint       monitor_num)
 {
   GdkMonitor *monitor;
-  int width_mm, height_mm;
 
   monitor = get_monitor (screen, monitor_num);
-  gdk_monitor_get_physical_size (monitor, &width_mm, &height_mm);
-
-  return height_mm;
+  return gdk_monitor_get_height_mm (monitor);
 }
 
 static gchar *