Merge lp:~didrocks/unity/launcher-fix-of-the-week-04-04-11 into lp:unity

[Didier Roche-Tolomelli]

This branch:
- fix an issue with repeated key (LP: #750535)
- reduce shortcuts label size and change some super behaviour (LP: #747812)
- additional cleanage (signals and code)
- prevents false positive "bring the dash" positive even when we are in scale
  mode (not directly handled by unity) (LP: #751102)
- Avoid spamming the launcher with state change when the state is finally the
  same. (Launcher and Hover machine). That will hopefully fix the "click
  through" bug when the Launcher wrongly stay visible (half of bug LP: #744325)
- move the position of the icon on timeout drag. Fix a potential crasher as well
  (LP: #751196)

[Jason Smith (jassmith)]

+1 approve

review: Approve

=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2011-04-02 08:36:07 +0000
+++ src/BamfLauncherIcon.cpp	2011-04-05 17:30:38 +0000
@@ -692,12 +692,7 @@
 
   if (sticky)
   {
-    bamf_view_set_sticky (view, false);
-    if (bamf_view_is_closed (view))
-      self->Remove ();
-
-    if (desktop_file && strlen (desktop_file) > 0)
-      FavoriteStore::GetDefault ()->RemoveFavorite (desktop_file);
+    self->UnStick ();
   }
   else
   {

=== modified file 'src/DeviceLauncherSection.cpp'
--- src/DeviceLauncherSection.cpp	2011-03-29 14:36:45 +0000
+++ src/DeviceLauncherSection.cpp	2011-04-05 17:30:38 +0000
@@ -41,7 +41,7 @@
                                                   G_CALLBACK (&DeviceLauncherSection::OnMountAdded),
                                                   this);
 
-   g_idle_add ((GSourceFunc)&DeviceLauncherSection::PopulateEntries, this);
+   _on_device_populate_entry_id = g_idle_add ((GSourceFunc)&DeviceLauncherSection::PopulateEntries, this);
 }
 
 DeviceLauncherSection::~DeviceLauncherSection ()
@@ -58,6 +58,9 @@
     g_signal_handler_disconnect ((gpointer) _monitor,
                                  _on_mount_added_handler_id);
 
+  if (_on_device_populate_entry_id)
+    g_source_remove (_on_device_populate_entry_id);
+
   g_object_unref (_monitor);
   g_hash_table_unref (_ht);
 }
@@ -81,6 +84,8 @@
   }
 
   g_list_free (volumes);
+  
+  self->_on_device_populate_entry_id = 0;
 
   return false;
 }

=== modified file 'src/DeviceLauncherSection.h'
--- src/DeviceLauncherSection.h	2011-03-29 14:36:45 +0000
+++ src/DeviceLauncherSection.h	2011-04-05 17:30:38 +0000
@@ -56,6 +56,7 @@
   gulong _on_volume_added_handler_id;
   gulong _on_volume_removed_handler_id;
   gulong _on_mount_added_handler_id;
+  gulong _on_device_populate_entry_id;
 };
 
 #endif // _DEVICE_LAUNCHER_SECTION_H_

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-04-03 06:20:39 +0000
+++ src/Launcher.cpp	2011-04-05 17:30:38 +0000
@@ -357,11 +357,19 @@
     _launcher_drag_delta    = 0;
     _dnd_delta_y            = 0;
     _dnd_delta_x            = 0;
-    _autoscroll_handle      = 0;
-    _redraw_handle          = 0;
-    _start_dragicon_handle  = 0;
-    _focus_keynav_handle    = 0;
-    _dnd_check_handle       = 0;
+
+    _autoscroll_handle             = 0;
+    _super_show_launcher_handle    = 0;
+    _super_hide_launcher_handle    = 0;
+    _super_show_shortcuts_handle   = 0;
+    _start_dragicon_handle         = 0;
+    _focus_keynav_handle           = 0;
+    _dnd_check_handle              = 0;
+    _ignore_repeat_shortcut_handle = 0;
+
+    _latest_shortcut        = 0;
+    _super_pressed          = false;
+    _shortcuts_shown        = false;
     _floating               = false;
     _hovered                = false;
     _hidden                 = false;
