[Xfce4-commits] <xfwm4:xfce-4.8> Workaround Adobe AIR setting workspace to 0xFF instead of 0xFFFFFFFF for all workspaces as per EWMH specifications (Bug #8304)

[Olivier Fourdan]

Updating branch refs/heads/xfce-4.8
         to f23e1472e6382e3e6720ce2f3efc15d139d1b9bf (commit)
       from 7ec005d9d0dfae2e9fc617c74b18bcc3e7e9919e (commit)

commit f23e1472e6382e3e6720ce2f3efc15d139d1b9bf
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Sun Jan 8 12:16:07 2012 +0100

    Workaround Adobe AIR setting workspace to 0xFF instead of 0xFFFFFFFF for all workspaces as per EWMH specifications (Bug #8304)

 src/events.c |   23 ++---------------------
 1 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/events.c b/src/events.c
index 8ca3d7e..14bf512 100644
--- a/src/events.c
+++ b/src/events.c
@@ -2001,27 +2001,8 @@ handleClientMessage (DisplayInfo *display_info, XClientMessageEvent * ev)
         }
         else if ((ev->message_type == display_info->atoms[NET_WM_DESKTOP]) && (ev->format == 32))
         {
-            TRACE ("client \"%s\" (0x%lx) has received a NET_WM_DESKTOP event", c->name, c->window);
-            if (ev->data.l[0] == ALL_WORKSPACES)
-            {
-                if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_STICK) && !FLAG_TEST (c->flags, CLIENT_FLAG_STICKY))
-                {
-                    clientStick (c, TRUE);
-                    frameQueueDraw (c, FALSE);
-                }
-            }
-            else
-            {
-                if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_HAS_STICK) && FLAG_TEST (c->flags, CLIENT_FLAG_STICKY))
-                {
-                    clientUnstick (c, TRUE);
-                    frameQueueDraw (c, FALSE);
-                }
-                if (ev->data.l[0] != (long) c->win_workspace)
-                {
-                    clientSetWorkspace (c, (guint) ev->data.l[0], TRUE);
-                }
-            }
+            TRACE ("client \"%s\" (0x%lx) has received a NET_WM_DESKTOP event (0x%lx)", c->name, c->window);
+            clientUpdateNetWmDesktop (c, ev);
         }
         else if ((ev->message_type == display_info->atoms[NET_CLOSE_WINDOW]) && (ev->format == 32))
         {