Merge lp:~3v1n0/unity/application-ql-open-timestamp into lp:unity

[Marco Trevisan (Treviño)]

ApplicationLauncherIcon: On quicklist activate pass the timestamp to the lambda by value

Also, use the correct signature on quicklist activate callback

The fix for this bug has been actually merged with branch lp:~3v1n0/unity/trash-open-timestamp due to a my mistake.

It wasn't complete, though as I missed to correctly pass the timestamp to the idle lambda function and to add tests.
Both added now. ;)

[Brandon Schaefer (brandontschaefer)]

Nice! Looks good to me :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/491/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/491/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/491/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'dash/ApplicationStarterImp.cpp'
--- dash/ApplicationStarterImp.cpp	2013-03-11 22:30:18 +0000
+++ dash/ApplicationStarterImp.cpp	2013-03-14 18:57:25 +0000
@@ -37,7 +37,7 @@
   GdkDisplay* display = gdk_display_get_default();
   glib::Object<GdkAppLaunchContext> app_launch_context(gdk_display_get_app_launch_context(display));
 
-  if (timestamp >= 0)
+  if (timestamp > 0)
     gdk_app_launch_context_set_timestamp(app_launch_context, timestamp);
 
   while (true)

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2013-03-12 21:45:58 +0000
+++ dash/DashView.cpp	2013-03-14 18:57:25 +0000
@@ -200,7 +200,7 @@
     int row_height = 0;
     int results_to_the_left = 0;
     int results_to_the_right = 0;
-    g_variant_get(data, "(iiiiiii)", &last_activated_timestamp_, &column_x, &row_y, &column_width, &row_height, &results_to_the_left, &results_to_the_right);
+    g_variant_get(data, "(tiiiiii)", &last_activated_timestamp_, &column_x, &row_y, &column_width, &row_height, &results_to_the_left, &results_to_the_right);
 
     preview_state_machine_.SetSplitPosition(SplitPosition::CONTENT_AREA, row_y);
     preview_state_machine_.left_results = results_to_the_left;

=== modified file 'dash/DashView.h'
--- dash/DashView.h	2013-03-12 15:21:19 +0000
+++ dash/DashView.h	2013-03-14 18:57:25 +0000
@@ -162,7 +162,7 @@
   OverlayRenderer renderer_;
 
   std::string last_activated_uri_;
-  Time last_activated_timestamp_;
+  guint64 last_activated_timestamp_;
   bool search_in_progress_;
   bool activate_on_finish_;
 

=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2013-03-11 22:30:18 +0000
+++ dash/ResultViewGrid.cpp	2013-03-14 18:57:25 +0000
@@ -208,8 +208,8 @@
   }
 
   active_index_ = index;
-  auto timestamp = nux::GetWindowThread()->GetGraphicsDisplay().GetCurrentEvent().x11_timestamp;
-  glib::Variant data(g_variant_new("(iiiiiii)", timestamp, column_x, row_y, column_width, row_height, left_results, right_results));
+  unsigned long timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
+  glib::Variant data(g_variant_new("(tiiiiii)", timestamp, column_x, row_y, column_width, row_height, left_results, right_results));
   UriActivated.emit(uri, type, data);
 }
 

=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2013-03-05 15:59:56 +0000
+++ hud/HudController.cpp	2013-03-14 18:57:25 +0000
@@ -484,7 +484,7 @@
 
 void Controller::OnSearchActivated(std::string search_string)
 {
-  unsigned int timestamp = nux::GetWindowThread()->GetGraphicsDisplay().GetCurrentEvent().x11_timestamp;
+  unsigned int timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
   hud_service_.ExecuteQueryBySearch(search_string, timestamp);
   ubus.SendMessage(UBUS_HUD_CLOSE_REQUEST);
 }
@@ -492,7 +492,7 @@
 void Controller::OnQueryActivated(Query::Ptr query)
 {
   LOG_DEBUG(logger) << "Activating query, " << query->formatted_text;
-  unsigned int timestamp = nux::GetWindowThread()->GetGraphicsDisplay().GetCurrentEvent().x11_timestamp;
+  unsigned int timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
   hud_service_.ExecuteQuery(query, timestamp);
   ubus.SendMessage(UBUS_HUD_CLOSE_REQUEST);
 }

