[gnome-flashback] display-config: remove
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] display-config: remove
- Date: Fri, 29 Sep 2017 11:33:33 +0000 (UTC)
commit 2de6fbfe455719922836e0ec048aa335bd3da41b
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Sep 29 14:27:04 2017 +0300
display-config: remove
configure.ac | 13 -
data/schemas/org.gnome.gnome-flashback.gschema.xml | 6 -
gnome-flashback/Makefile.am | 2 -
gnome-flashback/gf-application.c | 4 -
gnome-flashback/libdisplay-config/Makefile.am | 38 -
gnome-flashback/libdisplay-config/edid-parse.c | 542 -----
gnome-flashback/libdisplay-config/edid.h | 191 --
.../libdisplay-config/flashback-display-config.c | 91 -
.../libdisplay-config/flashback-display-config.h | 38 -
.../libdisplay-config/flashback-monitor-manager.c | 2169 --------------------
.../libdisplay-config/flashback-monitor-manager.h | 349 ----
.../libdisplay-config/meta-display-config-shared.h | 37 -
.../libshell/flashback-monitor-labeler.c | 1 -
gnome-flashback/libshell/flashback-shell.c | 1 -
14 files changed, 0 insertions(+), 3482 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3535a7f..288a23a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,18 +140,6 @@ PKG_CHECK_MODULES([DESKTOP_BACKGROUND], [
gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
])
-PKG_CHECK_MODULES([DISPLAY_CONFIG], [
- gtk+-3.0 >= $GTK_REQUIRED
- glib-2.0 >= $GLIB_REQUIRED
- gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
- upower-glib >= $UPOWER_GLIB_REQUIRED
- x11
- xext
- xrandr
- x11-xcb
- xcb-randr
-])
-
PKG_CHECK_MODULES([END_SESSION_DIALOG], [
gtk+-3.0 >= $GTK_REQUIRED
])
@@ -293,7 +281,6 @@ AC_CONFIG_FILES([
gnome-flashback/libbluetooth-applet/Makefile
gnome-flashback/libcommon/Makefile
gnome-flashback/libdesktop-background/Makefile
- gnome-flashback/libdisplay-config/Makefile
gnome-flashback/libend-session-dialog/Makefile
gnome-flashback/libidle-monitor/Makefile
gnome-flashback/libinput-settings/Makefile
diff --git a/data/schemas/org.gnome.gnome-flashback.gschema.xml
b/data/schemas/org.gnome.gnome-flashback.gschema.xml
index 9f5b51e..79d115b 100644
--- a/data/schemas/org.gnome.gnome-flashback.gschema.xml
+++ b/data/schemas/org.gnome.gnome-flashback.gschema.xml
@@ -24,12 +24,6 @@
<description>If set to true, then GNOME Flashback application will be used to draw the desktop
background.</description>
</key>
- <key name="display-config" type="b">
- <default>true</default>
- <summary>Display configuration</summary>
- <description>If set to true, then GNOME Flashback application will be used to provide the display
configuration.</description>
- </key>
-
<key name="end-session-dialog" type="b">
<default>true</default>
<summary>End session dialog</summary>
diff --git a/gnome-flashback/Makefile.am b/gnome-flashback/Makefile.am
index f3abfd4..580c131 100644
--- a/gnome-flashback/Makefile.am
+++ b/gnome-flashback/Makefile.am
@@ -6,7 +6,6 @@ SUBDIRS = \
libbluetooth-applet \
libcommon \
libdesktop-background \
- libdisplay-config \
libend-session-dialog \
libidle-monitor \
libinput-settings \
@@ -65,7 +64,6 @@ gnome_flashback_LDADD = \
$(top_builddir)/gnome-flashback/libautomount-manager/libautomount-manager.la \
$(top_builddir)/gnome-flashback/libbluetooth-applet/libbluetooth-applet.la \
$(top_builddir)/gnome-flashback/libdesktop-background/libdesktop-background.la \
- $(top_builddir)/gnome-flashback/libdisplay-config/libdisplay-config.la \
$(top_builddir)/gnome-flashback/libend-session-dialog/libend-session-dialog.la \
$(top_builddir)/gnome-flashback/libidle-monitor/libidle-monitor.la \
$(top_builddir)/gnome-flashback/libinput-settings/libinput-settings.la \
diff --git a/gnome-flashback/gf-application.c b/gnome-flashback/gf-application.c
index 4adcb04..51d841b 100644
--- a/gnome-flashback/gf-application.c
+++ b/gnome-flashback/gf-application.c
@@ -27,7 +27,6 @@
#include "libautomount-manager/gsd-automount-manager.h"
#include "libbluetooth-applet/gf-bluetooth-applet.h"
#include "libdesktop-background/gf-desktop-background.h"
-#include "libdisplay-config/flashback-display-config.h"
#include "libend-session-dialog/gf-end-session-dialog.h"
#include "libidle-monitor/flashback-idle-monitor.h"
#include "libinput-settings/gf-input-settings.h"
@@ -56,7 +55,6 @@ struct _GfApplication
GtkStyleProvider *provider;
GsdAutomountManager *automount;
- FlashbackDisplayConfig *config;
FlashbackIdleMonitor *idle_monitor;
FlashbackPolkit *polkit;
FlashbackShell *shell;
@@ -156,7 +154,6 @@ settings_changed (GSettings *settings,
}
SETTING_CHANGED (automount, "automount-manager", gsd_automount_manager_new)
- SETTING_CHANGED (config, "display-config", flashback_display_config_new)
SETTING_CHANGED (idle_monitor, "idle-monitor", flashback_idle_monitor_new)
SETTING_CHANGED (polkit, "polkit", flashback_polkit_new)
SETTING_CHANGED (shell, "shell", flashback_shell_new)
@@ -203,7 +200,6 @@ gf_application_dispose (GObject *object)
g_clear_object (&application->provider);
g_clear_object (&application->automount);
- g_clear_object (&application->config);
g_clear_object (&application->idle_monitor);
g_clear_object (&application->polkit);
g_clear_object (&application->shell);
diff --git a/gnome-flashback/libshell/flashback-monitor-labeler.c
b/gnome-flashback/libshell/flashback-monitor-labeler.c
index 78aaf66..b21cf2c 100644
--- a/gnome-flashback/libshell/flashback-monitor-labeler.c
+++ b/gnome-flashback/libshell/flashback-monitor-labeler.c
@@ -17,7 +17,6 @@
#include <config.h>
#include <gio/gio.h>
-#include <libdisplay-config/flashback-monitor-manager.h>
#include "flashback-monitor-labeler.h"
#include "gf-label-window.h"
diff --git a/gnome-flashback/libshell/flashback-shell.c b/gnome-flashback/libshell/flashback-shell.c
index 81b3abf..47136fb 100644
--- a/gnome-flashback/libshell/flashback-shell.c
+++ b/gnome-flashback/libshell/flashback-shell.c
@@ -18,7 +18,6 @@
#include <config.h>
#include <gtk/gtk.h>
#include <libcommon/gf-keybindings.h>
-#include <libdisplay-config/flashback-display-config.h>
#include "flashback-dbus-shell.h"
#include "flashback-monitor-labeler.h"
#include "flashback-osd.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]