Merge lp:~townsend/unity/fix-force-show-window into lp:unity

[Christopher Townsend]

Also use the Compiz show() method when forcing an unmapped window to be visible when clicking on it's active Launcher icon.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3973
http://jenkins.qa.ubuntu.com/job/unity-ci/1245/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1245/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Well, this covers the case we're focusing.

There's still a problem when unity crashes, so that it's impossible those windows propertly, but still an edge case.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3974
http://jenkins.qa.ubuntu.com/job/unity-ci/1248/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1248/rebuild

review: Approve (continuous-integration)

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2015-04-09 14:42:07 +0000
+++ unity-shared/PluginAdapter.cpp	2015-05-29 12:31:22 +0000
@@ -781,7 +781,10 @@
 {
   CompWindow* window = m_Screen->findWindow(window_id);
   if (window && (window->actions() & CompWindowActionMinimizeMask))
+  {
     window->unminimize();
+    window->show();
+  }
 }
 
 void PluginAdapter::Shade(Window window_id)
@@ -962,6 +965,7 @@
       if (forced_unminimize)
         {
           top_window->unminimize();
+          top_window->show();
         }
 
       top_window->raise();