[gsettings-desktop-schemas/gnome-3-2] Revert "schemas: Add (shared) wm schemas"



commit 003b418c1f9c2c6ff95549c4e586acf2d3fcd6b0
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Jan 30 14:35:28 2012 +0000

    Revert "schemas: Add (shared) wm schemas"
    
    This reverts commit 99cbaf394b520f5b2c23daf892dac2db9035d711.

 configure.ac                                       |    3 -
 headers/gdesktop-enums.h                           |   32 --
 schemas/Makefile.am                                |    6 +-
 ....gnome.desktop.wm.keybindings.gschema.xml.in.in |  304 --------------------
 ....gnome.desktop.wm.preferences.gschema.xml.in.in |  298 -------------------
 schemas/wm-schemas.convert                         |  100 -------
 6 files changed, 2 insertions(+), 741 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c061a77..4e3193b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,6 @@ AM_MAINTAINER_MODE([enable])
 
 AC_PROG_SED
 
-GIO_MIN_VERSION=[2.31.0]
-PKG_CHECK_EXISTS([gio-2.0 >= $GIO_MIN_VERSION],[],
-                 [AC_MSG_ERROR([Minimum Gio requirement ($GIO_MIN_VERSION) was not met])])
 GLIB_GSETTINGS
 
 GOBJECT_INTROSPECTION_CHECK([1.30.0])
diff --git a/headers/gdesktop-enums.h b/headers/gdesktop-enums.h
index 369b9a6..a762836 100644
--- a/headers/gdesktop-enums.h
+++ b/headers/gdesktop-enums.h
@@ -107,36 +107,4 @@ typedef enum
   G_DESKTOP_MAGNIFIER_SCREEN_POSITION_RIGHT_HALF,
 } GDesktopMagnifierScreenPosition;
 
-typedef enum
-{
-  G_DESKTOP_TITLEBAR_ACTION_TOGGLE_SHADE,
-  G_DESKTOP_TITLEBAR_ACTION_TOGGLE_MAXIMIZE,
-  G_DESKTOP_TITLEBAR_ACTION_TOGGLE_MAXIMIZE_HORIZONTALLY,
-  G_DESKTOP_TITLEBAR_ACTION_TOGGLE_MAXIMIZE_VERTICALLY,
-  G_DESKTOP_TITLEBAR_ACTION_MINIMIZE,
-  G_DESKTOP_TITLEBAR_ACTION_NONE,
-  G_DESKTOP_TITLEBAR_ACTION_LOWER,
-  G_DESKTOP_TITLEBAR_ACTION_MENU,
-} GDesktopTitlebarAction;
-
-typedef enum
-{
-  G_DESKTOP_FOCUS_MODE_CLICK,
-  G_DESKTOP_FOCUS_MODE_SLOPPY,
-  G_DESKTOP_FOCUS_MODE_MOUSE,
-} GDesktopFocusMode;
-
-typedef enum
-{
-  G_DESKTOP_FOCUS_NEW_WINDOWS_SMART,
-  G_DESKTOP_FOCUS_NEW_WINDOWS_STRICT,
-} GDesktopFocusNewWindows;
-
-typedef enum
-{
-  G_DESKTOP_VISUAL_BELL_NONE,
-  G_DESKTOP_VISUAL_BELL_FULLSCREEN_FLASH,
-  G_DESKTOP_VISUAL_BELL_FRAME_FLASH,
-} GDesktopVisualBellType;
-
 #endif /* __gdesktop_enums_h__ */
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index a8a6cdb..3e91f37 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -14,9 +14,7 @@ desktop_gschemas_in_in =						\
 	org.gnome.desktop.session.gschema.xml.in.in			\
 	org.gnome.desktop.background.gschema.xml.in.in			\
 	org.gnome.desktop.media-handling.gschema.xml.in.in		\
-	org.gnome.desktop.screensaver.gschema.xml.in.in			\
-	org.gnome.desktop.wm.keybindings.gschema.xml.in.in		\
-	org.gnome.desktop.wm.preferences.gschema.xml.in.in
+	org.gnome.desktop.screensaver.gschema.xml.in.in
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
@@ -32,7 +30,7 @@ gsettings_SCHEMAS = $(desktop_gschemas_in:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 convertdir=$(datadir)/GConf/gsettings
-convert_DATA=gsettings-desktop-schemas.convert wm-schemas.convert
+convert_DATA=gsettings-desktop-schemas.convert
 
 EXTRA_DIST =				\
 	$(desktop_gschemas_in_in)	\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]