@@ -431,10 +439,23 @@
   g_bus_unown_name (_dbus_owner);
   
   if (_dnd_check_handle)
-  {
     g_source_remove (_dnd_check_handle);
-    _dnd_check_handle = 0;
-  }
+  if (_autoscroll_handle)
+    g_source_remove (_autoscroll_handle);
+  if (_focus_keynav_handle)
+    g_source_remove (_focus_keynav_handle);
+  if (_super_show_launcher_handle)
+    g_source_remove (_super_show_launcher_handle);
+  if (_super_show_shortcuts_handle)
+    g_source_remove (_super_show_shortcuts_handle);
+  if (_start_dragicon_handle)
+    g_source_remove (_start_dragicon_handle);
+  if (_ignore_repeat_shortcut_handle)
+    g_source_remove (_ignore_repeat_shortcut_handle);
+  if (_super_show_launcher_handle)
+    g_source_remove (_super_show_launcher_handle);
+  if (_super_hide_launcher_handle)
+    g_source_remove (_super_hide_launcher_handle);
 
   // disconnect the huge number of signal-slot callbacks
   if (_set_hidden_connection.connected ())
@@ -502,6 +523,7 @@
   
   if (_on_drag_finish_connection.connected ())
     _on_drag_finish_connection.disconnect ();
+    
 }
 
 /* Introspection */
@@ -526,6 +548,7 @@
   gchar*                fontName = NULL;
 
   double label_pos = double(_icon_size / 3.0f);
+  double text_size = double(_icon_size / 4.0f);
   double label_x = label_pos;
   double label_y = label_pos;
   double label_w = label_pos;
@@ -543,7 +566,7 @@
   layout = pango_cairo_create_layout (cr);
   g_object_get (settings, "gtk-font-name", &fontName, NULL);
   desc = pango_font_description_from_string (fontName);
-  pango_font_description_set_absolute_size (desc, label_pos * PANGO_SCALE);
+  pango_font_description_set_absolute_size (desc, text_size * PANGO_SCALE);
   pango_layout_set_font_description (layout, desc);
   pango_layout_set_text (layout, &label, 1);
   pangoCtx = pango_layout_get_context (layout); // is not ref'ed
@@ -652,6 +675,7 @@
                              NULL);
 
    self->selection_change.emit ();
+   self->_focus_keynav_handle = 0;
 
    return false;
 }
