diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-04-01 10:24:10 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-04-01 10:24:34 -0400 |
| commit | 899d4d84772c3cf5e4458923ce03d4d95837f2ac (patch) | |
| tree | b6bac9a0305a4d5ff1add76ba12e8260c6ce40b4 | |
| parent | f1c7063ee77b3a8b508c34d8a079e68456fb544c (diff) | |
| download | mutter-899d4d84772c3cf5e4458923ce03d4d95837f2ac.tar.gz | |
monitor-manager: Move default get_edid_file / read_edid to base class
These are also used by the native manager.
| -rw-r--r-- | src/backends/meta-monitor-manager-dummy.c | 16 | ||||
| -rw-r--r-- | src/backends/meta-monitor-manager.c | 17 |
2 files changed, 17 insertions, 16 deletions
diff --git a/src/backends/meta-monitor-manager-dummy.c b/src/backends/meta-monitor-manager-dummy.c index cf74d9d7b..46cea9396 100644 --- a/src/backends/meta-monitor-manager-dummy.c +++ b/src/backends/meta-monitor-manager-dummy.c @@ -212,20 +212,6 @@ meta_monitor_manager_dummy_apply_config (MetaMonitorManager *manager, meta_monitor_manager_rebuild_derived (manager); } -static GBytes * -meta_monitor_manager_dummy_read_edid (MetaMonitorManager *manager, - MetaOutput *output) -{ - return NULL; -} - -static char * -meta_monitor_manager_dummy_get_edid_file (MetaMonitorManager *manager, - MetaOutput *output) -{ - return NULL; -} - static void meta_monitor_manager_dummy_class_init (MetaMonitorManagerDummyClass *klass) { @@ -233,8 +219,6 @@ meta_monitor_manager_dummy_class_init (MetaMonitorManagerDummyClass *klass) manager_class->read_current = meta_monitor_manager_dummy_read_current; manager_class->apply_configuration = meta_monitor_manager_dummy_apply_config; - manager_class->get_edid_file = meta_monitor_manager_dummy_get_edid_file; - manager_class->read_edid = meta_monitor_manager_dummy_read_edid; } static void diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c index c8a640ee3..3e0a238d3 100644 --- a/src/backends/meta-monitor-manager.c +++ b/src/backends/meta-monitor-manager.c @@ -389,6 +389,20 @@ meta_monitor_manager_get_property (GObject *object, } } +static GBytes * +meta_monitor_manager_real_read_edid (MetaMonitorManager *manager, + MetaOutput *output) +{ + return NULL; +} + +static char * +meta_monitor_manager_real_get_edid_file (MetaMonitorManager *manager, + MetaOutput *output) +{ + return NULL; +} + static void meta_monitor_manager_class_init (MetaMonitorManagerClass *klass) { @@ -400,6 +414,9 @@ meta_monitor_manager_class_init (MetaMonitorManagerClass *klass) object_class->dispose = meta_monitor_manager_dispose; object_class->finalize = meta_monitor_manager_finalize; + klass->get_edid_file = meta_monitor_manager_real_get_edid_file; + klass->read_edid = meta_monitor_manager_real_read_edid; + signals[CONFIRM_DISPLAY_CHANGE] = g_signal_new ("confirm-display-change", G_TYPE_FROM_CLASS (object_class), |