Merge lp:~jani/unity-2d/fix_oneiric_build into lp:unity-2d/3.0

[Jani Monoses]

Fixes GCC 4.6 build error by explicitly assigning to array elements. It makes the code a little more cryptic but there was no documentation before either :)
Oneiric uses 4.6 by default.

[Olivier Tilloy (osomon)]

That looks good to me. Not tested in Oneiric, but I’ll trust you that it fixes the FTBFS there, and it compiles and works fine in Natty too.

I have one question though: does the initialization to {} guarantees that the 12 values will always be initialized to 0 ?

[Jani Monoses (jani)]

In my tests with and what I read about gcc extensions yet, that is initialized to the default value (0). Gcc emits a memset call for these cases.

[Olivier Tilloy (osomon)]

Great, thanks for the confirmation. Good to go then!

review: Approve

=== modified file 'libunity-2d-private/src/unity2dpanel.cpp'
--- libunity-2d-private/src/unity2dpanel.cpp	2011-02-20 23:58:30 +0000
+++ libunity-2d-private/src/unity2dpanel.cpp	2011-05-03 07:38:33 +0000
@@ -62,21 +62,17 @@
         const QRect screen = desktop->screenGeometry(q);
         const QRect available = desktop->availableGeometry(q);
 
-        ulong struts[12];
+        ulong struts[12] = {};
         switch (m_edge) {
         case Unity2dPanel::LeftEdge:
-            struts = {
-                q->width(), 0, 0, 0,
-                available.top(), available.bottom(), 0, 0,
-                0, 0, 0, 0
-                };
+            struts[0] = q->width();
+            struts[4] = available.top();
+            struts[5] = available.bottom();
             break;
         case Unity2dPanel::TopEdge:
-            struts = {
-                0, 0, q->height(), 0,
-                0, 0, 0, 0,
-                screen.left(), screen.right(), 0, 0
-                };
+            struts[2] = q->height();
+            struts[8] = screen.left();
+            struts[9] = screen.right();
             break;
         }