@@ -1479,44 +1503,89 @@
 gboolean Launcher::TapOnSuper ()
 {
     struct timespec current;
-    bool tap_on_super;
-    bool shortcuts_shown = false;
     clock_gettime (CLOCK_MONOTONIC, &current);
         
-    tap_on_super = (TimeDelta (&current, &_times[TIME_TAP_SUPER]) < SUPER_TAP_DURATION);
-
-    if (_hide_machine->GetQuirk (LauncherHideMachine::TRIGGER_BUTTON_DOWN))
-      shortcuts_shown = !tap_on_super;
-
-    _hover_machine->SetQuirk (LauncherHoverMachine::SHOTCUT_KEYS_VISIBLE, shortcuts_shown);
-    
-    return tap_on_super;
-    
+    return (TimeDelta (&current, &_times[TIME_TAP_SUPER]) < SUPER_TAP_DURATION);    
 }
 
 /* Launcher Show/Hide logic */
 
 void Launcher::StartKeyShowLauncher ()
 {
-    _hide_machine->SetQuirk (LauncherHideMachine::TRIGGER_BUTTON_DOWN, true);
+    _super_pressed = true;
     _hide_machine->SetQuirk (LauncherHideMachine::LAST_ACTION_ACTIVATE, false);
-    QueueDraw ();
-    SetTimeStruct (&_times[TIME_TAP_SUPER], NULL, SUPER_TAP_DURATION);
-    if (_redraw_handle > 0)
-      g_source_remove (_redraw_handle);
-    _redraw_handle = g_timeout_add (SUPER_TAP_DURATION, &Launcher::DrawLauncherTimeout, this);
+    
+    SetTimeStruct (&_times[TIME_TAP_SUPER]);
+    SetTimeStruct (&_times[TIME_SUPER_PRESSED]);
+    
+    if (_super_show_launcher_handle > 0)
+      g_source_remove (_super_show_launcher_handle);
+    _super_show_launcher_handle = g_timeout_add (SUPER_TAP_DURATION, &Launcher::SuperShowLauncherTimeout, this);
+    
+    if (_super_show_shortcuts_handle > 0)
+      g_source_remove (_super_show_shortcuts_handle);
+    _super_show_shortcuts_handle = g_timeout_add (SHORTCUTS_SHOWN_DELAY, &Launcher::SuperShowShortcutsTimeout, this);
 }
 
 void Launcher::EndKeyShowLauncher ()
 {
-    
-    _hide_machine->SetQuirk (LauncherHideMachine::TRIGGER_BUTTON_DOWN, false);
-    _hover_machine->SetQuirk (LauncherHoverMachine::SHOTCUT_KEYS_VISIBLE, false);
+    int remaining_time_before_hide;
+    struct timespec current;
+    clock_gettime (CLOCK_MONOTONIC, &current);
+ 
+    _hover_machine->SetQuirk (LauncherHoverMachine::SHORTCUT_KEYS_VISIBLE, false);
+    _super_pressed = false;
+    _shortcuts_shown = false;
     QueueDraw ();
-
-    // it's a tap on super
-    if (TapOnSuper ())
-      ubus_server_send_message (ubus_server_get_default (), UBUS_DASH_EXTERNAL_ACTIVATION, NULL);      
+    
+    // remove further show launcher (which can happen when we close the dash with super)
+    if (_super_show_launcher_handle > 0)
+      g_source_remove (_super_show_launcher_handle);
+    if (_super_show_shortcuts_handle > 0)
+      g_source_remove (_super_show_shortcuts_handle);
+
+    // it's a tap on super and we didn't use any shortcuts
+    if (TapOnSuper () && !_latest_shortcut)
+      ubus_server_send_message (ubus_server_get_default (), UBUS_DASH_EXTERNAL_ACTIVATION, NULL);
+      
+    remaining_time_before_hide = BEFORE_HIDE_LAUNCHER_ON_SUPER_DURATION - CLAMP ((int) (TimeDelta (&current, &_times[TIME_SUPER_PRESSED])), 0, BEFORE_HIDE_LAUNCHER_ON_SUPER_DURATION);
+    
+    if (_super_hide_launcher_handle > 0)
+      g_source_remove (_super_hide_launcher_handle);
+    _super_hide_launcher_handle = g_timeout_add (remaining_time_before_hide, &Launcher::SuperHideLauncherTimeout, this);
+}
+
+gboolean Launcher::SuperHideLauncherTimeout (gpointer data)
+{
+    Launcher *self = (Launcher*) data;
+    
+    self->_hide_machine->SetQuirk (LauncherHideMachine::TRIGGER_BUTTON_SHOW, false);
+    
+    self->_super_hide_launcher_handle = 0;
+    return false;    
+}
+
+gboolean Launcher::SuperShowLauncherTimeout (gpointer data)
+{
+    Launcher *self = (Launcher*) data;
+    
+    self->_hide_machine->SetQuirk (LauncherHideMachine::TRIGGER_BUTTON_SHOW, true);
+    
+    self->_super_show_launcher_handle = 0;
+    return false;    
+}
+
+gboolean Launcher::SuperShowShortcutsTimeout (gpointer data)
+{
+    Launcher *self = (Launcher*) data;
+    
+    self->_shortcuts_shown = true;
+    self->_hover_machine->SetQuirk (LauncherHoverMachine::SHORTCUT_KEYS_VISIBLE, true);
+
+    self->QueueDraw ();
+    
+    self->_super_show_shortcuts_handle = 0;
+    return false;    
 }
 
 void Launcher::OnPlaceViewShown (GVariant *data, void *val)
