GNOME.org
 

[gnome-settings-daemon] xrandr: Remove plugin

commit cbf313e689f5853b85c6f7c08ac233688408c8e8
Author: Rui Matos <tiagomatos gmail com>
Date:   Fri May 5 18:46:45 2017 +0200

    xrandr: Remove plugin
    
    This functionality is moving to mutter and the DBus API is no longer
    used.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=782231

 .gitignore                                         |    2 -
 configure.ac                                       |    6 -
 data/Makefile.am                                   |    1 -
 data/gnome-settings-daemon.convert                 |    3 -
 data/gsd-enums.h                                   |    8 -
 ...gnome.settings-daemon.plugins.gschema.xml.in.in |    1 -
 ...ettings-daemon.plugins.xrandr.gschema.xml.in.in |   14 -
 plugins/Makefile.am                                |    1 -
 plugins/common/daemon-skeleton-gtk.h               |    1 -
 plugins/common/daemon-skeleton.h                   |    1 -
 plugins/xrandr/Makefile.am                         |   66 -
 plugins/xrandr/gsd-xrandr-16.png                   |  Bin 613 -> 0 bytes
 plugins/xrandr/gsd-xrandr-22.png                   |  Bin 866 -> 0 bytes
 plugins/xrandr/gsd-xrandr-24.png                   |  Bin 909 -> 0 bytes
 plugins/xrandr/gsd-xrandr-32.png                   |  Bin 1602 -> 0 bytes
 plugins/xrandr/gsd-xrandr-manager.c                | 1409 --------------------
 plugins/xrandr/gsd-xrandr-manager.h                |   56 -
 plugins/xrandr/gsd-xrandr.svg                      |  470 -------
 plugins/xrandr/main.c                              |    7 -
 .../org.gnome.SettingsDaemon.XRANDR.desktop.in     |    9 -
 po/POTFILES.in                                     |    2 -
 po/POTFILES.skip                                   |    1 -
 22 files changed, 0 insertions(+), 2058 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fcbff60..33cb690 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,8 +114,6 @@ plugins/wacom/gsd-wacom-oled-helper
 plugins/wacom/gsd-wacom-resources.c
 plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy
 plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in
-plugins/xrandr/gsd-test-xrandr
-plugins/xrandr/gsd-xrandr-manager-glue.h
 plugins/xsettings/gsd-test-xsettings
 plugins/xsettings/test-gtk-modules
 plugins/xsettings/test-wm-button-layout-translations
diff --git a/configure.ac b/configure.ac
index f935cc5..258f5ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -244,10 +244,6 @@ PKG_CHECK_MODULES(XSETTINGS,
                  gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
                  x11)
 
-PKG_CHECK_MODULES(XRANDR,
-                 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-                 upower-glib >= $UPOWER_REQUIRED_VERSION)
-
 dnl ---------------------------------------------------------------------------
 dnl - XTest
 dnl ---------------------------------------------------------------------------
@@ -529,7 +525,6 @@ plugins/sharing/Makefile
 plugins/smartcard/Makefile
 plugins/sound/Makefile
 plugins/wacom/Makefile
-plugins/xrandr/Makefile
 plugins/xsettings/Makefile
 data/Makefile
 data/gnome-settings-daemon.pc
@@ -541,7 +536,6 @@ data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
 data/org.gnome.settings-daemon.peripherals.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
 data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in
 po/Makefile.in
 tests/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index b2aee3d..06fd2b3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -15,7 +15,6 @@ gsettings_SCHEMAS =                                                   \
        org.gnome.settings-daemon.plugins.sharing.gschema.xml           \
        org.gnome.settings-daemon.plugins.xsettings.gschema.xml         \
        org.gnome.settings-daemon.plugins.housekeeping.gschema.xml      \
-       org.gnome.settings-daemon.plugins.xrandr.gschema.xml            \
        org.gnome.settings-daemon.peripherals.wacom.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/data/gnome-settings-daemon.convert b/data/gnome-settings-daemon.convert
