summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac27
-rw-r--r--icons/Makefile.am64
-rw-r--r--icons/hicolor_apps_16x16_mate.pngbin0 -> 774 bytes
-rw-r--r--icons/hicolor_apps_22x22_mate.pngbin0 -> 1323 bytes
-rw-r--r--icons/hicolor_apps_24x24_mate.pngbin0 -> 1511 bytes
-rw-r--r--icons/hicolor_apps_256x256_mate.pngbin0 -> 31357 bytes
-rw-r--r--icons/hicolor_apps_32x32_mate.pngbin0 -> 2180 bytes
-rw-r--r--icons/hicolor_apps_48x48_mate.pngbin0 -> 4164 bytes
-rw-r--r--icons/hicolor_apps_scalable_mate-symbolic.svg24
-rw-r--r--icons/mate.svg178
-rw-r--r--mate-about/mate-about.c14
-rw-r--r--mate-about/mate-about.h1
-rw-r--r--po/POTFILES.in34
-rw-r--r--schemas/Makefile.am45
-rw-r--r--schemas/mate-desktop.convert1
-rw-r--r--schemas/org.mate.accessibility-keyboard.gschema.xml.in (renamed from schemas/org.mate.accessibility-keyboard.gschema.xml.in.in)24
-rw-r--r--schemas/org.mate.accessibility-startup.gschema.xml.in (renamed from schemas/org.mate.accessibility-startup.gschema.xml.in.in)4
-rw-r--r--schemas/org.mate.applications-at-mobility.gschema.xml.in14
-rw-r--r--schemas/org.mate.applications-at-mobility.gschema.xml.in.in14
-rw-r--r--schemas/org.mate.applications-at-visual.gschema.xml.in14
-rw-r--r--schemas/org.mate.applications-at-visual.gschema.xml.in.in14
-rw-r--r--schemas/org.mate.applications-browser.gschema.xml.in (renamed from schemas/org.mate.applications-browser.gschema.xml.in.in)12
-rw-r--r--schemas/org.mate.applications-office.gschema.xml.in (renamed from schemas/org.mate.applications-office.gschema.xml.in.in)16
-rw-r--r--schemas/org.mate.applications-terminal.gschema.xml.in (renamed from schemas/org.mate.applications-terminal.gschema.xml.in.in)8
-rw-r--r--schemas/org.mate.background.gschema.xml.in (renamed from schemas/org.mate.background.gschema.xml.in.in)36
-rw-r--r--schemas/org.mate.debug.gschema.xml.in (renamed from schemas/org.mate.debug.gschema.xml.in.in)0
-rw-r--r--schemas/org.mate.file-views.gschema.xml.in (renamed from schemas/org.mate.file-views.gschema.xml.in.in)4
-rw-r--r--schemas/org.mate.interface.gschema.xml.in169
-rw-r--r--schemas/org.mate.interface.gschema.xml.in.in169
-rw-r--r--schemas/org.mate.lockdown.gschema.xml.in49
-rw-r--r--schemas/org.mate.lockdown.gschema.xml.in.in49
-rw-r--r--schemas/org.mate.peripherals-keyboard.gschema.xml.in (renamed from schemas/org.mate.peripherals-keyboard.gschema.xml.in.in)14
-rw-r--r--schemas/org.mate.peripherals-mouse.gschema.xml.in54
-rw-r--r--schemas/org.mate.peripherals-mouse.gschema.xml.in.in59
-rw-r--r--schemas/org.mate.sound.gschema.xml.in34
-rw-r--r--schemas/org.mate.sound.gschema.xml.in.in34
-rw-r--r--schemas/org.mate.thumbnail-cache.gschema.xml.in (renamed from schemas/org.mate.thumbnail-cache.gschema.xml.in.in)4
-rw-r--r--schemas/org.mate.thumbnailers.gschema.xml.in14
-rw-r--r--schemas/org.mate.thumbnailers.gschema.xml.in.in14
-rw-r--r--schemas/org.mate.typing-break.gschema.xml.in24
-rw-r--r--schemas/org.mate.typing-break.gschema.xml.in.in24
-rw-r--r--tools/mate-color-select.c1
-rw-r--r--tools/mate-color-select.desktop.in.in2
44 files changed, 767 insertions, 497 deletions
diff --git a/Makefile.am b/Makefile.am
index 4bd3872..79a7504 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libmate-desktop man docs po schemas tools
+SUBDIRS = libmate-desktop man docs po schemas tools icons
if MATE_ABOUT_ENABLED
SUBDIRS += mate-about
diff --git a/configure.ac b/configure.ac
index 16bda37..89bb457 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,13 @@ AC_SUBST(LT_VERSION)
AM_MAINTAINER_MODE
-IT_PROG_INTLTOOL([0.40.0])
+# GLib min/max required versions
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36],
+ [Warn on use of APIs added after GLib 2.36])
+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36],
+ [Warn on use of APIs deprecated before GLib 2.36])
+
+IT_PROG_INTLTOOL([0.50.1])
AC_PROG_CC
AC_STDC_HEADERS
@@ -295,10 +301,29 @@ docs/reference/mate-desktop/Makefile
mate-version.xml.in
po/Makefile.in
schemas/Makefile
+schemas/org.mate.accessibility-keyboard.gschema.xml
+schemas/org.mate.accessibility-startup.gschema.xml
+schemas/org.mate.applications-at-mobility.gschema.xml
+schemas/org.mate.applications-at-visual.gschema.xml
+schemas/org.mate.applications-browser.gschema.xml
+schemas/org.mate.applications-office.gschema.xml
+schemas/org.mate.applications-terminal.gschema.xml
+schemas/org.mate.background.gschema.xml
+schemas/org.mate.debug.gschema.xml
+schemas/org.mate.file-views.gschema.xml
+schemas/org.mate.interface.gschema.xml
+schemas/org.mate.lockdown.gschema.xml
+schemas/org.mate.peripherals-keyboard.gschema.xml
+schemas/org.mate.peripherals-mouse.gschema.xml
+schemas/org.mate.sound.gschema.xml
+schemas/org.mate.thumbnail-cache.gschema.xml
+schemas/org.mate.thumbnailers.gschema.xml
+schemas/org.mate.typing-break.gschema.xml
man/Makefile
tools/mate-color-select.desktop.in
tools/mate-conf-import.desktop.in
tools/Makefile
+icons/Makefile
])
AC_OUTPUT
diff --git a/icons/Makefile.am b/icons/Makefile.am
new file mode 100644
index 0000000..0db7ca0
--- /dev/null
+++ b/icons/Makefile.am
@@ -0,0 +1,64 @@
+NULL =
+
+public_icons_themes = \
+ hicolor \
+ $(NULL)
+
+public_icons = \
+ hicolor_apps_16x16_mate.png \
+ hicolor_apps_22x22_mate.png \
+ hicolor_apps_24x24_mate.png \
+ hicolor_apps_32x32_mate.png \
+ hicolor_apps_48x48_mate.png \
+ hicolor_apps_256x256_mate.png \
+ hicolor_apps_scalable_mate-symbolic.svg \
+ $(NULL)
+
+noinst_DATA = \
+ mate.svg \
+ $(NULL)
+
+EXTRA_DIST = \
+ $(public_icons) \
+ $(noinst_DATA) \
+ $(NULL)
+
+###############################################################################
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
+
+update-icon-cache:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ for theme in $(public_icons_themes); do \
+ $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+ done; \
+ else \
+ echo "*** Icon cache not updated. After (un)install, run this:"; \
+ for theme in $(public_icons_themes); do \
+ echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+ done; \
+ fi
+
+install-icons:
+ for icon in $(public_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done
+
+uninstall-icons:
+ -for icon in $(public_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done
+
+install-data-local: install-icons update-icon-cache
+
+uninstall-local: uninstall-icons update-icon-cache
diff --git a/icons/hicolor_apps_16x16_mate.png b/icons/hicolor_apps_16x16_mate.png
new file mode 100644
index 0000000..0a34149
--- /dev/null
+++ b/icons/hicolor_apps_16x16_mate.png
Binary files differ
diff --git a/icons/hicolor_apps_22x22_mate.png b/icons/hicolor_apps_22x22_mate.png
new file mode 100644
index 0000000..1fd92a8
--- /dev/null
+++ b/icons/hicolor_apps_22x22_mate.png
Binary files differ
diff --git a/icons/hicolor_apps_24x24_mate.png b/icons/hicolor_apps_24x24_mate.png
new file mode 100644
index 0000000..2065bea
--- /dev/null
+++ b/icons/hicolor_apps_24x24_mate.png
Binary files differ
diff --git a/icons/hicolor_apps_256x256_mate.png b/icons/hicolor_apps_256x256_mate.png
new file mode 100644
index 0000000..9708cdd
--- /dev/null
+++ b/icons/hicolor_apps_256x256_mate.png
Binary files differ
diff --git a/icons/hicolor_apps_32x32_mate.png b/icons/hicolor_apps_32x32_mate.png
new file mode 100644
index 0000000..2a6a192
--- /dev/null
+++ b/icons/hicolor_apps_32x32_mate.png
Binary files differ
diff --git a/icons/hicolor_apps_48x48_mate.png b/icons/hicolor_apps_48x48_mate.png
new file mode 100644
index 0000000..d00c802
--- /dev/null
+++ b/icons/hicolor_apps_48x48_mate.png
Binary files differ
diff --git a/icons/hicolor_apps_scalable_mate-symbolic.svg b/icons/hicolor_apps_scalable_mate-symbolic.svg
new file mode 100644
index 0000000..776a8dd
--- /dev/null
+++ b/icons/hicolor_apps_scalable_mate-symbolic.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg2" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata7">
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g id="layer2" display="none" transform="translate(0,-6)">
+ <rect id="rect4898" fill-rule="nonzero" height="22" width="22" y="0" x="0" fill="#333"/>
+ </g>
+ <g id="layer3" display="none" transform="translate(0,-6)">
+ <rect id="rect4126" fill-rule="nonzero" height="22" width="22" y="0" x="0" fill="#efebe7"/>
+ </g>
+ <g id="layer1" transform="matrix(1.0319689,0,0,1.0563566,-0.69397664,-6.778957)" stroke-miterlimit="4" stroke-width="0" fill="#bebebe">
+ <path id="path5070" fill-rule="evenodd" d="m1.6415,10.204,6.7832,3.7866-6.7832,3.7866z"/>
+ <path id="path5067" d="m15.208,13.991c0-3.658-3.131-6.6271-6.7834-6.6271-2.109,0-4.1361,1.0094-5.348,2.5503l0.85177,0.47616c1.034-1.2658,2.7359-2.0798,4.4963-2.0798,3.1115-1E-7,5.8141,2.5683,5.8141,5.6799,0,3.1115-2.7025,5.6799-5.8141,5.6799-1.7553,0-3.5475-0.92376-4.5815-2.183l-0.84886,0.47427c1.2122,1.5345,3.3264,2.6554,5.4304,2.6554,3.6524,0,6.7832-2.9686,6.7832-6.6266z"/>
+ <path id="path5648" d="m12.301,13.99c0-2.2361-1.64-3.7866-3.8761-3.7866-1.1905,0-2.0368,0.32699-2.7782,1.1454l0.8789,0.49036c0.55229-0.54547,1.065-0.68916,1.8993-0.68916,1.6896,0,2.9071,1.1392,2.9071,2.84s-1.2175,2.84-2.9071,2.84c-0.84982,0-1.4491-0.21841-2.0039-0.78193l-0.86824,0.48468c0.74137,0.81851,1.6817,1.2439,2.8722,1.2439,2.2361,0,3.8761-1.5505,3.8761-3.7866z"/>
+ </g>
+</svg>
diff --git a/icons/mate.svg b/icons/mate.svg
new file mode 100644
index 0000000..ee60800
--- /dev/null
+++ b/icons/mate.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48"
+ height="48"
+ id="svg4908"
+ sodipodi:version="0.32"
+ inkscape:version="0.48.4 r9939"
+ version="1.0"
+ sodipodi:docname="mate.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4910">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5671">
+ <stop
+ style="stop-color:#729fcf;stop-opacity:1;"
+ offset="0"
+ id="stop5673" />
+ <stop
+ style="stop-color:#3465a4;stop-opacity:1"
+ offset="1"
+ id="stop5675" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5671"
+ id="linearGradient5677"
+ x1="10.915961"
+ y1="14.010388"
+ x2="10.915961"
+ y2="18.908218"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.3340955,0,0,2.0797356,-1.8209963,2.8226078)" />
+ <filter
+ inkscape:collect="always"
+ id="filter5761"
+ x="-0.077635549"
+ width="1.1552711"
+ y="-0.41717416"
+ height="1.8343483">
+ <feGaussianBlur
+ inkscape:collect="always"
+ stdDeviation="0.45085227"
+ id="feGaussianBlur5763" />
+ </filter>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5671"
+ id="linearGradient3022"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.3340955,0,0,2.0797356,-1.8209963,2.8226078)"
+ x1="10.915961"
+ y1="14.010388"
+ x2="10.915961"
+ y2="18.908218" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="8"
+ inkscape:cx="6.747905"
+ inkscape:cy="33.475858"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ width="48px"
+ height="48px"
+ inkscape:window-width="1278"
+ inkscape:window-height="948"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="0">
+ <inkscape:grid
+ type="xygrid"
+ id="grid5068" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata4913">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <rect
+ style="opacity:0.24074073;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5761)"
+ id="rect5679"
+ width="13.9375"
+ height="2.59375"
+ x="4.03125"
+ y="18.96875"
+ rx="0.4498865"
+ ry="0.63501096"
+ transform="matrix(2.0842678,0,0,1.4766422,0.6792651,15.488168)" />
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:0.19444442;fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 37.756513,11.747296 c 0,0 5.140615,5.035338 5.157002,12.720854 0.01653,7.751769 -5.355349,12.985871 -5.355349,12.985871"
+ id="path5667"
+ sodipodi:nodetypes="czc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:0.18981479;fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 30.616047,16.915142 c 0,0 3.686577,2.501111 3.636349,7.685516 -0.04959,5.118158 -3.636349,7.28799 -3.636349,7.28799"
+ id="path5669"
+ sodipodi:nodetypes="czc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#87a556;fill-opacity:1;fill-rule:evenodd;stroke:#5a6943;stroke-width:0.99999987999999995px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 3.033391,11.648109 24.671136,24.418378 3.016816,37.198431 3.033391,11.648109 z"
+ id="path5070" />
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:0.18055558;fill:none;stroke:#eeeeec;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 4.04192,13.453223 22.5645,24.420891 4.027734,35.311401 4.04192,13.453223 z"
+ id="path5665"
+ sodipodi:nodetypes="cccc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:0.32407406;fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 38.153525,11.23664 c 0,0 5.427094,5.46394 5.427094,13.24865 0,7.850944 -5.427094,13.182407 -5.427094,13.182407"
+ id="path5689"
+ sodipodi:nodetypes="czc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:0.32407406;fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 33.305222,17.049165 c 0,0 2.779731,2.878431 2.779731,7.220514 0,4.27587 -2.514994,7.220514 -2.514994,7.220514"
+ id="path5691"
+ sodipodi:nodetypes="czc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#87a556;fill-opacity:1;stroke:#5a6943;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ d="m 44.983184,24.545684 c 0,-11.316001 -9.170001,-20.5 -20.46875,-20.5 -6.524212,0 -12.313471,3.0771446 -16.0625,7.84375 l 2.5625,1.625 c 3.198502,-3.9147617 8.085497,-6.40625 13.53125,-6.40625 9.625499,-10e-8 17.4375,7.812 17.4375,17.4375 0,9.6255 -7.812,17.4375 -17.4375,17.4375 -5.430049,0 -10.301145,-2.47967 -13.5,-6.375 l -2.5625,1.625 c 3.749919,4.746873 9.522794,7.8125 16.03125,7.8125 11.29875,0 20.46875,-9.183999 20.46875,-20.5 z"
+ id="path5067" />
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#87a556;fill-opacity:1;stroke:#5a6943;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ d="m 37.045684,24.576934 c 0,-6.91725 -5.614001,-12.53125 -12.53125,-12.53125 -3.682751,0 -6.987847,1.592947 -9.28125,4.125 l 2.65625,1.65625 c 1.708502,-1.687387 4.044211,-2.71875 6.625,-2.71875 5.226749,0 9.46875,4.27 9.46875,9.53125 0,5.261251 -4.242001,9.53125 -9.46875,9.53125 -2.628895,10e-7 -5.002549,-1.069255 -6.71875,-2.8125 l -2.5625,1.625 c 2.293403,2.532054 5.598499,4.125001 9.28125,4.125 6.91725,0 12.53125,-5.614 12.53125,-12.53125 z"
+ id="path5648" />
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:0.33333333;fill:none;stroke:#eeeeec;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ d="m 10.045238,37.420684 c 3.560547,4.071766 8.326523,6.5625 14.45318,6.5625 10.721091,0 19.422266,-8.721999 19.422266,-19.46875 0,-10.74675 -8.701175,-19.46875 -19.422266,-19.46875 -6.157926,0 -10.831105,2.5141711 -14.452732,6.6875"
+ id="path5664"
+ sodipodi:nodetypes="cscsc" />
+ <path
+ inkscape:connector-curvature="0"
+ style="opacity:0.33333333;fill:none;stroke:#eeeeec;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+ d="m 16.826934,33.201934 c 2.164413,1.898506 4.331161,2.843749 7.625,2.84375 6.36525,0 11.53125,-5.152 11.53125,-11.5 0,-6.348 -5.166,-11.5 -11.53125,-11.5 -3.309727,0 -5.552652,1.207783 -7.65625,3.125"
+ id="path5677"
+ sodipodi:nodetypes="cscsc" />
+ </g>
+</svg>
diff --git a/mate-about/mate-about.c b/mate-about/mate-about.c
index 2167769..50506e5 100644
--- a/mate-about/mate-about.c
+++ b/mate-about/mate-about.c
@@ -69,18 +69,8 @@ void mate_about_run(void)
{
mate_about_dialog = (MateAboutDialog*) mate_about_dialog_new();
- GtkIconTheme* icon_theme = gtk_icon_theme_get_default();
-
- if (gtk_icon_theme_has_icon(icon_theme, icon))
- {
- gtk_window_set_default_icon_name(icon);
- mate_about_dialog_set_logo_icon_name(mate_about_dialog, icon);
- }
- else
- {
- gtk_window_set_default_icon_name(desktop_icon);
- mate_about_dialog_set_logo_icon_name(mate_about_dialog, desktop_icon);
- }
+ gtk_window_set_default_icon_name(icon);
+ mate_about_dialog_set_logo_icon_name(mate_about_dialog, icon);
// name
mate_about_dialog_set_program_name(mate_about_dialog, gettext(program_name));
diff --git a/mate-about/mate-about.h b/mate-about/mate-about.h
index f4ecba0..9bf285a 100644
--- a/mate-about/mate-about.h
+++ b/mate-about/mate-about.h
@@ -31,7 +31,6 @@
const char* program_name = "MATE Desktop Environment";
const char* version = PACKAGE_VERSION;
const char* icon = "mate";
-const char* desktop_icon = "desktop";
const char* website = "http://www.mate-desktop.org/";
const char* copyright = ""
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0249a39..e6529a2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,23 +15,23 @@ libmate-desktop/mate-desktop-utils.c
libmate-desktop/mate-rr.c
libmate-desktop/mate-rr-config.c
libmate-desktop/mate-rr-labeler.c
-schemas/org.mate.accessibility-keyboard.gschema.xml.in.in
-schemas/org.mate.accessibility-startup.gschema.xml.in.in
-schemas/org.mate.applications-at-mobility.gschema.xml.in.in
-schemas/org.mate.applications-at-visual.gschema.xml.in.in
-schemas/org.mate.applications-browser.gschema.xml.in.in
-schemas/org.mate.applications-office.gschema.xml.in.in
-schemas/org.mate.applications-terminal.gschema.xml.in.in
-schemas/org.mate.background.gschema.xml.in.in
-schemas/org.mate.file-views.gschema.xml.in.in
-schemas/org.mate.interface.gschema.xml.in.in
-schemas/org.mate.lockdown.gschema.xml.in.in
-schemas/org.mate.peripherals-keyboard.gschema.xml.in.in
-schemas/org.mate.peripherals-mouse.gschema.xml.in.in
-schemas/org.mate.sound.gschema.xml.in.in
-schemas/org.mate.thumbnail-cache.gschema.xml.in.in
-schemas/org.mate.thumbnailers.gschema.xml.in.in
-schemas/org.mate.typing-break.gschema.xml.in.in
+[type: gettext/gsettings]schemas/org.mate.accessibility-keyboard.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.accessibility-startup.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.applications-at-mobility.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.applications-at-visual.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.applications-browser.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.applications-office.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.applications-terminal.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.background.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.file-views.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.interface.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.lockdown.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.peripherals-keyboard.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.peripherals-mouse.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.sound.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.thumbnail-cache.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.thumbnailers.gschema.xml.in
+[type: gettext/gsettings]schemas/org.mate.typing-break.gschema.xml.in
tools/mate-color-select.c
tools/mate-color-select.desktop.in.in
tools/mate-conf-import.desktop.in.in
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 14959d8..aec793c 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,31 +1,27 @@
-desktop_gschemas_in_in = \
- org.mate.accessibility-keyboard.gschema.xml.in.in \
- org.mate.accessibility-startup.gschema.xml.in.in \
- org.mate.applications-at-mobility.gschema.xml.in.in \
- org.mate.applications-at-visual.gschema.xml.in.in \
- org.mate.applications-browser.gschema.xml.in.in \
- org.mate.applications-office.gschema.xml.in.in \
- org.mate.applications-terminal.gschema.xml.in.in \
- org.mate.background.gschema.xml.in.in \
- org.mate.debug.gschema.xml.in.in \
- org.mate.file-views.gschema.xml.in.in \
- org.mate.interface.gschema.xml.in.in \
- org.mate.lockdown.gschema.xml.in.in \
- org.mate.peripherals-keyboard.gschema.xml.in.in \
- org.mate.peripherals-mouse.gschema.xml.in.in \
- org.mate.sound.gschema.xml.in.in \
- org.mate.thumbnail-cache.gschema.xml.in.in \
- org.mate.thumbnailers.gschema.xml.in.in \
- org.mate.typing-break.gschema.xml.in.in
+desktop_gschemas_in = \
+ org.mate.accessibility-keyboard.gschema.xml.in \
+ org.mate.accessibility-startup.gschema.xml.in \
+ org.mate.applications-at-mobility.gschema.xml.in \
+ org.mate.applications-at-visual.gschema.xml.in \
+ org.mate.applications-browser.gschema.xml.in \
+ org.mate.applications-office.gschema.xml.in \
+ org.mate.applications-terminal.gschema.xml.in \
+ org.mate.background.gschema.xml.in \
+ org.mate.debug.gschema.xml.in \
+ org.mate.file-views.gschema.xml.in \
+ org.mate.interface.gschema.xml.in \
+ org.mate.lockdown.gschema.xml.in \
+ org.mate.peripherals-keyboard.gschema.xml.in \
+ org.mate.peripherals-mouse.gschema.xml.in \
+ org.mate.sound.gschema.xml.in \
+ org.mate.thumbnail-cache.gschema.xml.in \
+ org.mate.thumbnailers.gschema.xml.in \
+ org.mate.typing-break.gschema.xml.in
@INTLTOOL_XML_NOMERGE_RULE@
-desktop_gschemas_in = $(desktop_gschemas_in_in:.xml.in.in=.xml.in)
gsettings_SCHEMAS = $(desktop_gschemas_in:.xml.in=.xml)
-%.gschema.xml.in: %.gschema.xml.in.in Makefile
- $(AM_V_GEN) $(SED) -e 's^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
-
@GSETTINGS_RULES@
convertdir = $(datadir)/MateConf/gsettings
@@ -33,9 +29,8 @@ convert_DATA = mate-desktop.convert
EXTRA_DIST = \
$(convert_DATA) \
- $(desktop_gschemas_in_in)
+ $(desktop_gschemas_in)
CLEANFILES = \
- $(desktop_gschemas_in) \
$(gsettings_SCHEMAS) \
*.gschema.valid
diff --git a/schemas/mate-desktop.convert b/schemas/mate-desktop.convert
index e7360c9..962ec4f 100644
--- a/schemas/mate-desktop.convert
+++ b/schemas/mate-desktop.convert
@@ -112,7 +112,6 @@ remember-numlock-state = /desktop/mate/peripherals/keyboard/remember_numlock_sta
[org.mate.peripherals-mouse]
left-handed = /desktop/mate/peripherals/mouse/left_handed
-single-click = /desktop/mate/peripherals/mouse/single_click
motion-acceleration = /desktop/mate/peripherals/mouse/motion_acceleration
motion-threshold = /desktop/mate/peripherals/mouse/motion_threshold
drag-threshold = /desktop/mate/peripherals/mouse/drag_threshold
diff --git a/schemas/org.mate.accessibility-keyboard.gschema.xml.in.in b/schemas/org.mate.accessibility-keyboard.gschema.xml.in
index f5f42fd..812497f 100644
--- a/schemas/org.mate.accessibility-keyboard.gschema.xml.in.in
+++ b/schemas/org.mate.accessibility-keyboard.gschema.xml.in
@@ -17,8 +17,8 @@
</key>
<key name="bouncekeys-delay" type="i">
<default>300</default>
- <_summary>minimum interval in milliseconds</_summary>
- <_description>Ignore multiple presses of the _same_ key within @delay milliseconds.</_description>
+ <summary>minimum interval in milliseconds</summary>
+ <description>Ignore multiple presses of the _same_ key within @delay milliseconds.</description>
</key>
<key name="bouncekeys-beep-reject" type="b">
<default>false</default>
@@ -28,26 +28,26 @@
</key>
<key name="mousekeys-max-speed" type="i">
<default>10</default>
- <_summary>Pixels per seconds</_summary>
- <_description>How many pixels per second to move at the maximum speed.</_description>
+ <summary>Pixels per seconds</summary>
+ <description>How many pixels per second to move at the maximum speed.</description>
</key>
<key name="mousekeys-accel-time" type="i">
<default>300</default>
- <_summary>How long to accelerate in milliseconds</_summary>
- <_description>How many milliseconds it takes to go from 0 to maximum speed.</_description>
+ <summary>How long to accelerate in milliseconds</summary>
+ <description>How many milliseconds it takes to go from 0 to maximum speed.</description>
</key>
<key name="mousekeys-init-delay" type="i">
<default>300</default>
- <_summary>Initial delay in milliseconds</_summary>
- <_description>How many milliseconds to wait before mouse movement keys start to operate.</_description>
+ <summary>Initial delay in milliseconds</summary>
+ <description>How many milliseconds to wait before mouse movement keys start to operate.</description>
</key>
<key name="slowkeys-enable" type="b">
<default>false</default>
</key>
<key name="slowkeys-delay" type="i">
<default>300</default>
- <_summary>Minimum interval in milliseconds</_summary>
- <_description>Do not accept a key as being pressed unless held for @delay milliseconds.</_description>
+ <summary>Minimum interval in milliseconds</summary>
+ <description>Do not accept a key as being pressed unless held for @delay milliseconds.</description>
</key>
<key name="slowkeys-beep-press" type="b">
<default>false</default>
@@ -63,11 +63,11 @@
</key>
<key name="stickykeys-two-key-off" type="b">
<default>false</default>
- <_description>Disable if two keys are pressed at the same time.</_description>
+ <description>Disable if two keys are pressed at the same time.</description>
</key>
<key name="stickykeys-modifier-beep" type="b">
<default>false</default>
- <_description>Beep when a modifier is pressed.</_description>
+ <description>Beep when a modifier is pressed.</description>
</key>
<key name="togglekeys-enable" type="b">
<default>false</default>
diff --git a/schemas/org.mate.accessibility-startup.gschema.xml.in.in b/schemas/org.mate.accessibility-startup.gschema.xml.in
index 5011c13..c2c3aec 100644
--- a/schemas/org.mate.accessibility-startup.gschema.xml.in.in
+++ b/schemas/org.mate.accessibility-startup.gschema.xml.in
@@ -2,8 +2,8 @@
<schema id="org.mate.accessibility-startup" path="/org/mate/desktop/accessibility/startup/">
<key name="exec-ats" type="as">
<default>[]</default>
- <_summary>Startup Assistive Technology Applications</_summary>
- <_description>List of assistive technology applications to start when logging into the MATE desktop.</_description>
+ <summary>Startup Assistive Technology Applications</summary>
+ <description>List of assistive technology applications to start when logging into the MATE desktop.</description>
</key>
</schema>
</schemalist>
diff --git a/schemas/org.mate.applications-at-mobility.gschema.xml.in b/schemas/org.mate.applications-at-mobility.gschema.xml.in
new file mode 100644
index 0000000..993f2ea
--- /dev/null
+++ b/schemas/org.mate.applications-at-mobility.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.mate.applications-at-mobility" path="/org/mate/desktop/applications/at/mobility/">
+ <key name="exec" type="s">
+ <default>'dasher'</default>
+ <summary>Preferred Mobility assistive technology application</summary>
+ <description>Preferred Mobility assistive technology application to be used for login, menu, or command line.</description>
+ </key>
+ <key name="startup" type="b">
+ <default>false</default>
+ <summary>Start preferred Mobility assistive technology application</summary>
+ <description>MATE to start preferred Mobility assistive technology application during login.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/schemas/org.mate.applications-at-mobility.gschema.xml.in.in b/schemas/org.mate.applications-at-mobility.gschema.xml.in.in
deleted file mode 100644
index 0e4b65e..0000000
--- a/schemas/org.mate.applications-at-mobility.gschema.xml.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
- <schema id="org.mate.applications-at-mobility" path="/org/mate/desktop/applications/at/mobility/">
- <key name="exec" type="s">
- <default>'dasher'</default>
- <_summary>Preferred Mobility assistive technology application</_summary>
- <_description>Preferred Mobility assistive technology application to be used for login, menu, or command line.</_description>
- </key>
- <key name="startup" type="b">
- <default>false</default>
- <_summary>Start preferred Mobility assistive technology application</_summary>
- <_description>MATE to start preferred Mobility assistive technology application during login.</_description>
- </key>
- </schema>
-</schemalist>
diff --git a/schemas/org.mate.applications-at-visual.gschema.xml.in b/schemas/org.mate.applications-at-visual.gschema.xml.in
new file mode 100644
index 0000000..23d9378
--- /dev/null
+++ b/schemas/org.mate.applications-at-visual.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.mate.applications-at-visual" path="/org/mate/desktop/applications/at/visual/">
+ <key name="exec" type="s">
+ <default>'orca'</default>
+ <summary>Preferred Visual assistive technology application</summary>
+ <description>Preferred Visual assistive technology application be used for login, menu, or command line.</description>
+ </key>
+ <key name="startup" type="b">
+ <default>false</default>
+ <summary>Start preferred Visual assistive technology application</summary>
+ <description>MATE to start preferred Visual assistive technology application during login.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/schemas/org.mate.applications-at-visual.gschema.xml.in.in b/schemas/org.mate.applications-at-visual.gschema.xml.in.in
deleted file mode 100644
index b7ac679..0000000
--- a/schemas/org.mate.applications-at-visual.gschema.xml.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
- <schema id="org.mate.applications-at-visual" path="/org/mate/desktop/applications/at/visual/">
- <key name="exec" type="s">
- <default>'orca'</default>
- <_summary>Preferred Visual assistive technology application</_summary>
- <_description>Preferred Visual assistive technology application be used for login, menu, or command line.</_description>
- </key>
- <key name="startup" type="b">
- <default>false</default>
- <_summary>Start preferred Visual assistive technology application</_summary>
- <_description>MATE to start preferred Visual assistive technology application during login.</_description>
- </key>
- </schema>
-</schemalist>
diff --git a/schemas/org.mate.applications-browser.gschema.xml.in.in b/schemas/org.mate.applications-browser.gschema.xml.in
index 57c49d3..47d009f 100644
--- a/schemas/org.mate.applications-browser.gschema.xml.in.in
+++ b/schemas/org.mate.applications-browser.gschema.xml.in
@@ -2,18 +2,18 @@
<schema id="org.mate.applications-browser" path="/org/mate/desktop/applications/browser/">
<key name="exec" type="s">
<default>'mozilla'</default>
- <_summary>Default browser</_summary>
- <_description>Default browser for all URLs.</_description>
+ <summary>Default browser</summary>
+ <description>Default browser for all URLs.</description>
</key>
<key name="needs-term" type="b">
<default>false</default>
- <_summary>Browser needs terminal</_summary>
- <_description>Whether the default browser needs a terminal to run.</_description>
+ <summary>Browser needs terminal</summary>
+ <description>Whether the default browser needs a terminal to run.</description>
</key>
<key name="nremote" type="b">
<default>true</default>
- <_summary>Browser understands remote</_summary>
- <_description>Whether the default browser understands netscape remote.</_description>
+ <summary>Browser understands remote</summary>
+ <description>Whether the default browser understands netscape remote.</description>
</key>
</schema>
</schemalist>
diff --git a/schemas/org.mate.applications-office.gschema.xml.in.in b/schemas/org.mate.applications-office.gschema.xml.in
index 5ad64cf..9ae3908 100644
--- a/schemas/org.mate.applications-office.gschema.xml.in.in
+++ b/schemas/org.mate.applications-office.gschema.xml.in
@@ -6,25 +6,25 @@
<schema id="org.mate.applications-office.calendar" path="/org/mate/desktop/applications/calendar/">
<key name="exec" type="s">
<default>'evolution'</default>
- <_summary>Default calendar</_summary>
- <_description>Default calendar application</_description>
+ <summary>Default calendar</summary>
+ <description>Default calendar application</description>
</key>
<key name="needs-term" type="b">
<default>false</default>
- <_summary>Calendar needs terminal</_summary>
- <_description>Whether the default calendar application needs a terminal to run</_description>
+ <summary>Calendar needs terminal</summary>
+ <description>Whether the default calendar application needs a terminal to run</description>
</key>
</schema>
<schema id="org.mate.applications-office.tasks" path="/org/mate/desktop/applications/tasks/">
<key name="exec" type="s">
<default>'evolution'</default>
- <_summary>Default tasks</_summary>
- <_description>Default tasks application</_description>
+ <summary>Default tasks</summary>
+ <description>Default tasks application</description>
</key>
<key name="needs-term" type="b">
<default>false</default>
- <_summary>Tasks needs terminal</_summary>
- <_description>Whether the default tasks application needs a terminal to run</_description>
+ <summary>Tasks needs terminal</summary>
+ <description>Whether the default tasks application needs a terminal to run</description>
</key>
</schema>
</schemalist>
diff --git a/schemas/org.mate.applications-terminal.gschema.xml.in.in b/schemas/org.mate.applications-terminal.gschema.xml.in
index adeca8f..8351509 100644
--- a/schemas/org.mate.applications-terminal.gschema.xml.in.in
+++ b/schemas/org.mate.applications-terminal.gschema.xml.in
@@ -2,13 +2,13 @@
<schema id="org.mate.applications-terminal" path="/org/mate/desktop/applications/terminal/">
<key name="exec" type="s">
<default>'mate-terminal'</default>
- <_summary>Terminal application</_summary>
- <_description>Terminal program to use when starting applications that require one.</_description>
+ <summary>Terminal application</summary>
+ <description>Terminal program to use when starting applications that require one.</description>
</key>
<key name="exec-arg" type="s">
<default>'-x'</default>
- <_summary>Exec Arguments</_summary>
- <_description>Argument used to execute programs in the terminal defined by the 'exec' key.</_description>
+ <summary>Exec Arguments</summary>
+ <description>Argument used to execute programs in the terminal defined by the 'exec' key.</description>
</key>
</schema>
</schemalist>
diff --git a/schemas/org.mate.background.gschema.xml.in.in b/schemas/org.mate.background.gschema.xml.in
index f367e91..50619d5 100644
--- a/schemas/org.mate.background.gschema.xml.in.in
+++ b/schemas/org.mate.background.gschema.xml.in
@@ -15,48 +15,48 @@
<schema id="org.mate.background" path="/org/mate/desktop/background/">
<key name="draw-background" type="b">
<default>true</default>
- <_summary>Draw Desktop Background</_summary>
- <_description>Have MATE draw the desktop background.</_description>
+ <summary>Draw Desktop Background</summary>
+ <description>Have MATE draw the desktop background.</description>
</key>
<key name="show-desktop-icons" type="b">
<default>true</default>
- <_summary>Show Desktop Icons</_summary>
- <_description>Have MATE file manager (Caja) draw the desktop icons.</_description>
+ <summary>Show Desktop Icons</summary>
+ <description>Have MATE file manager (Caja) draw the desktop icons.</description>
</key>
<key name="background-fade" type="b">
<default>true</default>
- <_summary>Fade the background on change</_summary>
- <_description>If set to true, then MATE will change the desktop background with a fading effect.</_description>
+ <summary>Fade the background on change</summary>
+ <description>If set to true, then MATE will change the desktop background with a fading effect.</description>
</key>
<key name="picture-options" enum="org.mate.background.picture-options-enum">
<default>'zoom'</default>
- <_summary>Picture Options</_summary>
- <_description>Determines how the image set by wallpaper_filename is rendered. Possible values are "wallpaper", "centered", "scaled", "stretched", "zoom", "spanned".</_description>
+ <summary>Picture Options</summary>
+ <description>Determines how the image set by wallpaper_filename is rendered. Possible values are "wallpaper", "centered", "scaled", "stretched", "zoom", "spanned".</description>
</key>
<key name="picture-filename" type="s">
<default>'@datadir@/backgrounds/mate/desktop/Stripes.png'</default>
- <_summary>Picture Filename</_summary>
- <_description>File to use for the background image.</_description>
+ <summary>Picture Filename</summary>
+ <description>File to use for the background image.</description>
</key>
<key name="picture-opacity" type="i">
<default>100</default>
- <_summary>Picture Opacity</_summary>
- <_description>Opacity with which to draw the background picture.</_description>
+ <summary>Picture Opacity</summary>
+ <description>Opacity with which to draw the background picture.</description>
</key>
<key name="primary-color" type="s">
<default>'#5891BC'</default>
- <_summary>Primary Color</_summary>
- <_description>Left or Top color when drawing gradients, or the solid color.</_description>
+ <summary>Primary Color</summary>
+ <description>Left or Top color when drawing gradients, or the solid color.</description>
</key>
<key name="secondary-color" type="s">
<default>'#3C8F25'</default>
- <_summary>Secondary Color</_summary>
- <_description>Right or Bottom color when drawing gradients, not used for solid color.</_description>
+ <summary>Secondary Color</summary>
+ <description>Right or Bottom color when drawing gradients, not used for solid color.</description>
</key>
<key name="color-shading-type" enum="org.mate.background.color-shading-type-enum">
<default>'vertical-gradient'</default>
- <_summary>Color Shading Type</_summary>
- <_description>How to shade the background color. Possible values are "horizontal-gradient", "vertical-gradient", and "solid".</_description>
+ <summary>Color Shading Type</summary>
+ <description>How to shade the background color. Possible values are "horizontal-gradient", "vertical-gradient", and "solid".</description>
</key>
</schema>
</schemalist>
diff --git a/schemas/org.mate.debug.gschema.xml.in.in b/schemas/org.mate.debug.gschema.xml.in
index 63e7319..63e7319 100644
--- a/schemas/org.mate.debug.gschema.xml.in.in
+++ b/schemas/org.mate.debug.gschema.xml.in
diff --git a/schemas/org.mate.file-views.gschema.xml.in.in b/schemas/org.mate.file-views.gschema.xml.in
index 9396dd6..35b846a 100644
--- a/schemas/org.mate.file-views.gschema.xml.in.in
+++ b/schemas/org.mate.file-views.gschema.xml.in
@@ -2,8 +2,8 @@
<schema id="org.mate.file-views" path="/org/mate/desktop/file-views/">
<key name="icon-theme" type="s">
<default>'crux_teal'</default>
- <_summary>File Icon Theme</_summary>
- <_description>Theme used for displaying file icons.</_description>
+ <summary>File Icon Theme</summary>
+ <description>Theme used for displaying file icons.</description>
</key>
</schema>
</schemalist>
diff --git a/schemas/org.mate.interface.gschema.xml.in b/schemas/org.mate.interface.gschema.xml.in
new file mode 100644
index 0000000..dcd3a9c
--- /dev/null
+++ b/schemas/org.mate.interface.gschema.xml.in
@@ -0,0 +1,169 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.mate.interface" path="/org/mate/desktop/interface/">
+ <key name="accessibility" type="b">
+ <default>false</default>
+ <summary>Enable Accessibility</summary>
+ <description>Whether Applications should have accessibility support.</description>
+ </key>
+ <key name="enable-animations" type="b">
+ <default>true</default>
+ <summary>Enable Animations</summary>
+ <description>Whether animations should be displayed. Note: This is a global key, it changes the behaviour of the window manager, the panel etc.</description>
+ </key>
+ <key name="menus-have-tearoff" type="b">
+ <default>false</default>
+ <summary>Menus Have Tearoff</summary>
+ <description>Whether menus should have a tearoff.</description>
+ </key>
+ <key name="can-change-accels" type="b">
+ <default>false</default>
+ <summary>Can Change Accels</summary>
+ <description>Whether the user can dynamically type a new accelerator when positioned over an active menuitem.</description>
+ </key>
+ <key name="toolbar-style" type="s">
+ <default>'both-horiz'</default>
+ <summary>Toolbar Style</summary>
+ <description>Toolbar Style. Valid values are "both", "both-horiz", "icons", and "text".</description>
+ </key>
+ <key name="menus-have-icons" type="b">
+ <default>true</default>
+ <summary>Menus Have Icons</summary>
+ <description>Whether menus may display an icon next to a menu entry.</description>
+ </key>
+ <key name="buttons-have-icons" type="b">
+ <default>true</default>
+ <summary>Buttons Have Icons</summary>
+ <description>Whether buttons may display an icon in addition to the button text.</description>
+ </key>
+ <key name="menubar-detachable" type="b">
+ <default>false</default>
+ <summary>Menubar Detachable</summary>
+ <description>Whether the user can detach menubars and move them around.</description>
+ </key>
+ <key name="toolbar-detachable" type="b">
+ <default>false</default>
+ <summary>Toolbar Detachable</summary>
+ <description>Whether the user can detach toolbars and move them around.</description>
+ </key>
+ <key name="toolbar-icons-size" type="s">
+ <default>'large-toolbar'</default>
+ <summary>Toolbar Icon Size</summary>
+ <description>Size of icons in toolbars, either "small-toolbar" or "large-toolbar".</description>
+ </key>
+ <key name="cursor-blink" type="b">
+ <default>true</default>
+ <summary>Cursor Blink</summary>
+ <description>Whether the cursor should blink.</description>
+ </key>
+ <key name="cursor-blink-time" type="i">
+ <default>1200</default>
+ <summary>Cursor Blink Time</summary>
+ <description>Length of the cursor blink cycle, in milliseconds.</description>
+ </key>
+ <key name="icon-theme" type="s">
+ <default>'menta'</default>
+ <summary>Icon Theme</summary>
+ <description>Icon theme to use for the panel, caja etc.</description>
+ </key>
+ <key name="gtk-theme" type="s">
+ <default>'Menta'</default>
+ <summary>Gtk+ Theme</summary>
+ <description>Basename of the default theme used by gtk+.</description>
+ </key>
+ <key name="gtk-key-theme" type="s">
+ <default>'Default'</default>
+ <summary>Gtk+ Theme</summary>
+ <description>Basename of the default theme used by gtk+.</description>
+ </key>
+ <key name="gtk-color-scheme" type="s">
+ <default>''</default>
+ <summary>List of symbolic names and color equivalents</summary>
+ <description>A '\n' separated list of "name:color" as defined by the 'gtk-color-scheme' setting</description>
+ </key>
+ <key name="font-name" type="s">
+ <default>'Sans 10'</default>
+ <summary>Default font</summary>
+ <description>Name of the default font used by gtk+.</description>
+ </key>
+ <key name="gtk-im-preedit-style" type="s">
+ <default>'callback'</default>
+ <summary>GTK IM Preedit Style</summary>
+ <description>Name of the GTK+ input method Preedit Style used by gtk+.</description>
+ </key>
+ <key name="gtk-im-status-style" type="s">
+ <default>'callback'</default>
+ <summary>GTK IM Status Style</summary>
+ <description>Name of the GTK+ input method Status Style used by gtk+.</description>
+ </key>
+ <key name="gtk-im-module" type="s">
+ <default>''</default>
+ <summary>GTK IM Module</summary>
+ <description>Name of the input method module used by GTK+.</description>
+ </key>
+ <key name="gtk-dialogs-use-header" type="b">
+ <default>false</default>
+ <summary>Use GTK3 header bar</summary>
+ <description>Whether builtin GTK+ dialogs such as the file chooser, the color chooser or the font chooser will use a header bar at the top to show action widgets, or an action area at the bottom. This setting does not affect custom dialogs using GtkDialog directly, or message dialogs.</description>
+ </key>
+ <key name="gtk-overlay-scrolling" type="b">
+ <default>false</default>
+ <summary>Use GTK3 overlay scrolling</summary>
+ <description>Whether built-in GTK+ scrolled windows will use overlay scrolling. Overlay scrolling hides and reduces the size of the scrollbar until it gets focus.</description>
+ </key>
+ <key name="gtk-enable-animations" type="b">
+ <default>true</default>
+ <summary>Enable Gtk toolkit-wide animations</summary>
+ <description>Whether to enable toolkit-wide animations.</description>
+ </key>
+ <key name="document-font-name" type="s">
+ <default>'Sans 10'</default>
+ <summary>Document font</summary>
+ <description>Name of the default font used for reading documents.</description>
+ </key>
+ <key name="monospace-font-name" type="s">
+ <default>'Monospace 10'</default>
+ <summary>Monospace font</summary>
+ <description>Name of a monospaced (fixed-width) font for use in locations like terminals.</description>
+ </key>
+ <key name="use-custom-font" type="b">
+ <default>false</default>
+ <summary>Use Custom Font</summary>
+ <description>Whether to use a custom font in gtk+ applications.</description>
+ </key>
+ <key name="status-bar-meter-on-right" type="b">
+ <default>false</default>
+ <summary>Status Bar on Right</summary>
+ <description>Whether to display a status bar meter on the right.</description>
+ </key>
+ <key name="file-chooser-backend" type="s">
+ <default>'gio'</default>
+ <summary>Module for GtkFileChooser</summary>
+ <description>Module to use as the filesystem model for the GtkFileChooser widget. Possible values are "gio" and "gtk+".</description>
+ </key>
+ <key name="menubar-accel" type="s">
+ <default>'F10'</default>
+ <summary>Menubar accelerator</summary>
+ <description>Keyboard shortcut to open the menu bars.</description>
+ </key>
+ <key name="show-input-method-menu" type="b">
+ <default>true</default>
+ <summary>Show the 'Input Methods' menu</summary>
+ <description>Whether the context menus of entries and text views should offer to change the input method.</description>
+ </key>
+ <key name="show-unicode-menu" type="b">
+ <default>true</default>
+ <summary>Show the 'Unicode Control Character' menu</summary>
+ <description>Whether the context menus of entries and text views should offer to insert control characters.</description>
+ </key>
+ <key name="gtk-decoration-layout" type="s">
+ <default>'menu:minimize,maximize,close'</default>
+ <summary>Titlebar layout of GTK3 client-side decorated windows</summary>
+ <description>This setting determines which buttons should be put in the titlebar of client-side decorated windows, and whether they should be placed at the left of right. See https://developer.gnome.org/gtk3/stable/GtkSettings.html#GtkSettings--gtk-decoration-layout.</description>
+ </key>
+ <key name="automatic-mnemonics" type="b">
+ <default>true</default>
+ <summary>Only show mnemonics on when the Alt key is pressed</summary>
+ <description>Whether mnemonics should be automatically shown and hidden when the user presses the Alt key.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/schemas/org.mate.interface.gschema.xml.in.in b/schemas/org.mate.interface.gschema.xml.in.in
deleted file mode 100644
index c8b3742..0000000
--- a/schemas/org.mate.interface.gschema.xml.in.in
+++ /dev/null
@@ -1,169 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
- <schema id="org.mate.interface" path="/org/mate/desktop/interface/">
- <key name="accessibility" type="b">
- <default>false</default>
- <_summary>Enable Accessibility</_summary>
- <_description>Whether Applications should have accessibility support.</_description>
- </key>
- <key name="enable-animations" type="b">
- <default>true</default>
- <_summary>Enable Animations</_summary>
- <_description>Whether animations should be displayed. Note: This is a global key, it changes the behaviour of the window manager, the panel etc.</_description>
- </key>
- <key name="menus-have-tearoff" type="b">
- <default>false</default>
- <_summary>Menus Have Tearoff</_summary>
- <_description>Whether menus should have a tearoff.</_description>
- </key>
- <key name="can-change-accels" type="b">
- <default>false</default>
- <_summary>Can Change Accels</_summary>
- <_description>Whether the user can dynamically type a new accelerator when positioned over an active menuitem.</_description>
- </key>
- <key name="toolbar-style" type="s">
- <default>'both-horiz'</default>
- <_summary>Toolbar Style</_summary>
- <_description>Toolbar Style. Valid values are "both", "both-horiz", "icons", and "text".</_description>
- </key>
- <key name="menus-have-icons" type="b">
- <default>true</default>
- <_summary>Menus Have Icons</_summary>
- <_description>Whether menus may display an icon next to a menu entry.</_description>
- </key>
- <key name="buttons-have-icons" type="b">
- <default>true</default>
- <_summary>Buttons Have Icons</_summary>
- <_description>Whether buttons may display an icon in addition to the button text.</_description>
- </key>
- <key name="menubar-detachable" type="b">
- <default>false</default>
- <_summary>Menubar Detachable</_summary>
- <_description>Whether the user can detach menubars and move them around.</_description>
- </key>
- <key name="toolbar-detachable" type="b">
- <default>false</default>
- <_summary>Toolbar Detachable</_summary>
- <_description>Whether the user can detach toolbars and move them around.</_description>
- </key>
- <key name="toolbar-icons-size" type="s">
- <default>'large-toolbar'</default>
- <_summary>Toolbar Icon Size</_summary>
- <_description>Size of icons in toolbars, either "small-toolbar" or "large-toolbar".</_description>
- </key>
- <key name="cursor-blink" type="b">
- <default>true</default>
- <_summary>Cursor Blink</_summary>
- <_description>Whether the cursor should blink.</_description>
- </key>
- <key name="cursor-blink-time" type="i">
- <default>1200</default>
- <_summary>Cursor Blink Time</_summary>
- <_description>Length of the cursor blink cycle, in milliseconds.</_description>
- </key>
- <key name="icon-theme" type="s">
- <default>'menta'</default>
- <_summary>Icon Theme</_summary>
- <_description>Icon theme to use for the panel, caja etc.</_description>
- </key>
- <key name="gtk-theme" type="s">
- <default>'Menta'</default>
- <_summary>Gtk+ Theme</_summary>
- <_description>Basename of the default theme used by gtk+.</_description>
- </key>
- <key name="gtk-key-theme" type="s">
- <default>'Default'</default>
- <_summary>Gtk+ Theme</_summary>
- <_description>Basename of the default theme used by gtk+.</_description>
- </key>
- <key name="gtk-color-scheme" type="s">
- <default>''</default>
- <_summary>List of symbolic names and color equivalents</_summary>
- <_description>A '\n' separated list of "name:color" as defined by the 'gtk-color-scheme' setting</_description>
- </key>
- <key name="font-name" type="s">
- <default>'Sans 10'</default>
- <_summary>Default font</_summary>
- <_description>Name of the default font used by gtk+.</_description>
- </key>
- <key name="gtk-im-preedit-style" type="s">
- <default>'callback'</default>
- <_summary>GTK IM Preedit Style</_summary>
- <_description>Name of the GTK+ input method Preedit Style used by gtk+.</_description>
- </key>
- <key name="gtk-im-status-style" type="s">
- <default>'callback'</default>
- <_summary>GTK IM Status Style</_summary>
- <_description>Name of the GTK+ input method Status Style used by gtk+.</_description>
- </key>
- <key name="gtk-im-module" type="s">
- <default>''</default>
- <_summary>GTK IM Module</_summary>
- <_description>Name of the input method module used by GTK+.</_description>
- </key>
- <key name="gtk-dialogs-use-header" type="b">
- <default>false</default>
- <_summary>Use GTK3 header bar</_summary>
- <_description>Whether builtin GTK+ dialogs such as the file chooser, the color chooser or the font chooser will use a header bar at the top to show action widgets, or an action area at the bottom. This setting does not affect custom dialogs using GtkDialog directly, or message dialogs.</_description>
- </key>
- <key name="gtk-overlay-scrolling" type="b">
- <default>false</default>
- <_summary>Use GTK3 overlay scrolling</_summary>
- <_description>Whether built-in GTK+ scrolled windows will use overlay scrolling. Overlay scrolling hides and reduces the size of the scrollbar until it gets focus.</_description>
- </key>
- <key name="gtk-enable-animations" type="b">
- <default>true</default>
- <_summary>Enable Gtk toolkit-wide animations</_summary>
- <_description>Whether to enable toolkit-wide animations.</_description>
- </key>
- <key name="document-font-name" type="s">
- <default>'Sans 10'</default>
- <_summary>Document font</_summary>
- <_description>Name of the default font used for reading documents.</_description>
- </key>
- <key name="monospace-font-name" type="s">
- <default>'Monospace 10'</default>
- <_summary>Monospace font</_summary>
- <_description>Name of a monospaced (fixed-width) font for use in locations like terminals.</_description>
- </key>
- <key name="use-custom-font" type="b">
- <default>false</default>
- <_summary>Use Custom Font</_summary>
- <_description>Whether to use a custom font in gtk+ applications.</_description>
- </key>
- <key name="status-bar-meter-on-right" type="b">
- <default>false</default>
- <_summary>Status Bar on Right</_summary>
- <_description>Whether to display a status bar meter on the right.</_description>
- </key>
- <key name="file-chooser-backend" type="s">
- <default>'gio'</default>
- <_summary>Module for GtkFileChooser</_summary>
- <_description>Module to use as the filesystem model for the GtkFileChooser widget. Possible values are "gio" and "gtk+".</_description>
- </key>
- <key name="menubar-accel" type="s">
- <default>'F10'</default>
- <_summary>Menubar accelerator</_summary>
- <_description>Keyboard shortcut to open the menu bars.</_description>
- </key>
- <key name="show-input-method-menu" type="b">
- <default>true</default>
- <_summary>Show the 'Input Methods' menu</_summary>
- <_description>Whether the context menus of entries and text views should offer to change the input method.</_description>
- </key>
- <key name="show-unicode-menu" type="b">
- <default>true</default>
- <_summary>Show the 'Unicode Control Character' menu</_summary>
- <_description>Whether the context menus of entries and text views should offer to insert control characters.</_description>
- </key>
- <key name="gtk-decoration-layout" type="s">
- <default>'menu:minimize,maximize,close'</default>
- <_summary>Titlebar layout of GTK3 client-side decorated windows</_summary>
- <_description>This setting determines which buttons should be put in the titlebar of client-side decorated windows, and whether they should be placed at the left of right. See https://developer.gnome.org/gtk3/stable/GtkSettings.html#GtkSettings--gtk-decoration-layout.</_description>
- </key>
- <key name="automatic-mnemonics" type="b">
- <default>true</default>
- <_summary>Only show mnemonics on when the Alt key is pressed</_summary>
- <_description>Whether mnemonics should be automatically shown and hidden when the user presses the Alt key.</_description>
- </key>
- </schema>
-</schemalist>
diff --git a/schemas/org.mate.lockdown.gschema.xml.in b/schemas/org.mate.lockdown.gschema.xml.in
new file mode 100644
index 0000000..1517bd1
--- /dev/null
+++ b/schemas/org.mate.lockdown.gschema.xml.in
@@ -0,0 +1,49 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.mate.lockdown" path="/org/mate/desktop/lockdown/">
+ <key name="disable-command-line" type="b">
+ <default>false</default>
+ <summary>Disable command line</summary>
+ <description>Prevent the user from accessing the terminal or specifying a command line to be executed. For example, this would disable access to the panel's "Run Application" dialog.</description>
+ </key>
+ <key name="disable-save-to-disk" type="b">
+ <default>false</default>
+ <summary>Disable saving files to disk</summary>
+ <description>Prevent the user from saving files to disk. For example, this would disable access to all applications' "Save as" dialogs.</description>
+ </key>
+ <key name="disable-printing" type="b">
+ <default>false</default>
+ <summary>Disable printing</summary>
+ <description>Prevent the user from printing. For example, this would disable access to all applications' "Print" dialogs.</description>
+ </key>
+ <key name="disable-print-setup" type="b">
+ <default>false</default>
+ <summary>Disable print setup</summary>
+ <description>Prevent the user from modifying print settings. For example, this would disable access to all applications' "Print Setup" dialogs.</description>
+ </key>
+ <key name="disable-user-switching" type="b">
+ <default>false</default>
+ <summary>Disable user switching</summary>
+ <description>Prevent the user from switching to another account while his session is active.</description>
+ </key>
+ <key name="disable-lock-screen" type="b">
+ <default>false</default>
+ <summary>Disable lock screen</summary>
+ <description>Prevent the user from locking the screen.</description>
+ </key>
+ <key name="disable-application-handlers" type="b">
+ <default>false</default>
+ <summary>Disable URL and MIME type handlers</summary>
+ <description>Prevent running any URL or MIME type handler applications.</description>
+ </key>
+ <key name="disable-theme-settings" type="b">
+ <default>false</default>
+ <summary>Disable theme settings</summary>
+ <description>Prevent the user from changing theme settings.</description>
+ </key>
+ <key name="disable-log-out" type="b">
+ <default>false</default>
+ <summary>Disable log out</summary>
+ <description>Prevent the user from logging out.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/schemas/org.mate.lockdown.gschema.xml.in.in b/schemas/org.mate.lockdown.gschema.xml.in.in
deleted file mode 100644
index e1e5494..0000000
--- a/schemas/org.mate.lockdown.gschema.xml.in.in
+++ /dev/null
@@ -1,49 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
- <schema id="org.mate.lockdown" path="/org/mate/desktop/lockdown/">
- <key name="disable-command-line" type="b">
- <default>false</default>
- <_summary>Disable command line</_summary>
- <_description>Prevent the user from accessing the terminal or specifying a command line to be executed. For example, this would disable access to the panel's "Run Application" dialog.</_description>
- </key>
- <key name="disable-save-to-disk" type="b">
- <default>false</default>
- <_summary>Disable saving files to disk</_summary>
- <_description>Prevent the user from saving files to disk. For example, this would disable access to all applications' "Save as" dialogs.</_description>
- </key>
- <key name="disable-printing" type="b">
- <default>false</default>
- <_summary>Disable printing</_summary>
- <_description>Prevent the user from printing. For example, this would disable access to all applications' "Print" dialogs.</_description>
- </key>
- <key name="disable-print-setup" type="b">
- <default>false</default>
- <_summary>Disable print setup</_summary>
- <_description>Prevent the user from modifying print settings. For example, this would disable access to all applications' "Print Setup" dialogs.</_description>
- </key>
- <key name="disable-user-switching" type="b">
- <default>false</default>
- <_summary>Disable user switching</_summary>
- <_description>Prevent the user from switching to another account while his session is active.</_description>
- </key>
- <key name="disable-lock-screen" type="b">
- <default>false</default>
- <_summary>Disable lock screen</_summary>
- <_description>Prevent the user from locking the screen.</_description>
- </key>
- <key name="disable-application-handlers" type="b">
- <default>false</default>
- <_summary>Disable URL and MIME type handlers</_summary>
- <_description>Prevent running any URL or MIME type handler applications.</_description>
- </key>
- <key name="disable-theme-settings" type="b">
- <default>false</default>
- <_summary>Disable theme settings</_summary>
- <_description>Prevent the user from changing theme settings.</_description>
- </key>
- <key name="disable-log-out" type="b">
- <default>false</default>
- <_summary>Disable log out</_summary>
- <_description>Prevent the user from logging out.</_description>
- </key>
- </schema>
-</schemalist>
diff --git a/schemas/org.mate.peripherals-keyboard.gschema.xml.in.in b/schemas/org.mate.peripherals-keyboard.gschema.xml.in
index ebe4d5e..7143f2d 100644
--- a/schemas/org.mate.peripherals-keyboard.gschema.xml.in.in
+++ b/schemas/org.mate.peripherals-keyboard.gschema.xml.in
@@ -22,7 +22,7 @@
</key>
<key name="bell-mode" type="s">
<default>'on'</default>
- <_description>possible values are "on", "off", and "custom".</_description>
+ <description>possible values are "on", "off", and "custom".</description>
</key>
<key name="bell-pitch" type="i">
<default>400</default>
@@ -32,18 +32,18 @@
</key>
<key name="bell-custom-file" type="s">
<default>''</default>
- <_summary>Keyboard Bell Custom Filename</_summary>
- <_description>File name of the bell sound to be played.</_description>
+ <summary>Keyboard Bell Custom Filename</summary>
+ <description>File name of the bell sound to be played.</description>
</key>
<key name="remember-numlock-state" type="b">
<default>true</default>
- <_summary>Remember NumLock state</_summary>
- <_description>When set to true, MATE will remember the state of the NumLock LED between sessions.</_description>
+ <summary>Remember NumLock state</summary>
+ <description>When set to true, MATE will remember the state of the NumLock LED between sessions.</description>
</key>
<key name="numlock-state" enum="org.mate.peripherals-keyboard.NumLockState">
<default>'unknown'</default>
- <_summary>NumLock state</_summary>
- <_description>The remembered state of the NumLock LED.</_description>
+ <summary>NumLock state</summary>
+ <description>The remembered state of the NumLock LED.</description>
</key>
</schema>
</schemalist>
diff --git a/schemas/org.mate.peripherals-mouse.gschema.xml.in b/schemas/org.mate.peripherals-mouse.gschema.xml.in
new file mode 100644
index 0000000..aab83e8
--- /dev/null
+++ b/schemas/org.mate.peripherals-mouse.gschema.xml.in
@@ -0,0 +1,54 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.mate.peripherals-mouse" path="/org/mate/desktop/peripherals/mouse/">
+ <key name="left-handed" type="b">
+ <default>false</default>
+ <summary>Mouse button orientation</summary>
+ <description>Swap left and right mouse buttons for left-handed mice.</description>
+ </key>
+ <key name="motion-acceleration" type="d">
+ <default>-1</default>
+ <summary>Single Click</summary>
+ <description>Acceleration multiplier for mouse motion. A value of -1 is the system default.</description>
+ </key>
+ <key name="motion-threshold" type="i">
+ <default>-1</default>
+ <summary>Motion Threshold</summary>
+ <description>Distance in pixels the pointer must move before accelerated mouse motion is activated. A value of -1 is the system default.</description>
+ </key>
+ <key name="drag-threshold" type="i">
+ <default>8</default>
+ <summary>Drag Threshold</summary>
+ <description>Distance before a drag is started.</description>
+ </key>
+ <key name="double-click" type="i">
+ <default>400</default>
+ <summary>Double Click Time</summary>
+ <description>Length of a double click.</description>
+ </key>
+ <key name="middle-button-enabled" type="b">
+ <default>true</default>
+ <summary>Middle button emulation</summary>
+ <description>Enables middle mouse button emulation through simultaneous left and right button click.</description>
+ </key>
+ <key name="locate-pointer" type="b">
+ <default>false</default>
+ <summary>Locate Pointer</summary>
+ <description>Highlights the current location of the pointer when the Control key is pressed and released.</description>
+ </key>
+ <key name="cursor-font" type="s">
+ <default>''</default>
+ <summary>Cursor font</summary>
+ <description>Font name of the cursor. If unset, the default font is used. This value is only propagated to the X server start of each session, so changing it mid-session won't have an effect until the next time you log in.</description>
+ </key>
+ <key name="cursor-theme" type="s">
+ <default>''</default>
+ <summary>Cursor theme</summary>
+ <description>Cursor theme name. Used only by Xservers that support Xcursor, such as XFree86 4.3 and later.</description>
+ </key>
+ <key name="cursor-size" type="i">
+ <default>18</default>
+ <summary>Cursor size</summary>
+ <description>Size of the cursor referenced by cursor_theme.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/schemas/org.mate.peripherals-mouse.gschema.xml.in.in b/schemas/org.mate.peripherals-mouse.gschema.xml.in.in
deleted file mode 100644
index 3817d9d..0000000
--- a/schemas/org.mate.peripherals-mouse.gschema.xml.in.in
+++ /dev/null
@@ -1,59 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
- <schema id="org.mate.peripherals-mouse" path="/org/mate/desktop/peripherals/mouse/">
- <key name="left-handed" type="b">
- <default>false</default>
- <_summary>Mouse button orientation</_summary>
- <_description>Swap left and right mouse buttons for left-handed mice.</_description>
- </key>
- <key name="single-click" type="b">
- <default>true</default>
- <_summary>Single Click</_summary>
- <_description>Single click to open icons.</_description>
- </key>
- <key name="motion-acceleration" type="d">
- <default>-1</default>
- <_summary>Single Click</_summary>
- <_description>Acceleration multiplier for mouse motion. A value of -1 is the system default.</_description>
- </key>
- <key name="motion-threshold" type="i">
- <default>-1</default>
- <_summary>Motion Threshold</_summary>
- <_description>Distance in pixels the pointer must move before accelerated mouse motion is activated. A value of -1 is the system default.</_description>
- </key>
- <key name="drag-threshold" type="i">
- <default>8</default>
- <_summary>Drag Threshold</_summary>
- <_description>Distance before a drag is started.</_description>
- </key>
- <key name="double-click" type="i">
- <default>400</default>
- <_summary>Double Click Time</_summary>
- <_description>Length of a double click.</_description>
- </key>
- <key name="middle-button-enabled" type="b">
- <default>true</default>
- <_summary>Middle button emulation</_summary>
- <_description>Enables middle mouse button emulation through simultaneous left and right button click.</_description>
- </key>
- <key name="locate-pointer" type="b">
- <default>false</default>
- <_summary>Locate Pointer</_summary>
- <_description>Highlights the current location of the pointer when the Control key is pressed and released.</_description>
- </key>
- <key name="cursor-font" type="s">
- <default>''</default>
- <_summary>Cursor font</_summary>
- <_description>Font name of the cursor. If unset, the default font is used. This value is only propagated to the X server start of each session, so changing it mid-session won't have an effect until the next time you log in.</_description>
- </key>
- <key name="cursor-theme" type="s">
- <default>''</default>
- <_summary>Cursor theme</_summary>
- <_description>Cursor theme name. Used only by Xservers that support Xcursor, such as XFree86 4.3 and later.</_description>
- </key>
- <key name="cursor-size" type="i">
- <default>18</default>
- <_summary>Cursor size</_summary>
- <_description>Size of the cursor referenced by cursor_theme.</_description>
- </key>
- </schema>
-</schemalist>
diff --git a/schemas/org.mate.sound.gschema.xml.in b/schemas/org.mate.sound.gschema.xml.in
new file mode 100644
index 0000000..7117689
--- /dev/null
+++ b/schemas/org.mate.sound.gschema.xml.in
@@ -0,0 +1,34 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.mate.sound" path="/org/mate/desktop/sound/">
+ <key name="default-mixer-device" type="s">
+ <default>''</default>
+ <summary>Default mixer device</summary>
+ <description>The default mixer device used by the multimedia key bindings.</description>
+ </key>
+ <key name="default-mixer-tracks" type="as">
+ <default>[]</default>
+ <summary>Default mixer tracks</summary>
+ <description>The default mixer tracks used by the multimedia key bindings.</description>
+ </key>
+ <key name="enable-esd" type="b">
+ <default>false</default>
+ <summary>Enable ESD</summary>
+ <description>Enable sound server startup.</description>
+ </key>
+ <key name="event-sounds" type="b">
+ <default>false</default>
+ <summary>Sounds for events</summary>
+ <description>Whether to play sounds on user events.</description>
+ </key>
+ <key name="theme-name" type="s">
+ <default>'freedesktop'</default>
+ <summary>Sound theme name</summary>
+ <description>The XDG sound theme to use for event sounds.</description>
+ </key>
+ <key name="input-feedback-sounds" type="b">
+ <default>false</default>
+ <summary>Input feedback sounds</summary>
+ <description>Whether to play sounds on input events.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/schemas/org.mate.sound.gschema.xml.in.in b/schemas/org.mate.sound.gschema.xml.in.in
deleted file mode 100644
index ad412b8..0000000
--- a/schemas/org.mate.sound.gschema.xml.in.in
+++ /dev/null
@@ -1,34 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
- <schema id="org.mate.sound" path="/org/mate/desktop/sound/">
- <key name="default-mixer-device" type="s">
- <default>''</default>
- <_summary>Default mixer device</_summary>
- <_description>The default mixer device used by the multimedia key bindings.</_description>
- </key>
- <key name="default-mixer-tracks" type="as">
- <default>[]</default>
- <_summary>Default mixer tracks</_summary>
- <_description>The default mixer tracks used by the multimedia key bindings.</_description>
- </key>
- <key name="enable-esd" type="b">
- <default>false</default>
- <_summary>Enable ESD</_summary>
- <_description>Enable sound server startup.</_description>
- </key>
- <key name="event-sounds" type="b">
- <default>false</default>
- <_summary>Sounds for events</_summary>
- <_description>Whether to play sounds on user events.</_description>
- </key>
- <key name="theme-name" type="s">
- <default>'freedesktop'</default>
- <_summary>Sound theme name</_summary>
- <_description>The XDG sound theme to use for event sounds.</_description>
- </key>
- <key name="input-feedback-sounds" type="b">
- <default>false</default>
- <_summary>Input feedback sounds</_summary>
- <_description>Whether to play sounds on input events.</_description>
- </key>
- </schema>
-</schemalist>
diff --git a/schemas/org.mate.thumbnail-cache.gschema.xml.in.in b/schemas/org.mate.thumbnail-cache.gschema.xml.in
index 9c240ad..eebbe5d 100644
--- a/schemas/org.mate.thumbnail-cache.gschema.xml.in.in
+++ b/schemas/org.mate.thumbnail-cache.gschema.xml.in
@@ -2,11 +2,11 @@
<schema id="org.mate.thumbnail-cache" path="/org/mate/desktop/thumbnail-cache/">
<key name="maximum-age" type="i">
<default>180</default>
- <_description>Maximum age for thumbnails in the cache, in days. Set to -1 to disable cleaning.</_description>
+ <description>Maximum age for thumbnails in the cache, in days. Set to -1 to disable cleaning.</description>
</key>
<key name="maximum-size" type="i">
<default>512</default>
- <_description>Maximum size of the thumbnail cache, in megabytes. Set to -1 to disable cleaning.</_description>
+ <description>Maximum size of the thumbnail cache, in megabytes. Set to -1 to disable cleaning.</description>
</key>
</schema>
</schemalist>
diff --git a/schemas/org.mate.thumbnailers.gschema.xml.in b/schemas/org.mate.thumbnailers.gschema.xml.in
new file mode 100644
index 0000000..3f0f099
--- /dev/null
+++ b/schemas/org.mate.thumbnailers.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.mate.thumbnailers" path="/org/mate/desktop/thumbnailers/">
+ <key name="disable-all" type="b">
+ <default>false</default>
+ <summary>Disable all external thumbnailers</summary>
+ <description>Set to true to disable all external thumbnailer programs, independent on whether they are independently disabled/enabled.</description>
+ </key>
+ <key name="disable" type="as">
+ <default>[]</default>
+ <summary>List of mime-types for which external thumbnailer programs will be disabled</summary>
+ <description>Thumbnails will not be created for files whose mime-type is contained in the list.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/schemas/org.mate.thumbnailers.gschema.xml.in.in b/schemas/org.mate.thumbnailers.gschema.xml.in.in
deleted file mode 100644
index 7d7eb56..0000000
--- a/schemas/org.mate.thumbnailers.gschema.xml.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
- <schema id="org.mate.thumbnailers" path="/org/mate/desktop/thumbnailers/">
- <key name="disable-all" type="b">
- <default>false</default>
- <_summary>Disable all external thumbnailers</_summary>
- <_description>Set to true to disable all external thumbnailer programs, independent on whether they are independently disabled/enabled.</_description>
- </key>
- <key name="disable" type="as">
- <default>[]</default>
- <_summary>List of mime-types for which external thumbnailer programs will be disabled</_summary>
- <_description>Thumbnails will not be created for files whose mime-type is contained in the list.</_description>
- </key>
- </schema>
-</schemalist>
diff --git a/schemas/org.mate.typing-break.gschema.xml.in b/schemas/org.mate.typing-break.gschema.xml.in
new file mode 100644
index 0000000..5420e84
--- /dev/null
+++ b/schemas/org.mate.typing-break.gschema.xml.in
@@ -0,0 +1,24 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.mate.typing-break" path="/org/mate/desktop/typing-break/">
+ <key name="type-time" type="i">
+ <default>60</default>
+ <summary>Type time</summary>
+ <description>Number of minutes of typing time before break mode starts.</description>
+ </key>
+ <key name="break-time" type="i">
+ <default>3</default>
+ <summary>Break time</summary>
+ <description>Number of minutes that the typing break should last.</description>
+ </key>
+ <key name="allow-postpone" type="b">
+ <default>false</default>
+ <summary>Allow postponing of breaks</summary>
+ <description>Whether or not the typing break screen can be postponed.</description>
+ </key>
+ <key name="enabled" type="b">
+ <default>false</default>
+ <summary>Whether or not keyboard locking is enabled</summary>
+ <description>Whether or not keyboard locking is enabled.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/schemas/org.mate.typing-break.gschema.xml.in.in b/schemas/org.mate.typing-break.gschema.xml.in.in
deleted file mode 100644
index 3da4086..0000000
--- a/schemas/org.mate.typing-break.gschema.xml.in.in
+++ /dev/null
@@ -1,24 +0,0 @@
-<schemalist gettext-domain="@GETTEXT_PACKAGE@">
- <schema id="org.mate.typing-break" path="/org/mate/desktop/typing-break/">
- <key name="type-time" type="i">
- <default>60</default>
- <_summary>Type time</_summary>
- <_description>Number of minutes of typing time before break mode starts.</_description>
- </key>
- <key name="break-time" type="i">
- <default>3</default>
- <_summary>Break time</_summary>
- <_description>Number of minutes that the typing break should last.</_description>
- </key>
- <key name="allow-postpone" type="b">
- <default>false</default>
- <_summary>Allow postponing of breaks</_summary>
- <_description>Whether or not the typing break screen can be postponed.</_description>
- </key>
- <key name="enabled" type="b">
- <default>false</default>
- <_summary>Whether or not keyboard locking is enabled</_summary>
- <_description>Whether or not keyboard locking is enabled.</_description>
- </key>
- </schema>
-</schemalist>
diff --git a/tools/mate-color-select.c b/tools/mate-color-select.c
index 5870ab3..73af718 100644
--- a/tools/mate-color-select.c
+++ b/tools/mate-color-select.c
@@ -58,6 +58,7 @@ main (int argc, char **argv)
/* initialize GTK+ */
gtk_init (&argc, &argv);
+ gtk_window_set_default_icon_name ("gtk-select-color");
color_dialog = mate_color_selection_dialog_new (_("MATE Color Selection"));
mate_color_selection_set_has_palette (MATE_COLOR_SELECTION_DIALOG (color_dialog)->colorsel, TRUE);
diff --git a/tools/mate-color-select.desktop.in.in b/tools/mate-color-select.desktop.in.in
index 99020b6..458ab6e 100644
--- a/tools/mate-color-select.desktop.in.in
+++ b/tools/mate-color-select.desktop.in.in
@@ -3,7 +3,7 @@ _Name=MATE Color Selection
_GenericName=Color selection dialog
_Comment=Choose colors from the palette or the screen
Exec=mate-color-select
-Icon=gcolor2
+Icon=gtk-select-color
Terminal=false
Type=Application
Categories=GTK;Graphics;