@@ -1647,14 +1716,6 @@
   return _mouse_position.y;
 }
 
-gboolean Launcher::DrawLauncherTimeout (gpointer data)
-{
-    Launcher *self = (Launcher*) data;
-    
-    self->QueueDraw ();
-    return false;    
-}
-
 bool
 Launcher::CheckIntersectWindow (CompWindow *window)
 {
@@ -1975,6 +2036,7 @@
   }
   
   self->EnsureAnimation ();
+  self->_autoscroll_handle = 0;
   
   return TRUE;
 }
@@ -2514,7 +2576,7 @@
                     geo);
 
   /* draw superkey-shortcut label */ 
-  if (_hide_machine->GetQuirk (LauncherHideMachine::TRIGGER_BUTTON_DOWN) && !TapOnSuper ())
+  if (_shortcuts_shown)
   {
     guint64 shortcut = arg.icon->GetShortcut ();
 
@@ -2680,8 +2742,16 @@
     Launcher *self = (Launcher*) data;
     
     // if we are still waiting…
-    if (self->GetActionState () == ACTION_NONE)
+    if (self->GetActionState () == ACTION_NONE) {
+      if (self->_icon_under_mouse)
+      {
+      self->_icon_under_mouse->MouseLeave.emit ();
+      self->_icon_under_mouse->_mouse_inside = false;
+      self->_icon_under_mouse = 0;
+      } 
       self->StartIconDragRequest (self->GetMouseX (), self->GetMouseY ());
+    }
+    self->_start_dragicon_handle = 0;
     return false;    
 }
 
@@ -2696,6 +2766,7 @@
     StartIconDrag (drag_icon);
     SetActionState (ACTION_DRAG_ICON);
     UpdateDragWindowPosition (x, y);
+    EnsureAnimation ();
   } 
 }
 
@@ -2917,26 +2988,53 @@
   EnsureAnimation ();
 }
 
