[Pkg-xfce-commits] r8928 - in /desktop/trunk/xfwm4/debian: changelog patches/ patches/fix-a-mishmash-between-width-and-height.patch patches/series

[Mateusz Łukasik]

Author: mati75-guest
Date: Sun Mar 15 13:41:32 2015
New Revision: 8928

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8928
Log:
Add fix-a-mishmash-between-width-and-height.patch from upstream.

Added:
    desktop/trunk/xfwm4/debian/patches/
    desktop/trunk/xfwm4/debian/patches/fix-a-mishmash-between-width-and-height.patch
    desktop/trunk/xfwm4/debian/patches/series
Modified:
    desktop/trunk/xfwm4/debian/changelog

Modified: desktop/trunk/xfwm4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfwm4/debian/changelog?rev=8928&op=diff
==============================================================================
--- desktop/trunk/xfwm4/debian/changelog	(original)
+++ desktop/trunk/xfwm4/debian/changelog	Sun Mar 15 13:41:32 2015
@@ -1,6 +1,10 @@
 xfwm4 (4.12.1-1) UNRELEASED; urgency=medium
 
+  [ Yves-Alexis Perez ]
   * New upstream stable release.
+
+  [ Mateusz Łukasik ]
+  * Add fix-a-mishmash-between-width-and-height.patch from upstream.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 15 Mar 2015 10:16:50 +0100
 

Added: desktop/trunk/xfwm4/debian/patches/fix-a-mishmash-between-width-and-height.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfwm4/debian/patches/fix-a-mishmash-between-width-and-height.patch?rev=8928&op=file
==============================================================================
--- desktop/trunk/xfwm4/debian/patches/fix-a-mishmash-between-width-and-height.patch	(added)
+++ desktop/trunk/xfwm4/debian/patches/fix-a-mishmash-between-width-and-height.patch	Sun Mar 15 13:41:32 2015
@@ -0,0 +1,34 @@
+From adcf17fe8a136c89196f952185056c12c3829a01 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan at xfce.org>
+Date: Sun, 15 Mar 2015 11:24:15 +0100
+Subject: Fix a mishmash between width and height
+
+Bug: 11700
+
+Duh...
+
+Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
+
+diff --git a/src/client.c b/src/client.c
+index 7fa9e36..38ecc6f 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -543,12 +543,12 @@ clientAdjustCoordGravity (Client *c, int gravity, XWindowChanges *wc, unsigned l
+ 
+     if (*mask & CWWidth)
+     {
+-        wc->width = clientCheckHeight (c, wc->width, TRUE);
++        wc->width = clientCheckWidth (c, wc->width, TRUE);
+     }
+ 
+-    if (*mask & CWWidth)
++    if (*mask & CWHeight)
+     {
+-        wc->height = clientCheckWidth (c, wc->height, TRUE);
++        wc->height = clientCheckHeight (c, wc->height, TRUE);
+     }
+ 
+     switch (gravity)
+-- 
+cgit v0.10.1
+

Added: desktop/trunk/xfwm4/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfwm4/debian/patches/series?rev=8928&op=file
==============================================================================
--- desktop/trunk/xfwm4/debian/patches/series	(added)
+++ desktop/trunk/xfwm4/debian/patches/series	Sun Mar 15 13:41:32 2015
@@ -0,0 +1 @@
+fix-a-mishmash-between-width-and-height.patch