Merge lp:~aacid/unity-2d/x11embed_pidgin into lp:unity-2d

[Albert Astals Cid]

[panel] Update d->attr before using its values - some QX11EmbedContainers set their dimensions late

Update d->attr before using its values

[Gerry Boland (gerboland)]

Looks good, thank you

review: Approve

[Unity Merger (unity-merger)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'panel/applets/legacytray/x11embedcontainer.cpp'
--- panel/applets/legacytray/x11embedcontainer.cpp	2012-01-13 15:14:56 +0000
+++ panel/applets/legacytray/x11embedcontainer.cpp	2012-05-30 13:00:26 +0000
@@ -225,6 +225,12 @@
         // size #2.
         XImage *ximage = XGetImage(dpy, pixmap, 0, 0, width(), height(), AllPlanes, ZPixmap);
         if (!ximage) {
+            // Make sure the attr are updated, Pidgin changes its widthxheight late in the game
+            if (!XGetWindowAttributes(QX11Info::display(), clientWinId(), &d->attr)) {
+                error(QX11EmbedContainer::Unknown);
+                return;
+            }
+
             int ximageWidth = qMin(d->attr.width, width());
             int ximageHeight = qMin(d->attr.height, height());
             ximage = XGetImage(dpy, pixmap, 0, 0, ximageWidth, ximageHeight, AllPlanes, ZPixmap);

=== modified file 'tests/manual-tests/panel.txt'
--- tests/manual-tests/panel.txt	2012-05-25 09:45:32 +0000
+++ tests/manual-tests/panel.txt	2012-05-30 13:00:26 +0000
@@ -81,3 +81,7 @@
  * Click in the panel (not in window label nor menus)
  * Verify focus goes to the maximized window
 ----
+ * Add 'pidgin' to /desktop/unity/panel/systray-whitelist in dconf-editor
+ * Start pidgin
+ * Verify the systray icon of pidgin appears in the panel
+----