+
+gboolean
+Launcher::ResetRepeatShorcutTimeout (gpointer data)
+{
+  Launcher *self = (Launcher*) data;
+  
+  self->_latest_shortcut = 0;
+  
+  self->_ignore_repeat_shortcut_handle = 0;
+  return false;
+}
+
 gboolean
 Launcher::CheckSuperShortcutPressed (unsigned int key_sym,
                                      unsigned long key_code,
                                      unsigned long key_state)
 {
-  if (!_hide_machine->GetQuirk (LauncherHideMachine::TRIGGER_BUTTON_DOWN))
+  if (!_super_pressed)
     return false;
 
   LauncherModel::iterator it;
-  int i;
   
   // Shortcut to start launcher icons. Only relies on Keycode, ignore modifier
-  for (it = _model->begin (), i = 0; it != _model->end (); it++, i++)
+  for (it = _model->begin (); it != _model->end (); it++)
   {
     if (XKeysymToKeycode (screen->dpy (), (*it)->GetShortcut ()) == key_code)
     {
+      /*
+       * start a timeout while repressing the same shortcut will be ignored.
+       * This is because the keypress repeat is handled by Xorg and we have no
+       * way to know if a press is an actual press or just an automated repetition
+       * because the button is hold down. (key release events are sent in both cases)
+      */
+      if (_ignore_repeat_shortcut_handle > 0)
+        g_source_remove (_ignore_repeat_shortcut_handle);
+      _ignore_repeat_shortcut_handle = g_timeout_add (IGNORE_REPEAT_SHORTCUT_DURATION, &Launcher::ResetRepeatShorcutTimeout, this);
+      
+      if (_latest_shortcut == (*it)->GetShortcut ())
+        return true;
+      
       if (g_ascii_isdigit ((gchar) (*it)->GetShortcut ()) && (key_state & ShiftMask))
         (*it)->OpenInstance ();
       else
         (*it)->Activate ();
+
+      _latest_shortcut = (*it)->GetShortcut ();
+      
       // disable the "tap on super" check
       _times[TIME_TAP_SUPER].tv_sec = 0;
       _times[TIME_TAP_SUPER].tv_nsec = 0;

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2011-04-03 06:20:39 +0000
+++ src/Launcher.h	2011-04-05 17:30:38 +0000
@@ -42,7 +42,11 @@
 #define ANIM_DURATION_LONG  350
 
 #define SUPER_TAP_DURATION  250
+#define SHORTCUTS_SHOWN_DELAY  750
 #define START_DRAGICON_DURATION 500
+#define BEFORE_HIDE_LAUNCHER_ON_SUPER_DURATION 1000
+
+#define IGNORE_REPEAT_SHORTCUT_DURATION  250
 
 #define MAX_SUPERKEY_LABELS 10
 
@@ -197,6 +201,7 @@
     TIME_DRAG_EDGE_TOUCH,
     TIME_DRAG_OUT,
     TIME_TAP_SUPER,
+    TIME_SUPER_PRESSED,
     
     TIME_LAST
   } LauncherActionTimes;
@@ -237,10 +242,13 @@
   void OnPluginStateChanged ();
   
   static gboolean AnimationTimeout (gpointer data);
-  static gboolean DrawLauncherTimeout (gpointer data);
+  static gboolean SuperShowLauncherTimeout (gpointer data);
+  static gboolean SuperHideLauncherTimeout (gpointer data);
+  static gboolean SuperShowShortcutsTimeout (gpointer data);
   static gboolean StrutHack (gpointer data);
   static gboolean MoveFocusToKeyNavModeTimeout (gpointer data);
   static gboolean StartIconDragTimeout (gpointer data);
+  static gboolean ResetRepeatShorcutTimeout (gpointer data);
 
   void SetMousePosition (int x, int y);
   
@@ -406,6 +414,10 @@
   bool  _render_drag_window;
   bool  _check_window_over_launcher;
   
+  bool          _shortcuts_shown;  
+  bool          _super_pressed;
+  guint64       _latest_shortcut;
+    
   BacklightMode _backlight_mode;
 
   float _folded_angle;
@@ -461,9 +473,12 @@
 
   guint _autoscroll_handle;
   guint _focus_keynav_handle;
-  guint _redraw_handle;
+  guint _super_show_launcher_handle;
+  guint _super_hide_launcher_handle;
+  guint _super_show_shortcuts_handle;
   guint _start_dragicon_handle;
   guint _dnd_check_handle;
+  guint _ignore_repeat_shortcut_handle;
 
   nux::Point2   _mouse_position;
   nux::Point2   _bfb_mouse_position;

=== modified file 'src/LauncherHideMachine.cpp'
--- src/LauncherHideMachine.cpp	2011-03-30 10:16:11 +0000
+++ src/LauncherHideMachine.cpp	2011-04-05 17:30:38 +0000
@@ -25,6 +25,9 @@
   _quirks = DEFAULT;
   _should_hide = false;
   
+  _latest_emit_should_hide = false;
+  _hide_changed_emit_handle = 0;
+  
   _hide_delay_handle = 0;
   _hide_delay_timeout_length = 750;
 }
@@ -36,6 +39,11 @@
     g_source_remove (_hide_delay_handle);
     _hide_delay_handle = 0;
   }
+  if (_hide_changed_emit_handle)
+  {
+    g_source_remove (_hide_changed_emit_handle);
+    _hide_changed_emit_handle = 0;
+  }
 }
 
 void
