Merge lp:~sil2100/unity/fix_sigc_disconnecting_expo into lp:unity

[Łukasz Zemczak]

Branch submitted for comment! This is a *workaround*! Now I noticed that it is more a bug in libsigc++!

- Problem:

Bug #1090565 - when exiting from expo using right-click on launcher icon (quicklist opening), every next expo exit (either though click on the workspaces icon or using keybindings) will result in the quicklist being opened afterwards.
The reason for this is that the on every terminate_expo signal, the quicklist-opening callback is executed, since magically it doesn't get disconnected properly after calling .disconnect() from the body of the callback (!?).
NOTE! This might be a bug in sigc! As the same code worked on precise.

- Fix:

This is a workaround. We use a bool flag to disable the callback inside its body.

- Tests:

None right now.

[Andrea Azzarone (azzar1)]

Weird. Can be a lambda issue.

[Łukasz Zemczak (sil2100)]

Yes, I need to revisit this one and once again try looking into it. But there's so much other things to do...

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

This is caused by the econnection not being properly set, fixed in branch lp:~3v1n0/unity/quicklist-disconnect-on-expo-terminated

review: Disapprove

Unmerged revisions

3008. By Łukasz Zemczak on 2013-01-02

Add comment

3007. By Łukasz Zemczak on 2012-12-21

It seems that disconnecting a handler from a sigc signal is not possible from the handler body (?!). Not sure why. But only this way we'll be sure that the quicklist-showing will be executed only once.

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2012-12-12 15:21:38 +0000
+++ launcher/LauncherIcon.cpp	2013-01-02 08:29:22 +0000
@@ -73,6 +73,7 @@
   : _icon_type(type)
   , _sticky(false)
   , _remote_urgent(false)
+  , _quicklist_after_expo(false)
   , _present_urgency(0)
   , _progress(0)
   , _sort_priority(DefaultPriority(type))
@@ -620,9 +621,14 @@
    * shwing the icon quicklist. */
   if (win_manager.IsExpoActive())
   {
+    _quicklist_after_expo = true;
     on_expo_terminated_connection = win_manager.terminate_expo.connect([&, tip_x, tip_y]() {
-        QuicklistManager::Default()->ShowQuicklist(_quicklist.GetPointer(), tip_x, tip_y);
+        /* XXX: An ugly workaround, since for unknown reasons yet disconnecting 
+         *   the signal from inside this particular callback does not work */
+        if (_quicklist_after_expo)
+            QuicklistManager::Default()->ShowQuicklist(_quicklist.GetPointer(), tip_x, tip_y);
         on_expo_terminated_connection.disconnect();
+        _quicklist_after_expo = false;
     });
   }
   else

=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2012-11-27 01:09:26 +0000
+++ launcher/LauncherIcon.h	2013-01-02 08:29:22 +0000
@@ -309,6 +309,7 @@
 
   bool              _sticky;
   bool              _remote_urgent;
+  bool              _quicklist_after_expo;
   float             _present_urgency;
   float             _progress;
   int               _sort_priority;