gnome-control-center r9038 - trunk/libwindow-settings

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Oct  6 17:36:44 2008
New Revision: 9038
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9038&view=rev

Log:
2008-10-06  Matthias Clasen  <mclasen redhat com>

        Bug 554962 â maixmize horizontally/vertically doesn't work with
        metacity

        * metacity-window-manager.c: Use the right values for the
        h/v maximization titlebar doubleclick action.



Modified:
   trunk/libwindow-settings/ChangeLog
   trunk/libwindow-settings/metacity-window-manager.c

Modified: trunk/libwindow-settings/metacity-window-manager.c
==============================================================================
--- trunk/libwindow-settings/metacity-window-manager.c	(original)
+++ trunk/libwindow-settings/metacity-window-manager.c	Mon Oct  6 17:36:44 2008
@@ -214,10 +214,10 @@
                         action = "toggle_maximize";
                         break;
                 case DOUBLE_CLICK_MAXIMIZE_VERTICALLY:
-                        action = "toggle_maximize_vert";
+                        action = "toggle_maximize_vertically";
                         break;
                 case DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY:
-                        action = "toggle_maximize_horiz";
+                        action = "toggle_maximize_horizontally";
                         break;
                 case DOUBLE_CLICK_MINIMIZE:
                         action = "minimize";
@@ -370,9 +370,11 @@
                         settings->double_click_action = DOUBLE_CLICK_SHADE;
                 else if (strcmp (str, "toggle_maximize") == 0)
                         settings->double_click_action = DOUBLE_CLICK_MAXIMIZE;
-                else if (strcmp (str, "toggle_maximize_horiz") == 0)
+                else if (strcmp (str, "toggle_maximize_horizontally") == 0 ||
+                         strcmp (str, "toggle_maximize_horiz") == 0)
                         settings->double_click_action = DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY;
-                else if (strcmp (str, "toggle_maximize_vert") == 0)
+                else if (strcmp (str, "toggle_maximize_vertically") == 0 ||
+                         strcmp (str, "toggle_maximize_vert") == 0)
                         settings->double_click_action = DOUBLE_CLICK_MAXIMIZE_VERTICALLY;
                 else if (strcmp (str, "minimize") == 0)
                         settings->double_click_action = DOUBLE_CLICK_MINIMIZE;