index fe48e52..8ca4630 100644
--- a/data/gnome-settings-daemon.convert
+++ b/data/gnome-settings-daemon.convert
@@ -34,9 +34,6 @@ locate-pointer = /desktop/gnome/peripherals/mouse/locate_pointer
 double-click = /desktop/gnome/peripherals/mouse/double_click
 drag-threshold = /desktop/gnome/peripherals/mouse/drag_threshold
 
-[org.gnome.settings-daemon.plugins.xrandr]
-default-configuration-file = /apps/gnome_settings_daemon/xrandr/default_configuration_file
-
 [org.gnome.settings-daemon.plugins.xsettings]
 antialiasing = /desktop/gnome/font_rendering/antialiasing
 hinting = /desktop/gnome/font_rendering/hinting
diff --git a/data/gsd-enums.h b/data/gsd-enums.h
index 4a0356a..853caf3 100644
--- a/data/gsd-enums.h
+++ b/data/gsd-enums.h
@@ -77,14 +77,6 @@ typedef enum
 
 typedef enum
 {
-  GSD_XRANDR_BOOT_BEHAVIOUR_DO_NOTHING,
-  GSD_XRANDR_BOOT_BEHAVIOUR_CLONE,
-  GSD_XRANDR_BOOT_BEHAVIOUR_DOCK,
-  GSD_XRANDR_BOOT_BEHAVIOUR_FOLLOW_LID
-} GsdXrandrBootBehaviour;
-
-typedef enum
-{
   GSD_WACOM_ROTATION_NONE,
   GSD_WACOM_ROTATION_CW,
   GSD_WACOM_ROTATION_CCW,
diff --git a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 
b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
index 978648f..020f46e 100644
--- a/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in
@@ -12,7 +12,6 @@
     <child name="housekeeping" schema="org.gnome.settings-daemon.plugins.housekeeping"/>
     <child name="media-keys" schema="org.gnome.settings-daemon.plugins.media-keys"/>
     <child name="power" schema="org.gnome.settings-daemon.plugins.power"/>
-    <child name="xrandr" schema="org.gnome.settings-daemon.plugins.xrandr"/>
     <child name="xsettings" schema="org.gnome.settings-daemon.plugins.xsettings"/>
   </schema>
 </schemalist>
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 63badae..6de38f0 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -15,7 +15,6 @@ enabled_plugins =     \
        screensaver-proxy \
        sharing         \
        sound           \
-       xrandr          \
        xsettings       \
        $(NULL)
 
diff --git a/plugins/common/daemon-skeleton-gtk.h b/plugins/common/daemon-skeleton-gtk.h
index c4290f3..cdf15d8 100644
--- a/plugins/common/daemon-skeleton-gtk.h
+++ b/plugins/common/daemon-skeleton-gtk.h
@@ -48,7 +48,6 @@ static const char *gdm_helpers[] = {
        "power",
        "smartcard",
        "sound",
-       "xrandr",
        "xsettings"
 };
 
diff --git a/plugins/common/daemon-skeleton.h b/plugins/common/daemon-skeleton.h
index f3e7fec..f019774 100644
--- a/plugins/common/daemon-skeleton.h
+++ b/plugins/common/daemon-skeleton.h
@@ -47,7 +47,6 @@ static const char *gdm_helpers[] = {
        "power",
        "smartcard",
        "sound",
-       "xrandr",
        "xsettings"
 };
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6b2a39d..17e740a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,6 @@ data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in.in
-data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in.in
 data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in.in
 plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
 plugins/color/gsd-color-calibrate.c
@@ -31,5 +30,4 @@ plugins/smartcard/gsd-smartcard-manager.c
 plugins/smartcard/gsd-smartcard-service.c
 plugins/wacom/gsd-wacom-manager.c
 plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in.in
-plugins/xrandr/gsd-xrandr-manager.c
 plugins/xsettings/gsd-xsettings-manager.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 886cf0f..1953d5f 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -9,7 +9,6 @@ data/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.power.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.sharing.gschema.xml.in
-data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in
 data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in
 plugins/automount/gnome-fallback-mount-helper.desktop.in
 plugins/power/org.gnome.settings-daemon.plugins.power.policy.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]