summaryrefslogtreecommitdiff
path: root/maximus
diff options
context:
space:
mode:
Diffstat (limited to 'maximus')
-rw-r--r--maximus/Makefile.am8
-rw-r--r--maximus/mate-maximus-autostart.desktop1
-rw-r--r--maximus/maximus-app.c4
-rw-r--r--maximus/maximus-bind.c4
4 files changed, 11 insertions, 6 deletions
diff --git a/maximus/Makefile.am b/maximus/Makefile.am
index 884fb22..139c675 100644
--- a/maximus/Makefile.am
+++ b/maximus/Makefile.am
@@ -32,6 +32,8 @@ mate_maximus_SOURCES = \
@INTLTOOL_XML_NOMERGE_RULE@
gsettings_SCHEMAS = org.mate.maximus.gschema.xml
+
+gsettings_SCHEMAS_in_in = $(gsettings_SCHEMAS:.xml=.xml.in.in)
@GSETTINGS_RULES@
%.gschema.xml.in: %.gschema.xml.in.in Makefile
@@ -43,4 +45,8 @@ convert_DATA = mate-maximus.convert
desktopdir=$(sysconfdir)/xdg/autostart
dist_desktop_DATA=mate-maximus-autostart.desktop
-EXTRA_DIST = $(schema_DATA) $(convert_DATA)
+CLEANFILES = $(gsettings_SCHEMAS) \
+ $(gsettings_SCHEMAS_in)
+
+
+EXTRA_DIST = $(gsettings_SCHEMAS_in_in) $(convert_DATA)
diff --git a/maximus/mate-maximus-autostart.desktop b/maximus/mate-maximus-autostart.desktop
index c2c85a2..55f80bd 100644
--- a/maximus/mate-maximus-autostart.desktop
+++ b/maximus/mate-maximus-autostart.desktop
@@ -8,5 +8,4 @@ Terminal=false
Type=Application
Categories=
OnlyShowIn=MATE;
-X-MATE-Autostart-Phase=Desktop
X-MATE-Autostart-Notify=false
diff --git a/maximus/maximus-app.c b/maximus/maximus-app.c
index 334cca5..a51147d 100644
--- a/maximus/maximus-app.c
+++ b/maximus/maximus-app.c
@@ -306,7 +306,7 @@ is_excluded (MaximusApp *app, MatewnckWindow *window)
/* Make sure the window supports maximising */
actions = matewnck_window_get_actions (window);
if (actions & MATEWNCK_WINDOW_ACTION_RESIZE
- && actions & MATEWNCK_WINDOW_ACTION_MAXIMIZE_HORIZONTALLY
+ && actions & MATEWNCK_WINDOW_ACTION_MAXIMIZE_HORIZONTALLY
&& actions & MATEWNCK_WINDOW_ACTION_MAXIMIZE_VERTICALLY
&& actions & MATEWNCK_WINDOW_ACTION_MAXIMIZE)
; /* Is good to maximise */
@@ -349,7 +349,7 @@ is_excluded (MaximusApp *app, MatewnckWindow *window)
extern gboolean no_maximize;
static void
-on_window_opened (MatewnckScreen *screen,
+on_window_opened (MatewnckScreen *screen,
MatewnckWindow *window,
MaximusApp *app)
{
diff --git a/maximus/maximus-bind.c b/maximus/maximus-bind.c
index b58cbc1..543834a 100644
--- a/maximus/maximus-bind.c
+++ b/maximus/maximus-bind.c
@@ -146,7 +146,7 @@ real_fullscreen (MaximusBind *bind)
display = gdk_display_get_default ();
active = matewnck_screen_get_active_window (priv->screen);
- if (!MATEWNCK_IS_WINDOW (active)
+ if (!MATEWNCK_IS_WINDOW (active)
|| matewnck_window_get_window_type (active) != MATEWNCK_WINDOW_NORMAL)
return FALSE;
@@ -220,7 +220,7 @@ real_unfullscreen (MaximusBind *bind)
display = gdk_display_get_default ();
active = matewnck_screen_get_active_window (priv->screen);
- if (!MATEWNCK_IS_WINDOW (active)
+ if (!MATEWNCK_IS_WINDOW (active)
|| matewnck_window_get_window_type (active) != MATEWNCK_WINDOW_NORMAL)
return FALSE;