summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-03-24 22:16:36 +0100
committerStefano Karapetsas <[email protected]>2013-03-24 22:16:36 +0100
commitcfe1f6740406576310ae3754e68f0b70033fb6f6 (patch)
tree7fc7fae27fa8e3ad49c97452cb06961618f16325
parent095df2cf62ea1e83dc878d0a813a94ffcc7f9176 (diff)
parent5425679e415acf70ec1ea636696e303efb0516f0 (diff)
downloadmate-netbook-cfe1f6740406576310ae3754e68f0b70033fb6f6.tar.bz2
mate-netbook-cfe1f6740406576310ae3754e68f0b70033fb6f6.tar.xz
Merge branch 'master' of github.com:mate-desktop/mate-netbook
-rw-r--r--mate-window-picker-applet/Makefile.am4
-rw-r--r--mate-window-picker-applet/mate-window-picker-applet.convert2
-rw-r--r--maximus/Makefile.am5
-rw-r--r--maximus/mate-maximus.convert5
4 files changed, 15 insertions, 1 deletions
diff --git a/mate-window-picker-applet/Makefile.am b/mate-window-picker-applet/Makefile.am
index 74d642b..d1113d6 100644
--- a/mate-window-picker-applet/Makefile.am
+++ b/mate-window-picker-applet/Makefile.am
@@ -52,6 +52,9 @@ gsettings_SCHEMAS = org.mate.panel.applet.mate-window-picker-applet.gschema.xml
%.gschema.xml.in: %.gschema.xml.in.in Makefile
$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
+convertdir = $(datadir)/MateConf/gsettings
+convert_DATA = mate-window-picker-applet.convert
+
xmluidir = $(datadir)/mate-panel/ui
xmlui_DATA = mate-window-picker-applet-menu.xml
@@ -59,6 +62,7 @@ EXTRA_DIST = \
org.mate.panel.MateWindowPicker.panel-applet.in.in \
$(service_in_files) \
$(ui_DATA) \
+ $(convert_DATA) \
$(gsettings_SCHEMAS_in_in)
CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS)
diff --git a/mate-window-picker-applet/mate-window-picker-applet.convert b/mate-window-picker-applet/mate-window-picker-applet.convert
new file mode 100644
index 0000000..ba733fe
--- /dev/null
+++ b/mate-window-picker-applet/mate-window-picker-applet.convert
@@ -0,0 +1,2 @@
+[org.mate.panel.applet.mate-window-picker-applet]
+show-all-windows = /apps/mate-window-picker-applet/prefs/show_all_windows
diff --git a/maximus/Makefile.am b/maximus/Makefile.am
index 265f76f..884fb22 100644
--- a/maximus/Makefile.am
+++ b/maximus/Makefile.am
@@ -37,7 +37,10 @@ gsettings_SCHEMAS = org.mate.maximus.gschema.xml
%.gschema.xml.in: %.gschema.xml.in.in Makefile
$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
+convertdir = $(datadir)/MateConf/gsettings
+convert_DATA = mate-maximus.convert
+
desktopdir=$(sysconfdir)/xdg/autostart
dist_desktop_DATA=mate-maximus-autostart.desktop
-EXTRA_DIST = $(schema_DATA)
+EXTRA_DIST = $(schema_DATA) $(convert_DATA)
diff --git a/maximus/mate-maximus.convert b/maximus/mate-maximus.convert
new file mode 100644
index 0000000..e640b95
--- /dev/null
+++ b/maximus/mate-maximus.convert
@@ -0,0 +1,5 @@
+[org.mate.maximus]
+exclude-class = /apps/maximus/exclude_class
+binding = /apps/maximus/binding
+undecorate = /apps/maximus/undecorate
+no-maximize = /apps/maximus/no_maximize