------------------------------------------------------------
revno: 1449
committer: Jani Monoses <jani@ubuntu.com>
branch nick: unity
timestamp: Fri 2011-08-26 12:33:46 +0300
message:
  Fix ARM FTBFS by avoiding casts from char * to types with increased alignment.
diff:
=== modified file 'plugins/unityshell/src/minimizedwindowhandler.cpp'
--- plugins/unityshell/src/minimizedwindowhandler.cpp	2011-08-24 17:36:10 +0000
+++ plugins/unityshell/src/minimizedwindowhandler.cpp	2011-08-26 09:33:46 +0000
@@ -94,7 +94,7 @@
   Atom          actualType;
   int           actualFormat;
   unsigned long nItems, nLeft;
-  char          *prop;
+  void          *prop;
   unsigned long data[2];
   Window        root = DefaultRootWindow (priv->mDpy), parent = priv->mXid, lastParent = priv->mXid;
   Window        *children;
@@ -175,7 +175,7 @@
   Atom          actualType;
   int           actualFormat;
   unsigned long nItems, nLeft;
-  char          *prop;
+  void          *prop;
   unsigned long data[2];
   Window        root = DefaultRootWindow (priv->mDpy), parent = priv->mXid, lastParent = priv->mXid;
   Window        *children;

=== modified file 'plugins/unityshell/src/transientfor.cpp'
--- plugins/unityshell/src/transientfor.cpp	2011-08-24 16:27:27 +0000
+++ plugins/unityshell/src/transientfor.cpp	2011-08-26 09:33:46 +0000
@@ -44,10 +44,10 @@
   unsigned long nItems, nLeft;
   int           actualFormat;
   Atom          actualType;
-  unsigned char *prop;
+  void          *prop;
 
   if (XGetWindowProperty (priv->mDpy, priv->mXid, wmTransientFor, 0L, 2L, false,
-                          XA_WINDOW, &actualType, &actualFormat, &nItems, &nLeft, &prop) == Success)
+                          XA_WINDOW, &actualType, &actualFormat, &nItems, &nLeft, (unsigned char **)&prop) == Success)
   {
     if (actualType == XA_WINDOW && actualFormat == 32 && nLeft == 0 && nItems == 1)
     {
@@ -76,12 +76,12 @@
   unsigned long nItems, nLeft;
   int           actualFormat;
   Atom          actualType;
-  unsigned char *prop;
+  void          *prop;
   std::vector<std::string> strings;
   std::list<Atom>   atoms;
 
   if (XGetWindowProperty (priv->mDpy, priv->mXid, wmClientLeader, 0L, 2L, false,
-                          XA_WINDOW, &actualType, &actualFormat, &nItems, &nLeft, &prop) == Success)
+                          XA_WINDOW, &actualType, &actualFormat, &nItems, &nLeft, (unsigned char **)&prop) == Success)
   {
     if (actualType == XA_WINDOW && actualFormat == 32 && nLeft == 0 && nItems == 1)
     {
@@ -119,7 +119,7 @@
       * should consider to be part of a window group by this client leader */
 
 	    if (XGetWindowProperty (priv->mDpy, priv->mXid, wmWindowType, 0L, 15L, false,
-                              XA_ATOM, &actualType, &actualFormat, &nItems, &nLeft, &prop) == Success)
+                              XA_ATOM, &actualType, &actualFormat, &nItems, &nLeft, (unsigned char **)&prop) == Success)
       {
         if (actualType == XA_ATOM && actualFormat == 32 && nLeft == 0 && nItems)
         {
@@ -148,7 +148,7 @@
   int           actualFormat;
   Atom          actualType;
   Atom          wmClientList;
-  unsigned char *prop;
+  void          *prop;
   std::vector<unsigned int>   transients;
   std::vector<Window>   clientList;
 
@@ -156,7 +156,7 @@
 
   if (XGetWindowProperty (priv->mDpy, DefaultRootWindow (priv->mDpy), wmClientList, 0L, 512L, false,
                           XA_WINDOW, &actualType, &actualFormat, &nItems, &nLeft,
-                          &prop) == Success)
+                          (unsigned char **)&prop) == Success)
   {
     if (actualType == XA_WINDOW && actualFormat == 32 && nItems && !nLeft)
     {