=== modified file 'launcher/AbstractLauncherIcon.h'
--- launcher/AbstractLauncherIcon.h	2013-03-06 16:38:17 +0000
+++ launcher/AbstractLauncherIcon.h	2013-03-14 18:57:25 +0000
@@ -41,10 +41,9 @@
 namespace launcher
 {
 
-class ActionArg
+struct ActionArg
 {
-public:
-  enum Source
+  enum class Source
   {
     LAUNCHER,
     SWITCHER,
@@ -52,25 +51,24 @@
   };
 
   ActionArg()
-    : source(OTHER)
+    : source(Source::OTHER)
     , button(0)
+    , timestamp(0)
     , target(0)
     , monitor(-1)
-  {
-  }
+  {}
 
-  ActionArg(Source source, int button, Time timestamp = -1,  Window target = 0, int monitor = -1)
+  ActionArg(Source source, int button, unsigned long timestamp = 0,  Window target = 0, int monitor = -1)
     : source(source)
     , button(button)
     , timestamp(timestamp)
     , target(target)
     , monitor(monitor)
-  {
-  }
+  {}
 
   Source source;
   int button;
-  Time timestamp;
+  unsigned long timestamp;
   Window target;
   int monitor;
 };

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2013-03-13 21:13:16 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2013-03-14 18:57:25 +0000
@@ -90,68 +90,68 @@
   // Lambda functions should be fine here because when the application the icon
   // is only ever removed when the application is closed.
   app->window_opened.connect([this](ApplicationWindow const&) {
-                               EnsureWindowState();
-                               UpdateMenus();
-                               UpdateIconGeometries(GetCenters());
-                             });
-  app->window_closed.connect([this]() { EnsureWindowState(); });
-  app->window_moved.connect([this](ApplicationWindow const&) { EnsureWindowState(); });
+    EnsureWindowState();
+    UpdateMenus();
+    UpdateIconGeometries(GetCenters());
+  });
+  app->window_closed.connect(sigc::mem_fun(this, &ApplicationLauncherIcon::EnsureWindowState));
+  app->window_moved.connect(sigc::hide(sigc::mem_fun(this, &ApplicationLauncherIcon::EnsureWindowState)));
 
   app->urgent.changed.connect([this](bool const& urgent) {
-                            LOG_DEBUG(logger) << tooltip_text() << " urgent now " << (urgent ? "true" : "false");
-                            SetQuirk(Quirk::URGENT, urgent);
-                          });
+    LOG_DEBUG(logger) << tooltip_text() << " urgent now " << (urgent ? "true" : "false");
+    SetQuirk(Quirk::URGENT, urgent);
+  });
   app->active.changed.connect([this](bool const& active) {
-                            LOG_DEBUG(logger) << tooltip_text() << " active now " << (active ? "true" : "false");
-                            SetQuirk(Quirk::ACTIVE, active);
-                          });
+    LOG_DEBUG(logger) << tooltip_text() << " active now " << (active ? "true" : "false");
+    SetQuirk(Quirk::ACTIVE, active);
+  });
   app->running.changed.connect([this](bool const& running) {
-                            LOG_DEBUG(logger) << tooltip_text() << " running now " << (running ? "true" : "false");
-                            SetQuirk(Quirk::RUNNING, running);
-
-                            if (running)
-                            {
-                              _source_manager.Remove(ICON_REMOVE_TIMEOUT);
-
-                              /* It can happen that these values are not set
-                               * during initialization if the view is closed
-                               * very early, so we need to make sure that they
-                               * are updated as soon as the view is re-opened. */
-                              if (tooltip_text().empty())
-                                tooltip_text = app_->title();
-
-                              if (icon_name == DEFAULT_ICON)
-                              {
-                                std::string icon = app_->icon();
-                                icon_name = (icon.empty() ? DEFAULT_ICON : icon);
-                              }
-
-                              EnsureWindowState();
-                              UpdateIconGeometries(GetCenters());
-                            }
-                          });
+    LOG_DEBUG(logger) << tooltip_text() << " running now " << (running ? "true" : "false");
+    SetQuirk(Quirk::RUNNING, running);
+
+    if (running)
+    {
+      _source_manager.Remove(ICON_REMOVE_TIMEOUT);
+
+      /* It can happen that these values are not set
+       * during initialization if the view is closed
+       * very early, so we need to make sure that they
+       * are updated as soon as the view is re-opened. */
+      if (tooltip_text().empty())
+        tooltip_text = app_->title();
+
+      if (icon_name == DEFAULT_ICON)
+      {
+        std::string icon = app_->icon();
+        icon_name = (icon.empty() ? DEFAULT_ICON : icon);
+      }
+
+      EnsureWindowState();
+      UpdateIconGeometries(GetCenters());
+    }
+  });
   app->visible.changed.connect([this](bool const& visible) {
-                            if (!IsSticky())
-                              SetQuirk(Quirk::VISIBLE, visible);
-                          });
+    if (!IsSticky())
+      SetQuirk(Quirk::VISIBLE, visible);
+  });
 
   app->closed.connect([this]() {
-                            if (!IsSticky())
-                            {
-                              SetQuirk(Quirk::VISIBLE, false);
+    if (!IsSticky())
+    {
+      SetQuirk(Quirk::VISIBLE, false);
 
-                              /* Use a timeout to remove the icon, this avoids
-                               * that we remove an application that is going
-                               * to be reopened soon. So applications that
-                               * have a splash screen won't be removed from
-                               * the launcher while the splash is closed and
-                               * a new window is opened. */
-                              _source_manager.AddTimeoutSeconds(1, [&] {
-                                Remove();
-                                return false;
-                              }, ICON_REMOVE_TIMEOUT);
-                            }
-                          });
+      /* Use a timeout to remove the icon, this avoids
+       * that we remove an application that is going
+       * to be reopened soon. So applications that
+       * have a splash screen won't be removed from
+       * the launcher while the splash is closed and
+       * a new window is opened. */
+      _source_manager.AddTimeoutSeconds(1, [this] {
+        Remove();
+        return false;
+      }, ICON_REMOVE_TIMEOUT);
+    }
+  });
 
   WindowManager& wm = WindowManager::Default();
   wm.window_minimized.connect(sigc::mem_fun(this, &ApplicationLauncherIcon::OnWindowMinimized));
