Permalink
Browse files

Fix signal arguments problem, enable 'scale' option on window unmaxim…

…ize.
  • Loading branch information...
1 parent daa013d commit f4bec7080fa9787a2aba0da19cc57e95730880d6 @mtwebster mtwebster committed Sep 1, 2012
Showing with 3 additions and 3 deletions.
  1. +2 −2 files/usr/lib/cinnamon-settings/cinnamon-settings.py
  2. +1 −1 src/cinnamon-wm.c
@@ -1744,7 +1744,7 @@ def __init__(self):
label = Gtk.Label()
label.set_markup("%s" % _("Maximizing windows:"))
box.pack_start(label, False, False, 0)
- effects = [["none", _("None")], ["scale", _("Scale")]]
+ effects = [["none", _("None")], ["scale", _("Scale")]]
combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-maximize-effect", effects)
box.pack_start(combo, False, False, 0)
combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-maximize-transition", transition_effects)
@@ -1758,7 +1758,7 @@ def __init__(self):
label = Gtk.Label()
label.set_markup("%s" % _("Unmaximizing windows:"))
box.pack_start(label, False, False, 0)
- effects = [["none", _("None")]]
+ effects = [["none", _("None")], ["scale", _("Scale")]]
combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-unmaximize-effect", effects)
box.pack_start(combo, False, False, 0)
combo = GSettingsComboBox("", "org.cinnamon", "desktop-effects-unmaximize-transition", transition_effects)
View
@@ -78,7 +78,7 @@ cinnamon_wm_class_init (CinnamonWMClass *klass)
0,
NULL, NULL,
_cinnamon_marshal_VOID__OBJECT_INT_INT_INT_INT,
- G_TYPE_NONE, 1,
+ G_TYPE_NONE, 5,
META_TYPE_WINDOW_ACTOR, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
cinnamon_wm_signals[MAP] =
g_signal_new ("map",

0 comments on commit f4bec70

Please sign in to comment.