[maemo-commits] [maemo-commits] r18007 - projects/haf/trunk/libmatchbox2/matchbox/core

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-04-03 15:57:21 +0300 (Fri, 03 Apr 2009)
New Revision: 18007

Modified:
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
Log:
more fixes


Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-04-03 12:53:07 UTC (rev 18006)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-wm-client-window.c	2009-04-03 12:57:21 UTC (rev 18007)
@@ -758,7 +758,7 @@
 			    &actual_format_return,
 			    &nitems_return,
 			    &bytes_after_return,
-			    (unsigned char **)&result_atom,
+			    &result_atom,
 			    &x_error_code);
 
       if (x_error_code
@@ -774,31 +774,26 @@
       else
 	{
 	  int i;
+          Atom *a = (Atom*)result_atom;
 
 	  for (i = 0; i < nitems_return; ++i)
 	    {
-	      if (result_atom[i] == wm->atoms[MBWM_ATOM_WM_TAKE_FOCUS])
+	      if (a[i] == wm->atoms[MBWM_ATOM_WM_TAKE_FOCUS])
 		win->protos |= MBWMClientWindowProtosFocus;
-	      else if (result_atom[i] ==
-		       wm->atoms[MBWM_ATOM_WM_DELETE_WINDOW])
+	      else if (a[i] == wm->atoms[MBWM_ATOM_WM_DELETE_WINDOW])
 		win->protos |= MBWMClientWindowProtosDelete;
-	      else if (result_atom[i] ==
-		       wm->atoms[MBWM_ATOM_NET_WM_CONTEXT_HELP])
+	      else if (a[i] == wm->atoms[MBWM_ATOM_NET_WM_CONTEXT_HELP])
 		win->protos |= MBWMClientWindowProtosContextHelp;
-	      else if (result_atom[i] ==
-		       wm->atoms[MBWM_ATOM_NET_WM_CONTEXT_ACCEPT])
+	      else if (a[i] == wm->atoms[MBWM_ATOM_NET_WM_CONTEXT_ACCEPT])
 		win->protos |= MBWMClientWindowProtosContextAccept;
-	      else if (result_atom[i] ==
-		       wm->atoms[MBWM_ATOM_NET_WM_CONTEXT_CUSTOM])
+	      else if (a[i] == wm->atoms[MBWM_ATOM_NET_WM_CONTEXT_CUSTOM])
 		win->protos |= MBWMClientWindowProtosContextCustom;
-	      else if (result_atom[i] ==
-		       wm->atoms[MBWM_ATOM_NET_WM_PING])
+	      else if (a[i] == wm->atoms[MBWM_ATOM_NET_WM_PING])
 		win->protos |= MBWMClientWindowProtosPing;
-	      else if (result_atom[i] ==
-		       wm->atoms[MBWM_ATOM_NET_WM_SYNC_REQUEST])
+	      else if (a[i] == wm->atoms[MBWM_ATOM_NET_WM_SYNC_REQUEST])
 		win->protos |= MBWMClientWindowProtosSyncRequest;
 	      else
-		MBWM_DBG("Unhandled WM Protocol %d", result_atom[i]);
+		MBWM_DBG("Unhandled WM Protocol %d", ((Atom*)result_atom)[i]);
 	    }
 	}