@@ -262,7 +262,7 @@
    * an unmapped (!= minimized) window around and
    * if so force "Focus" behaviour */
 
-  if (arg.source != ActionArg::SWITCHER)
+  if (arg.source != ActionArg::Source::SWITCHER)
   {
     user_visible = app_->visible();
 
@@ -339,7 +339,7 @@
       }
       else // #2 above
       {
-        if (arg.source != ActionArg::SWITCHER)
+        if (arg.source != ActionArg::Source::SWITCHER)
         {
           Spread(true, 0, false);
         }
@@ -350,7 +350,7 @@
       if (scaleWasActive) // #4 above
       {
         Focus(arg);
-        if (arg.source != ActionArg::SWITCHER)
+        if (arg.source != ActionArg::Source::SWITCHER)
           Spread(true, 0, false);
       }
       else // #3 above
@@ -443,7 +443,7 @@
   if (!app_->OwnsWindow(moved_win))
     return;
 
-  _source_manager.AddTimeout(250, [&] {
+  _source_manager.AddTimeout(250, [this] {
     EnsureWindowState();
     UpdateIconGeometries(GetCenters());
 
@@ -468,31 +468,32 @@
     glib::Object<GFile> desktop_file(g_file_new_for_path(_desktop_file.c_str()));
     _desktop_file_monitor = g_file_monitor_file(desktop_file, G_FILE_MONITOR_NONE,
                                                 nullptr, nullptr);
-    g_file_monitor_set_rate_limit(_desktop_file_monitor, 1000);
+    g_file_monitor_set_rate_limit(_desktop_file_monitor, 2000);
 
-    auto sig = new glib::Signal<void, GFileMonitor*, GFile*, GFile*, GFileMonitorEvent>(_desktop_file_monitor, "changed",
-                                [&] (GFileMonitor*, GFile* f, GFile*, GFileMonitorEvent event_type) {
-                                  switch (event_type)
-                                  {
-                                    case G_FILE_MONITOR_EVENT_DELETED:
-                                    {
-                                      glib::Object<GFile> file(f, glib::AddRef());
-                                      _source_manager.AddTimeoutSeconds(1, [this, file] {
-                                        if (!g_file_query_exists (file, nullptr))
-                                          UnStick();
-                                        return false;
-                                      });
-                                      break;
-                                    }
-                                    case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-                                      UpdateDesktopQuickList();
-                                      UpdateBackgroundColor();
-                                      break;
-                                    default:
-                                      break;
-                                  }
-                                });
-    _gsignals.Add(sig);
+    _gsignals.Add<void, GFileMonitor*, GFile*, GFile*, GFileMonitorEvent>(_desktop_file_monitor, "changed",
+      [this] (GFileMonitor*, GFile* f, GFile*, GFileMonitorEvent event_type) {
+      switch (event_type)
+      {
+        case G_FILE_MONITOR_EVENT_DELETED:
+        {
+          glib::Object<GFile> file(f, glib::AddRef());
+          _source_manager.AddTimeoutSeconds(1, [this, file] {
+            if (!g_file_query_exists (file, nullptr))
+              UnStick();
+            return false;
+          });
+          break;
+        }
+        case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
+        {
+          UpdateDesktopQuickList();
+          UpdateBackgroundColor();
+          break;
+        }
+        default:
+          break;
+      }
+    });
   }
 }
 
@@ -591,7 +592,7 @@
     return;
   }
 
-  bool show_only_visible = arg.source == ActionArg::SWITCHER;
+  bool show_only_visible = arg.source == ActionArg::Source::SWITCHER;
   app_->Focus(show_only_visible, arg.monitor);
 }
 
@@ -645,7 +646,7 @@
   {
     for (GList *l = dbusmenu_menuitem_get_children(_menu_desktop_shortcuts); l; l = l->next)
     {
-      _gsignals.Disconnect(l->data, "item-activated");
+      _gsignals.Disconnect(l->data, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED);
     }
   }
 
@@ -672,15 +673,12 @@
     dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, name);
     dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
     dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-    dbusmenu_menuitem_property_set(item, "shortcut-nick", nicks[index]);
