summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-10-25 00:39:57 +0200
committerStefano Karapetsas <[email protected]>2012-10-25 00:39:57 +0200
commite225cba670719af7573bf8f04a57393a0764569a (patch)
treed06120a49c17fc473547e588c5e55f776de5f019
parent3bb2d6c2e4c434cd7852eddfac5256ad807f4da4 (diff)
downloadmate-control-center-e225cba670719af7573bf8f04a57393a0764569a.tar.bz2
mate-control-center-e225cba670719af7573bf8f04a57393a0764569a.tar.xz
update NEWS
-rw-r--r--NEWS2
-rw-r--r--capplets/Makefile.am5
2 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index e07cb83a..e85a2888 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
1.5.0
* Migration to gsettings.
- * Keyboard and keybindings capplets are disabled (not yet migrated).
+ * Keybindings capplet is disabled (not yet migrated).
* Appearance capplet: increased minimum dialog size.
* Network capplet: use proxy settings from gsettings-desktop-schemas
pagkage (http://download.gnome.org/sources/gsettings-desktop-schemas).
diff --git a/capplets/Makefile.am b/capplets/Makefile.am
index 9b3c70ea..4a0105a4 100644
--- a/capplets/Makefile.am
+++ b/capplets/Makefile.am
@@ -4,12 +4,15 @@ SUBDIRS = \
appearance \
default-applications \
display \
- keybindings \
keyboard \
mouse \
network \
windows
+# Enable these applets when migrated to gsettings
+GSETTINS_DISABLED_SUBDIRS = \
+ keybindings
+
DIST_SUBDIRS = \
common \
accessibility \