rpms/control-center/devel hv-max.patch, NONE, 1.1 control-center.spec, 1.398, 1.399

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29641

Modified Files:
	control-center.spec 
Added Files:
	hv-max.patch 
Log Message:
fix horizontal/vertical maximzation preferences


hv-max.patch:

--- NEW FILE hv-max.patch ---
diff -up gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c.hv-max gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c
--- gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c.hv-max	2008-10-04 02:01:24.000000000 -0400
+++ gnome-control-center-2.24.0.1/libwindow-settings/metacity-window-manager.c	2008-10-04 02:02:53.000000000 -0400
@@ -214,10 +214,10 @@ metacity_change_settings (GnomeWindowMan
                         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 @@ metacity_get_settings (GnomeWindowManage
                         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;


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.398
retrieving revision 1.399
diff -u -r1.398 -r1.399
--- control-center.spec	4 Oct 2008 05:44:06 -0000	1.398
+++ control-center.spec	4 Oct 2008 06:12:07 -0000	1.399
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.24.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -43,6 +43,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=554957
 Patch28: capplet-help.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=554962
+Patch29: hv-max.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: control-center-2.23.2-passwd.patch
 Patch96: control-center-2.23.2-gecos.patch
@@ -169,6 +172,7 @@
 %patch22 -p0 -b .slab-icon-names
 %patch25 -p1 -b .ta-schema
 %patch28 -p1 -b .capplet-help
+%patch29 -p1 -b .hv-max
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -338,6 +342,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Sat Oct  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-4
+- Fix horizontal/vertical maximization preference
+
 * Sat Oct  4 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.0.1-3
 - Fix help buttons in the appearance capplet