Merge lp:~sethj/ubuntu/wily/unity/fix-for-1445595 into lp:unity

[Seth Johnson]

Don't open nautilus when the users empties the trash from the launcher. (LP: #1445595)

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

Unfortunately this has the side effect of making the confirmation dialog not to be shown on top when focus stealing prevention is enabled.

In order to fix this properly, we should add a new method to nautilus to pass the event timestamp to it.

review: Disapprove

Unmerged revisions

4028. By Seth Johnson on 2015-10-29

Don't open nautilus when the user empties the trash from the launcher
(LP: #1445595)

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-16 08:46:34 +0000
+++ debian/changelog	2015-10-29 01:27:20 +0000
@@ -1,3 +1,10 @@
+unity (7.3.2+15.10.20151016-0ubuntu3) wily; urgency=medium
+
+  * Don't open nautilus when the user empties the trash from the launcher
+    (LP: #1445595) 
+
+ -- Seth Johnson <[e-mail]>  Wed, 28 Oct 2015 17:04:07 -0700
+
 unity (7.3.2+15.10.20151016-0ubuntu1) wily; urgency=medium
 
   [ Marco Trevisan (Treviño) ]

=== modified file 'unity-shared/GnomeFileManager.cpp'
--- unity-shared/GnomeFileManager.cpp	2013-10-07 22:37:34 +0000
+++ unity-shared/GnomeFileManager.cpp	2015-10-29 01:27:20 +0000
@@ -213,7 +213,6 @@
 
 void GnomeFileManager::EmptyTrash(uint64_t timestamp)
 {
-  Activate(timestamp);
   auto const& proxy = impl_->NautilusOperationsProxy();
 
   // Passing the proxy to the lambda we ensure that it will be destroyed when needed