@@ -54,7 +62,10 @@
   else
   {
     _should_hide = value;
-    should_hide_changed.emit (value);
+    
+    if (_hide_changed_emit_handle)
+      g_source_remove (_hide_changed_emit_handle);
+    _hide_changed_emit_handle = g_timeout_add (0, &EmitShouldHideChanged, this);  
   }
 }
 
@@ -66,7 +77,7 @@
     QUICKLIST_OPEN         = 1 << 4, 16  #VISIBLE_REQUIRED
     EXTERNAL_DND_ACTIVE    = 1 << 5, 32  #VISIBLE_REQUIRED
     INTERNAL_DND_ACTIVE    = 1 << 6, 64  #VISIBLE_REQUIRED
-    TRIGGER_BUTTON_DOWN    = 1 << 7, 128 #VISIBLE_REQUIRED
+    TRIGGER_BUTTON_SHOW    = 1 << 7, 128 #VISIBLE_REQUIRED
     ANY_WINDOW_UNDER       = 1 << 8, 256
     ACTIVE_WINDOW_UNDER    = 1 << 9, 512
     DND_PUSHED_OFF         = 1 << 10, 1024
@@ -81,7 +92,7 @@
 */
 
 #define VISIBLE_REQUIRED (QUICKLIST_OPEN | EXTERNAL_DND_ACTIVE | \
-INTERNAL_DND_ACTIVE | TRIGGER_BUTTON_DOWN | VERTICAL_SLIDE_ACTIVE |\
+INTERNAL_DND_ACTIVE | TRIGGER_BUTTON_SHOW | VERTICAL_SLIDE_ACTIVE |\
 KEY_NAV_ACTIVE | PLACES_VISIBLE | SCALE_ACTIVE | EXPO_ACTIVE |\
 MT_DRAG_OUT)
 
@@ -160,7 +171,7 @@
 }
 
 #define SKIP_DELAY_QUIRK (EXTERNAL_DND_ACTIVE | DND_PUSHED_OFF | ACTIVE_WINDOW_UNDER | \
-ANY_WINDOW_UNDER | EXPO_ACTIVE | SCALE_ACTIVE | MT_DRAG_OUT)
+ANY_WINDOW_UNDER | EXPO_ACTIVE | SCALE_ACTIVE | MT_DRAG_OUT | TRIGGER_BUTTON_SHOW)
 
 void
 LauncherHideMachine::SetQuirk (LauncherHideMachine::HideQuirk quirk, bool active)
@@ -207,6 +218,21 @@
   return false;
 }
 
+gboolean
+LauncherHideMachine::EmitShouldHideChanged (gpointer data)
+{
+  LauncherHideMachine *self = static_cast<LauncherHideMachine *> (data);
+
+  self->_hide_changed_emit_handle = 0;  
+  if (self->_should_hide == self->_latest_emit_should_hide)
+    return false;
+    
+  self->_latest_emit_should_hide = self->_should_hide;
+  self->should_hide_changed.emit (self->_should_hide);
+  
+  return false;
+}
+
 char*
 LauncherHideMachine::DebugHideQuirks ()
 {

=== modified file 'src/LauncherHideMachine.h'
--- src/LauncherHideMachine.h	2011-03-30 10:16:11 +0000
+++ src/LauncherHideMachine.h	2011-04-05 17:30:38 +0000
@@ -44,7 +44,7 @@
       QUICKLIST_OPEN         = 1 << 4, 
       EXTERNAL_DND_ACTIVE    = 1 << 5, 
       INTERNAL_DND_ACTIVE    = 1 << 6, 
-      TRIGGER_BUTTON_DOWN    = 1 << 7, 
+      TRIGGER_BUTTON_SHOW    = 1 << 7, 
       ANY_WINDOW_UNDER       = 1 << 8, 
       ACTIVE_WINDOW_UNDER    = 1 << 9,
       DND_PUSHED_OFF         = 1 << 10,
@@ -78,13 +78,16 @@
     void SetShouldHide (bool value, bool skip_delay);
 
     static gboolean OnHideDelayTimeout (gpointer data);
+    static gboolean EmitShouldHideChanged (gpointer data);
   
     bool      _should_hide;
+    bool      _latest_emit_should_hide;
     HideQuirk _quirks;
     HideMode  _mode;
     unsigned int _hide_delay_timeout_length;
     
     guint _hide_delay_handle;
+    guint _hide_changed_emit_handle;
 };
 
 #endif

