[gnome-flashback] display-config: remove FlashbackMonitorConfig

[Alberts Muktupāvels <muktupavels src gnome org>]

commit fbb5838cd950e6450a561fbeb08ab6c10d14aba6
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Sep 21 02:24:04 2017 +0300

    display-config: remove FlashbackMonitorConfig

 gnome-flashback/libdisplay-config/Makefile.am      |    2 -
 .../libdisplay-config/flashback-display-config.c   |    1 -
 .../libdisplay-config/flashback-monitor-config.c   | 2099 --------------------
 .../libdisplay-config/flashback-monitor-config.h   |   50 -
 .../libdisplay-config/flashback-monitor-manager.c  |   40 -
 .../libdisplay-config/flashback-monitor-manager.h  |   12 -
 6 files changed, 0 insertions(+), 2204 deletions(-)
---
diff --git a/gnome-flashback/libdisplay-config/Makefile.am b/gnome-flashback/libdisplay-config/Makefile.am
index 8f2fed5..6833bfe 100644
--- a/gnome-flashback/libdisplay-config/Makefile.am
+++ b/gnome-flashback/libdisplay-config/Makefile.am
@@ -24,8 +24,6 @@ libdisplay_config_la_SOURCES = \
        flashback-confirm-dialog.h \
        flashback-display-config.c \
        flashback-display-config.h \
-       flashback-monitor-config.c \
-       flashback-monitor-config.h \
        flashback-monitor-manager.c \
        flashback-monitor-manager.h \
        $(NULL)
diff --git a/gnome-flashback/libdisplay-config/flashback-display-config.c 
b/gnome-flashback/libdisplay-config/flashback-display-config.c
index 4cff8c5..60db776 100644
--- a/gnome-flashback/libdisplay-config/flashback-display-config.c
+++ b/gnome-flashback/libdisplay-config/flashback-display-config.c
@@ -31,7 +31,6 @@
 #include <math.h>
 #include "flashback-confirm-dialog.h"
 #include "flashback-display-config.h"
-#include "flashback-monitor-config.h"
 #include "flashback-monitor-manager.h"
 
 struct _FlashbackDisplayConfig
diff --git a/gnome-flashback/libdisplay-config/flashback-monitor-manager.c 
b/gnome-flashback/libdisplay-config/flashback-monitor-manager.c
index 82b80bd..9fef49e 100644
--- a/gnome-flashback/libdisplay-config/flashback-monitor-manager.c
+++ b/gnome-flashback/libdisplay-config/flashback-monitor-manager.c
@@ -37,7 +37,6 @@
 #include <X11/Xlib-xcb.h>
 #include <xcb/randr.h>
 #include "edid.h"
-#include "flashback-monitor-config.h"
 #include "flashback-monitor-manager.h"
 
 #define ALL_TRANSFORMS ((1 << (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)) - 1)
@@ -1501,13 +1500,8 @@ flashback_monitor_manager_constructed (GObject *object)
 
   manager->in_init = TRUE;
 
-  manager->monitor_config = flashback_monitor_config_new (manager);
-
   flashback_monitor_manager_read_current_config (manager);
 
-  if (!flashback_monitor_config_apply_stored (manager->monitor_config))
-    flashback_monitor_config_make_default (manager->monitor_config);
-
   /* Under XRandR, we don't rebuild our data structures until we see
      the RRScreenNotify event, but at least at startup we want to have
      the right configuration immediately.
@@ -1879,25 +1873,6 @@ flashback_monitor_manager_apply_configuration (FlashbackMonitorManager  *manager
 }
 
 void
-flashback_monitor_manager_confirm_configuration (FlashbackMonitorManager *manager,
-                                                 gboolean                 ok)
-{
-  if (!manager->persistent_timeout_id)
-    {
-      /* too late */
-      return;
-    }
-
-  g_source_remove (manager->persistent_timeout_id);
-  manager->persistent_timeout_id = 0;
-
-  if (ok)
-    flashback_monitor_config_make_persistent (manager->monitor_config);
-  else
-    flashback_monitor_config_restore_previous (manager->monitor_config);
-}
-
-void
 flashback_monitor_manager_change_backlight (FlashbackMonitorManager *manager,
                                                                          MetaOutput              *output,
                                                                          gint                     value)
@@ -2075,21 +2050,6 @@ meta_output_parse_edid (MetaOutput *meta_output,
 void
 flashback_monitor_manager_on_hotplug (FlashbackMonitorManager *manager)
 {
-  gboolean applied_config = FALSE;
-
-  /* If the monitor has hotplug_mode_update (which is used by VMs), don't bother
-   * applying our stored configuration, because it's likely the user just resizing
-   * the window.
-   */
-  if (!flashback_monitor_manager_has_hotplug_mode_update (manager))
-    {
-      if (flashback_monitor_config_apply_stored (manager->monitor_config))
-        applied_config = TRUE;
-    }
-
-  /* If we haven't applied any configuration, apply the default configuration. */
-  if (!applied_config)
-    flashback_monitor_config_make_default (manager->monitor_config);
 }
 
 gboolean
diff --git a/gnome-flashback/libdisplay-config/flashback-monitor-manager.h 
b/gnome-flashback/libdisplay-config/flashback-monitor-manager.h
index e9bbc0d..92c2895 100644
--- a/gnome-flashback/libdisplay-config/flashback-monitor-manager.h
+++ b/gnome-flashback/libdisplay-config/flashback-monitor-manager.h
@@ -32,8 +32,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _FlashbackMonitorConfig FlashbackMonitorConfig;
-
 typedef struct _MetaCRTC        MetaCRTC;
 typedef struct _MetaOutput      MetaOutput;
 typedef struct _MetaMonitorMode MetaMonitorMode;
@@ -280,9 +278,6 @@ struct _FlashbackMonitorManager
   unsigned int                    n_monitor_infos;
   int                             primary_monitor_index;
 
-  int                             persistent_timeout_id;
-  FlashbackMonitorConfig         *monitor_config;
-
   GnomePnpIds                    *pnp_ids;
 
   FlashbackMonitorManagerPrivate *priv;
@@ -296,9 +291,6 @@ void                     flashback_monitor_manager_apply_configuration     (Flas
                                                                             MetaOutputInfo          
**outputs,
                                                                             unsigned int              
n_outputs);
 
-void                     flashback_monitor_manager_confirm_configuration   (FlashbackMonitorManager  
*manager,
-                                                                            gboolean                  ok);
-
 void                     flashback_monitor_manager_change_backlight        (FlashbackMonitorManager  
*manager,
                                                                             MetaOutput               *output,
                                                                             gint                      value);
@@ -325,10 +317,6 @@ void                     flashback_monitor_manager_set_power_save_mode     (Flas
 void                     meta_output_parse_edid                            (MetaOutput               *output,
                                                                             GBytes                   *edid);
 
-void                     meta_crtc_info_free                               (MetaCRTCInfo             *info);
-void                     meta_output_info_free                             (MetaOutputInfo           *info);
-
-gboolean                 flashback_monitor_manager_has_hotplug_mode_update (FlashbackMonitorManager  
*manager);
 void                     flashback_monitor_manager_read_current_config     (FlashbackMonitorManager  
*manager);
 void                     flashback_monitor_manager_on_hotplug              (FlashbackMonitorManager  
*manager);