[Xfce4-commits] <xfwm4:master> Typos and type checking, thanks buildbot :)

[Olivier Fourdan]

Updating branch refs/heads/master
         to aea1dad9abf963701b5d96144483bab450673f0e (commit)
       from 7c33b2ee5005bd2394802a83eee9e379af103b4e (commit)

commit aea1dad9abf963701b5d96144483bab450673f0e
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Mon Oct 12 14:03:20 2009 +0200

    Typos and type checking, thanks buildbot :)

 src/events.c |   10 +++++-----
 src/screen.c |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/events.c b/src/events.c
index 4e6a400..2a30381 100644
--- a/src/events.c
+++ b/src/events.c
@@ -1942,7 +1942,7 @@ handleClientMessage (DisplayInfo *display_info, XClientMessageEvent * ev)
         else if ((ev->message_type == display_info->atoms[WIN_WORKSPACE]) && (ev->format == 32))
         {
             TRACE ("client \"%s\" (0x%lx) has received a WIN_WORKSPACE event", c->name, c->window);
-            if (ev->data.l[0] != (guint) c->win_workspace)
+            if (ev->data.l[0] != (long) c->win_workspace)
             {
                 clientSetWorkspace (c, (guint) ev->data.l[0], TRUE);
             }
@@ -1965,7 +1965,7 @@ handleClientMessage (DisplayInfo *display_info, XClientMessageEvent * ev)
                     clientUnstick (c, TRUE);
                     frameQueueDraw (c, FALSE);
                 }
-                if (ev->data.l[0] != (guint) c->win_workspace)
+                if (ev->data.l[0] != (long) c->win_workspace)
                 {
                     clientSetWorkspace (c, (guint) ev->data.l[0], TRUE);
                 }
@@ -2022,8 +2022,8 @@ handleClientMessage (DisplayInfo *display_info, XClientMessageEvent * ev)
              (ev->message_type == display_info->atoms[NET_CURRENT_DESKTOP])) && (ev->format == 32))
         {
             TRACE ("root has received a win_workspace or a NET_CURRENT_DESKTOP event %li", ev->data.l[0]);
-            if ((ev->data.l[0] >= 0) && (ev->data.l[0] < screen_info->workspace_count) &&
-                (ev->data.l[0] != screen_info->current_ws))
+            if ((ev->data.l[0] >= 0) && (ev->data.l[0] < (long) screen_info->workspace_count) &&
+                (ev->data.l[0] != (long) screen_info->current_ws))
             {
                 workspaceSwitch (screen_info, ev->data.l[0], NULL, TRUE,
                                  myDisplayGetTime (display_info, (guint32) ev->data.l[1]));
@@ -2033,7 +2033,7 @@ handleClientMessage (DisplayInfo *display_info, XClientMessageEvent * ev)
                   (ev->message_type == display_info->atoms[NET_NUMBER_OF_DESKTOPS])) && (ev->format == 32))
         {
             TRACE ("root has received a win_workspace_count event");
-            if (ev->data.l[0] != screen_info->workspace_count)
+            if (ev->data.l[0] != (long) screen_info->workspace_count)
             {
                 workspaceSetCount (screen_info, ev->data.l[0]);
                 getDesktopLayout(display_info, screen_info->xroot, screen_info->workspace_count, &screen_info->desktop_layout);
diff --git a/src/screen.c b/src/screen.c
index 2d39a77..402b5a6 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -593,7 +593,7 @@ myScreenComputeSize (ScreenInfo *screen_info)
 
     changed = ((screen_info->width != width) | (screen_info->height != height));
     screen_info->width = width;
-    screen_info->height != height;
+    screen_info->height = height;
     TRACE ("myScreenComputeSize(): width=%i, height=%i", width, height);
 
     return changed;