=== modified file 'src/LauncherHoverMachine.cpp'
--- src/LauncherHoverMachine.cpp	2011-03-30 10:16:11 +0000
+++ src/LauncherHoverMachine.cpp	2011-04-05 17:30:38 +0000
@@ -23,7 +23,7 @@
 {
   _quirks = DEFAULT;
   _should_hover = false;
-  _pending_should_hover = false; // avoid building a struct in the callback
+  _latest_emit_should_hover = false;
   _hover_changed_emit_handle = 0;
   
 }
@@ -42,7 +42,7 @@
     LAUNCHER_HIDDEN        = 1 << 0, 1
     MOUSE_OVER_LAUNCHER    = 1 << 1, 2
     MOUSE_OVER_BFB         = 1 << 2, 4
-    SHOTCUT_KEYS_VISIBLE   = 1 << 3, 8
+    SHORTCUT_KEYS_VISIBLE  = 1 << 3, 8
     QUICKLIST_OPEN         = 1 << 4, 16
     KEY_NAV_ACTIVE         = 1 << 5, 32
     LAUNCHER_IN_ACTION     = 1 << 6, 64
@@ -60,7 +60,7 @@
   }
     
   if (GetQuirk ((HoverQuirk) (MOUSE_OVER_LAUNCHER | MOUSE_OVER_BFB |
-                              SHOTCUT_KEYS_VISIBLE | KEY_NAV_ACTIVE |
+                              SHORTCUT_KEYS_VISIBLE | KEY_NAV_ACTIVE |
                               QUICKLIST_OPEN | LAUNCHER_IN_ACTION)))
     should_hover = true;
   else
@@ -72,11 +72,11 @@
 
 void
 LauncherHoverMachine::SetShouldHover (bool value)