+    std::string nick(nicks[index]);
 
-    auto sig = new glib::Signal<void, DbusmenuMenuitem*, gint>(item, "item-activated",
-                                [&] (DbusmenuMenuitem* item, gint) {
-                                  const gchar *nick;
-                                  nick = dbusmenu_menuitem_property_get(item, "shortcut-nick");
-                                  indicator_desktop_shortcuts_nick_exec(_desktop_shortcuts, nick);
-                                });
-    _gsignals.Add(sig);
+    _gsignals.Add<void, DbusmenuMenuitem*, gint>(item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+    [this, nick] (DbusmenuMenuitem* item, unsigned) {
+      indicator_desktop_shortcuts_nick_exec(_desktop_shortcuts, nick.c_str());
+    });
 
     dbusmenu_menuitem_child_append(_menu_desktop_shortcuts, item);
     index++;
@@ -729,8 +727,8 @@
     dbusmenu_menuitem_property_set_int(menu_item, QuicklistMenuItem::MAXIMUM_LABEL_WIDTH_PROPERTY, MAXIMUM_QUICKLIST_WIDTH);
 
     Window xid = w->window_id();
-    _gsignals.Add<void, DbusmenuMenuitem*, int>(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-      [xid] (DbusmenuMenuitem*, int) {
+    _gsignals.Add<void, DbusmenuMenuitem*, unsigned>(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+      [xid] (DbusmenuMenuitem*, unsigned) {
         WindowManager& wm = WindowManager::Default();
         wm.Activate(xid);
         wm.Raise(xid);
@@ -821,8 +819,8 @@
     dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
     dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
 
-    _gsignals.Add<void, DbusmenuMenuitem*, int>(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-      [&] (DbusmenuMenuitem*, int) {
+    _gsignals.Add<void, DbusmenuMenuitem*, unsigned>(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+      [this] (DbusmenuMenuitem*, unsigned) {
         ToggleSticky();
     });
 
@@ -842,8 +840,8 @@
     dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
     dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
 
-    _gsignals.Add<void, DbusmenuMenuitem*, int>(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-      [&] (DbusmenuMenuitem*, int) {
+    _gsignals.Add<void, DbusmenuMenuitem*, unsigned>(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+      [this] (DbusmenuMenuitem*, unsigned) {
         Quit();
     });
 
@@ -945,9 +943,9 @@
     dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
     dbusmenu_menuitem_property_set_bool(item, QuicklistMenuItem::MARKUP_ENABLED_PROPERTY, TRUE);
 
-    _gsignals.Add<void, DbusmenuMenuitem*, int>(item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-      [&] (DbusmenuMenuitem*, int timestamp) {
-        _source_manager.AddIdle([&] {
+    _gsignals.Add<void, DbusmenuMenuitem*, unsigned>(item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+      [this] (DbusmenuMenuitem*, unsigned timestamp) {
+        _source_manager.AddIdle([this, timestamp] {
           ActivateLauncherIcon(ActionArg(ActionArg::Source::LAUNCHER, 0, timestamp));
           return false;
         });
@@ -1102,7 +1100,7 @@
 void ApplicationLauncherIcon::OnDndEnter()
 {
   /* Disabled, since the DND code is currently disabled as well.
-  _source_manager.AddTimeout(1000, [&] {
+  _source_manager.AddTimeout(1000, [this] {
     OnDndHovered();
     return false;
   }, ICON_DND_OVER_TIMEOUT);
@@ -1152,7 +1150,7 @@
 
 void ApplicationLauncherIcon::OnAcceptDrop(DndData const& dnd_data)
 {
-  auto timestamp = nux::GetWindowThread()->GetGraphicsDisplay().GetCurrentEvent().x11_timestamp;
+  auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
   OpenInstanceWithUris(ValidateUrisForLaunch(dnd_data), timestamp);
 }
 
@@ -1169,7 +1167,7 @@
     }
     else
     {
-      for (int i = 0; i < max_num_monitors; i++)
+      for (int i = 0; i < max_num_monitors; ++i)
       {
         if (WindowVisibleOnMonitor(i))
         {

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2013-03-13 18:07:17 +0000
+++ launcher/Launcher.cpp	2013-03-14 18:57:25 +0000
@@ -2245,7 +2245,7 @@
   }
   else if (_icon_under_mouse)
   {
-    auto timestamp = nux::GetWindowThread()->GetGraphicsDisplay().GetCurrentEvent().x11_timestamp; 
+    auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
     auto scroll_direction = (wheel_delta < 0) ? AbstractLauncherIcon::ScrollDirection::DOWN : AbstractLauncherIcon::ScrollDirection::UP;
     _icon_under_mouse->PerformScroll(scroll_direction, timestamp);
   }

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2013-03-06 13:13:37 +0000
+++ launcher/LauncherController.cpp	2013-03-14 18:57:25 +0000
@@ -1262,9 +1262,9 @@
       if (TimeUtil::TimeDelta(&current, &last_action_time) > local::ignore_repeat_shortcut_duration)
       {
         if (g_ascii_isdigit((gchar)(*it)->GetShortcut()) && (key_state & ShiftMask))
-          (*it)->OpenInstance(ActionArg(ActionArg::LAUNCHER, 0, timestamp));
+          (*it)->OpenInstance(ActionArg(ActionArg::Source::LAUNCHER, 0, timestamp));
         else
-          (*it)->Activate(ActionArg(ActionArg::LAUNCHER, 0, timestamp));
+          (*it)->Activate(ActionArg(ActionArg::Source::LAUNCHER, 0, timestamp));
       }
 
       // disable the "tap on super" check
@@ -1384,10 +1384,10 @@
 
   if (activate)
   {
-    auto timestamp = nux::GetWindowThread()->GetGraphicsDisplay().GetCurrentEvent().x11_timestamp;
+    auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
 
     pimpl->sources_.AddIdle([this, timestamp] {
-      pimpl->model_->Selection()->Activate(ActionArg(ActionArg::LAUNCHER, 0, timestamp));
+      pimpl->model_->Selection()->Activate(ActionArg(ActionArg::Source::LAUNCHER, 0, timestamp));
       return false;
     });
   }
@@ -1488,8 +1488,8 @@
       // <SPACE> (open a new instance)
     case NUX_VK_SPACE:
     {
-      auto timestamp = nux::GetWindowThread()->GetGraphicsDisplay().GetCurrentEvent().x11_timestamp;
-      model_->Selection()->OpenInstance(ActionArg(ActionArg::LAUNCHER, 0, timestamp));
+      auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
+      model_->Selection()->OpenInstance(ActionArg(ActionArg::Source::LAUNCHER, 0, timestamp));
       parent_->KeyNavTerminate(false);
       break;
     }

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2013-03-06 16:38:17 +0000
+++ launcher/LauncherIcon.cpp	2013-03-14 18:57:25 +0000
@@ -651,9 +651,9 @@
 
 void LauncherIcon::RecvMouseClick(int button, int monitor, unsigned long key_flags)
 {
-  auto timestamp = nux::GetWindowThread()->GetGraphicsDisplay().GetCurrentEvent().x11_timestamp;
+  auto timestamp = nux::GetGraphicsDisplay()->GetCurrentEvent().x11_timestamp;
 
-  ActionArg arg(ActionArg::LAUNCHER, button, timestamp);
+  ActionArg arg(ActionArg::Source::LAUNCHER, button, timestamp);
   arg.monitor = monitor;
 
   bool shift_pressed = nux::GetKeyModifierState(key_flags, nux::NUX_STATE_SHIFT);

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2013-03-07 16:48:26 +0000
+++ launcher/SwitcherController.cpp	2013-03-14 18:57:25 +0000
@@ -426,8 +426,8 @@
     Selection selection = GetCurrentSelection();
     if (selection.application_)
     {
-      Time timestamp = -1;
-      selection.application_->Activate(ActionArg(ActionArg::SWITCHER, 0,
+      Time timestamp = 0;
+      selection.application_->Activate(ActionArg(ActionArg::Source::SWITCHER, 0,
                                                  timestamp, selection.window_));
     }
   }

=== modified file 'plugins/unityshell/src/unity-launcher-icon-accessible.cpp'
--- plugins/unityshell/src/unity-launcher-icon-accessible.cpp	2012-08-02 11:30:02 +0000
+++ plugins/unityshell/src/unity-launcher-icon-accessible.cpp	2013-03-14 18:57:25 +0000
@@ -465,7 +465,7 @@
 
   icon = dynamic_cast<LauncherIcon*>(nux_object);
 
-  icon->Activate(ActionArg(ActionArg::LAUNCHER, 0));
+  icon->Activate(ActionArg(ActionArg::Source::LAUNCHER, 0));
 
   return TRUE;
 }

=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2013-03-06 16:38:17 +0000
+++ tests/test_application_launcher_icon.cpp	2013-03-14 18:57:25 +0000
@@ -30,9 +30,11 @@
 #include "StandaloneWindowManager.h"
 #include "mock-application.h"
 #include "StandaloneWindowManager.h"
+#include "test_utils.h"
 
+using namespace testing;
+using namespace testmocks;
 using namespace unity;
-using namespace testmocks;
 using namespace unity::launcher;
 
 namespace
@@ -41,22 +43,39 @@
 const std::string USC_DESKTOP = BUILDDIR"/tests/data/applications/ubuntu-software-center.desktop";
 const std::string NO_ICON_DESKTOP = BUILDDIR"/tests/data/applications/no-icon.desktop";
 
-class TestApplicationLauncherIcon : public testing::Test
-{
-public:
+struct MockApplicationLauncherIcon : ApplicationLauncherIcon
+{
+  MockApplicationLauncherIcon(ApplicationPtr const& app)
+    : ApplicationLauncherIcon(app)
+  {}
+
+  MOCK_METHOD1(ActivateLauncherIcon, void(ActionArg));
+};
+
+MATCHER_P(AreArgsEqual, a, "")
+{
+  return arg.source == a.source &&
+         arg.button == a.button &&
+         arg.timestamp == a.timestamp &&
+         arg.target == a.target;
+         arg.monitor = a.monitor;
+}
+
+struct TestApplicationLauncherIcon : Test
+{
   virtual void SetUp()
   {
     WM = dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default());
-    usc_app.reset(new MockApplication(USC_DESKTOP, "softwarecenter"));
-    usc_icon = new launcher::ApplicationLauncherIcon(usc_app);
+    usc_app = std::make_shared<MockApplication>(USC_DESKTOP, "softwarecenter");
+    usc_icon = new NiceMock<MockApplicationLauncherIcon>(usc_app);
     ASSERT_EQ(usc_icon->DesktopFile(), USC_DESKTOP);
 
-    empty_app.reset(new MockApplication(NO_ICON_DESKTOP));
-    empty_icon = new launcher::ApplicationLauncherIcon(empty_app);
+    empty_app = std::make_shared<MockApplication>(NO_ICON_DESKTOP);
+    empty_icon = new NiceMock<MockApplicationLauncherIcon>(empty_app);
     ASSERT_EQ(empty_icon->DesktopFile(), NO_ICON_DESKTOP);
 
-    mock_app.reset(new MockApplication(""));
-    mock_icon = new launcher::ApplicationLauncherIcon(mock_app);
+    mock_app = std::make_shared<MockApplication>("");
+    mock_icon = new NiceMock<MockApplicationLauncherIcon>(mock_app);
     ASSERT_TRUE(mock_icon->DesktopFile().empty());
   }
 
@@ -76,9 +95,9 @@
   std::shared_ptr<MockApplication> usc_app;
   std::shared_ptr<MockApplication> empty_app;
   std::shared_ptr<MockApplication> mock_app;
-  nux::ObjectPtr<launcher::ApplicationLauncherIcon> usc_icon;
-  nux::ObjectPtr<launcher::ApplicationLauncherIcon> empty_icon;
-  nux::ObjectPtr<launcher::ApplicationLauncherIcon> mock_icon;
+  nux::ObjectPtr<MockApplicationLauncherIcon> usc_icon;
+  nux::ObjectPtr<MockApplicationLauncherIcon> empty_icon;
+  nux::ObjectPtr<MockApplicationLauncherIcon> mock_icon;
 };
 
 TEST_F(TestApplicationLauncherIcon, Position)
@@ -443,4 +462,29 @@
   ASSERT_EQ(menu1_it, menus.end());
 }
 
+TEST_F(TestApplicationLauncherIcon, QuicklistMenuItemForAppName)
+{
+  mock_app->title_ = "MockApplicationTitle";
+
+  auto const& menus = mock_icon->Menus();
+  auto app_it = std::find_if(menus.begin(), menus.end(), [this] (glib::Object<DbusmenuMenuitem> it) {
+    auto* label = dbusmenu_menuitem_property_get(it, DBUSMENU_MENUITEM_PROP_LABEL);
+    return (label && std::string(label) == ("<b>"+mock_app->title_+"</b>"));
+  });
+
+  ASSERT_NE(app_it, menus.end());
+
+  bool method_called = false;
+  ON_CALL(*mock_icon, ActivateLauncherIcon(_)).WillByDefault(Invoke([&method_called] (ActionArg arg) {
+    method_called = true;
+  }));
+
+  unsigned time = g_random_int();
+  EXPECT_CALL(*mock_icon, ActivateLauncherIcon(AreArgsEqual(ActionArg(ActionArg::Source::LAUNCHER, 0, time))));
+  dbusmenu_menuitem_handle_event(*app_it, DBUSMENU_MENUITEM_EVENT_ACTIVATED, nullptr, time);
+
+  Utils::WaitUntilMSec(method_called);
+  EXPECT_TRUE(method_called);
+}
+
 }