[gtk+/wip/matthiasc/monitor] Fix up arrayification

[Matthias Clasen <matthiasc src gnome org>]

commit b91c27c6f11a45291b1108fb191620efc65f1e2b
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Apr 2 20:09:39 2016 -0400

    Fix up arrayification

 gdk/gdkdisplay.c                |   27 +++++----------------------
 gdk/gdkdisplayprivate.h         |    5 ++---
 gdk/wayland/gdkscreen-wayland.c |    6 +++---
 3 files changed, 10 insertions(+), 28 deletions(-)
---
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index c68579f..f56ad65 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -2503,32 +2503,15 @@ gdk_display_get_primary_monitor (GdkDisplay *display)
 }
 
 void
-gdk_display_add_monitor (GdkDisplay *display,
-                         GdkMonitor *monitor)
+gdk_display_monitor_added (GdkDisplay *display,
+                           GdkMonitor *monitor)
 {
-  g_return_if_fail (GDK_IS_DISPLAY (display));
-  g_return_if_fail (GDK_IS_MONITOR (monitor));
-
-  display->monitors = g_list_append (display->monitors, g_object_ref (monitor));
   g_signal_emit (display, signals[MONITOR_ADDED], 0, monitor);
 }
 
 void
-gdk_display_remove_monitor (GdkDisplay *display,
-                            GdkMonitor *monitor)
+gdk_display_monitor_removed (GdkDisplay *display,
+                             GdkMonitor *monitor)
 {
-  GList *link;
-
-  g_return_if_fail (GDK_IS_DISPLAY (display));
-  g_return_if_fail (GDK_IS_MONITOR (monitor));
-
-  link = g_list_find (display->monitors, monitor);
-
-  if (link)
-    {
-      display->monitors = g_list_remove_link (display->monitors, link);
-      g_signal_emit (display, signals[MONITOR_REMOVED], 0, monitor);
-      g_object_unref (link->data);
-      g_list_free (link);
-    }
+  g_signal_emit (display, signals[MONITOR_REMOVED], 0, monitor);
 }
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index a058368..859938f 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -129,7 +129,6 @@ struct _GdkDisplay
   GdkRenderingMode rendering_mode;
 
   GList *seats;
-  GList *monitors;
 };
 
 struct _GdkDisplayClass
@@ -334,9 +333,9 @@ void                gdk_display_add_seat              (GdkDisplay       *display
                                                        GdkSeat          *seat);
 void                gdk_display_remove_seat           (GdkDisplay       *display,
                                                        GdkSeat          *seat);
-void                gdk_display_add_monitor           (GdkDisplay       *display,
+void                gdk_display_monitor_added         (GdkDisplay       *display,
                                                        GdkMonitor       *monitor);
-void                gdk_display_remove_monitor        (GdkDisplay       *display,
+void                gdk_display_monitor_removed       (GdkDisplay       *display,
                                                        GdkMonitor       *monitor);
 
 G_END_DECLS
diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
index d4297e8..c9f67b7 100644
--- a/gdk/wayland/gdkscreen-wayland.c
+++ b/gdk/wayland/gdkscreen-wayland.c
@@ -1076,7 +1076,7 @@ output_handle_done (void             *data,
     {
       monitor->added = TRUE;
       g_ptr_array_add (screen_wayland->monitors, monitor);
-      gdk_display_add_monitor (display, GDK_MONITOR (monitor));
+      gdk_display_monitor_added (display, GDK_MONITOR (monitor));
     }
 
   g_signal_emit_by_name (screen_wayland, "monitors-changed");
@@ -1158,7 +1158,7 @@ _gdk_wayland_screen_add_output (GdkScreen        *screen,
   if (monitor->version < OUTPUT_VERSION_WITH_DONE)
     {
       g_ptr_array_add (GDK_WAYLAND_SCREEN (screen)->monitors, monitor);
-      gdk_display_add_monitor (display, GDK_MONITOR (monitor));
+      gdk_display_monitor_added (display, GDK_MONITOR (monitor));
     }
 
   wl_output_add_listener (output, &output_listener, monitor);
@@ -1223,7 +1223,7 @@ _gdk_wayland_screen_remove_output (GdkScreen *screen,
     {
       g_object_ref (monitor);
       g_ptr_array_remove (screen_wayland->monitors, monitor);
-      gdk_display_remove_monitor (display, GDK_MONITOR (monitor));
+      gdk_display_monitor_removed (display, GDK_MONITOR (monitor));
       g_object_unref (monitor);
       g_signal_emit_by_name (screen_wayland, "monitors-changed");
       update_screen_size (screen_wayland);