-{
+{  
+  _should_hover = value;
+  
   if (_hover_changed_emit_handle)
     g_source_remove (_hover_changed_emit_handle);
-  
-  _pending_should_hover = value;
   _hover_changed_emit_handle = g_timeout_add (0, &EmitShouldHoverChanged, this);  
 }
 
@@ -84,14 +84,14 @@
 LauncherHoverMachine::EmitShouldHoverChanged (gpointer data)
 {
   LauncherHoverMachine *self = static_cast<LauncherHoverMachine *> (data);
-  
-  if (self->_should_hover == self->_pending_should_hover)
+
+  self->_hover_changed_emit_handle = 0;  
+  if (self->_should_hover == self->_latest_emit_should_hover)
     return false;
-    
-  self->_should_hover = self->_pending_should_hover;
-  self->_hover_changed_emit_handle = 0;
   
+  self->_latest_emit_should_hover = self->_should_hover;
   self->should_hover_changed.emit (self->_should_hover);
+
   return false;
 }
 

=== modified file 'src/LauncherHoverMachine.h'
--- src/LauncherHoverMachine.h	2011-03-30 10:16:11 +0000
+++ src/LauncherHoverMachine.h	2011-04-05 17:30:38 +0000
@@ -33,7 +33,7 @@
       LAUNCHER_HIDDEN        = 1 << 0, 
       MOUSE_OVER_LAUNCHER    = 1 << 1, 
       MOUSE_OVER_BFB         = 1 << 2, 
-      SHOTCUT_KEYS_VISIBLE   = 1 << 3, 
+      SHORTCUT_KEYS_VISIBLE  = 1 << 3, 
       QUICKLIST_OPEN         = 1 << 4, 
       KEY_NAV_ACTIVE         = 1 << 5, 
       LAUNCHER_IN_ACTION     = 1 << 6, 
@@ -56,7 +56,7 @@
     static gboolean EmitShouldHoverChanged (gpointer data);
   
     bool       _should_hover;
-    bool       _pending_should_hover;
+    bool       _latest_emit_should_hover;
     HoverQuirk _quirks;
     
     guint _hover_changed_emit_handle;

=== modified file 'src/PanelTray.cpp'
--- src/PanelTray.cpp	2011-03-29 12:23:52 +0000
+++ src/PanelTray.cpp	2011-04-05 17:30:38 +0000
@@ -24,9 +24,7 @@
 PanelTray::PanelTray ()
 : _n_children (0),
   _last_x (0),
-  _last_y (0),
-  _idle_add_sync_handler (0),
-  _idle_remove_sync_handler (0)
+  _last_y (0)
 {
   _settings = g_settings_new (SETTINGS_NAME);
   _whitelist = g_settings_get_strv (_settings, "systray-whitelist");
@@ -66,10 +64,7 @@
 {
   if (_tray_expose_id)
     g_signal_handler_disconnect (_window, _tray_expose_id);
-  if (_idle_remove_sync_handler)
-    g_source_remove (_idle_remove_sync_handler);
-  if (_idle_add_sync_handler)
-    g_source_remove (_idle_add_sync_handler);
+  g_idle_remove_by_data (this);
   
   g_strfreev (_whitelist);
   g_object_unref (_settings);
@@ -145,7 +140,7 @@
       na_tray_child_set_composited (icon, TRUE);
 
     self->_n_children++;
-    self->_idle_add_sync_handler = g_idle_add ((GSourceFunc)IdleSync, self);
+    g_idle_add ((GSourceFunc)IdleSync, self);
   }
 
   g_debug ("TrayChild %s: %s %s %s",
@@ -164,7 +159,7 @@
 void
 PanelTray::OnTrayIconRemoved (NaTrayManager *manager, NaTrayChild *child, PanelTray *self)
 {
-  self->_idle_remove_sync_handler = g_idle_add ((GSourceFunc)IdleSync, self);
+  g_idle_add ((GSourceFunc)IdleSync, self);
   self->_n_children--;
 }
 

=== modified file 'src/PanelTray.h'
--- src/PanelTray.h	2011-03-29 12:23:52 +0000
+++ src/PanelTray.h	2011-04-05 17:30:38 +0000
@@ -71,7 +71,5 @@
   int        _last_y;
   
   gulong  _tray_expose_id;
-  guint   _idle_add_sync_handler;
-  guint   _idle_remove_sync_handler;
 };
 #endif

=== modified file 'src/PlacesController.cpp'
--- src/PlacesController.cpp	2011-03-24 00:35:26 +0000
+++ src/PlacesController.cpp	2011-04-05 17:30:38 +0000
@@ -123,6 +123,9 @@
 {
   if (_visible)
     return;
+    
+  if (PluginAdapter::Default ()->IsExpoActive () || PluginAdapter::Default ()->IsScaleActive ())
+    return;
   
   if (PluginAdapter::Default ()->IsScreenGrabbed ())
   {

=== modified file 'src/PlacesResultsController.cpp'
--- src/PlacesResultsController.cpp	2011-03-13 21:50:20 +0000
+++ src/PlacesResultsController.cpp	2011-04-05 17:30:38 +0000
@@ -36,6 +36,8 @@
 
 PlacesResultsController::~PlacesResultsController ()
 {
+  if (_make_things_look_nice_id)
+    g_source_remove (_make_things_look_nice_id);
   _results_view->UnReference ();
 }