[Xfce4-commits] [xfce/xfwm4] 01/01: Fix compiler warnings

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfwm4.

commit a9f42807876caebc3c223651c1dee0275af0356e
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Sat Mar 14 23:16:59 2015 +0100

    Fix compiler warnings
    
    And other missing bits.
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/moveresize.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/moveresize.c b/src/moveresize.c
index 515b169..c605b17 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -93,7 +93,7 @@ clientCheckSize (Client * c, int size, int base, int min, int max, int incr, gbo
 {
     int size_return;
 
-    g_return_if_fail (c != NULL);
+    g_return_val_if_fail (c != NULL, size);
     TRACE ("entering clientCheckSize");
 
     size_return = size;
@@ -143,7 +143,7 @@ clientCheckSize (Client * c, int size, int base, int min, int max, int incr, gbo
 int
 clientCheckWidth (Client * c, int w, gboolean source_is_application)
 {
-    g_return_if_fail (c != NULL);
+    g_return_val_if_fail (c != NULL, w);
     TRACE ("entering clientCheckWidth");
     TRACE ("setting width %i for client \"%s\" (0x%lx)", w, c->name, c->window);
 
@@ -158,7 +158,7 @@ clientCheckWidth (Client * c, int w, gboolean source_is_application)
 int
 clientCheckHeight (Client * c, int h, gboolean source_is_application)
 {
-    g_return_if_fail (c != NULL);
+    g_return_val_if_fail (c != NULL, h);
     TRACE ("entering clientCheckHeight");
     TRACE ("setting height %i for client \"%s\" (0x%lx)", h, c->name, c->window);
 
@@ -1603,13 +1603,13 @@ clientResizeEventFilter (XEvent * xevent, gpointer data)
         /* Apply contrain ratio if any, only once the expected size is set */
         clientConstrainRatio (c, passdata->handle);
 
-        clientCheckWidth (c, c->width, FALSE);
+        c->width = clientCheckWidth (c, c->width, FALSE);
         if (move_left)
         {
             c->x = right_edge - c->width;
         }
 
-        clientCheckHeight (c, c->height, FALSE);
+        c->height = clientCheckHeight (c, c->height, FALSE);
         if (move_top && !FLAG_TEST (c->flags, CLIENT_FLAG_SHADED))
         {
             c->y =  bottom_edge - c->height;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.