Merge lp:~3v1n0/unity/app-quicklist-quit-override into lp:unity

[Marco Trevisan (Treviño)]

ApplicationLauncherIcon: improve the way we override the Quit quicklist item

If a quit action is defined in static (desktop file action) or dynamic way we
use it to override the default one, placing it to the proper position.
Also override more labels by default and if a quicklist item has the
QuicklistMenuItem::QUIT_ACTION_PROPERTY (defined as "unity-quit-action")
property set to TRUE, then we use this item as the quit quicklist item.

Factorized the code we use to generate both static and dynamic ql items.

Improved the code to override the quit quicklist entry so that it can be overridden by multiple labels and by a dbusmenu property.

Added virtual GetRemoteMenus to LauncherIcon so that it can be overridden in tests and it's finally possible to test quicklist remote entries.

Added a bunch of new tests to cover Remote quicklist entries, desktop actions quicklists, and Quit QL overriding.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3429
http://jenkins.qa.ubuntu.com/job/unity-ci/162/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/50/console

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

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Merges and compiles cleanly. Tests run and pass. Code looks good.

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3429
http://jenkins.qa.ubuntu.com/job/unity-ci/179/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/67

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

review: Approve (continuous-integration)

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2013-06-28 14:06:31 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2013-06-28 14:06:31 +0000
@@ -871,7 +871,7 @@
   }
 }
 
-void ApplicationLauncherIcon::EnsureMenuItemsControlReady()
+void ApplicationLauncherIcon::EnsureMenuItemsDefaultReady()
 {
   if (_menu_items.size() == MenuItemType::SIZE)
     return;
@@ -914,24 +914,18 @@
 AbstractLauncherIcon::MenuItemsVector ApplicationLauncherIcon::GetMenus()
 {
   MenuItemsVector result;
+  glib::Object<DbusmenuMenuitem> quit_item;
   bool separator_needed = false;
 
-  EnsureMenuItemsControlReady();
+  EnsureMenuItemsDefaultReady();
   UpdateMenus();
 
-  std::vector<glib::Object<DbusmenuClient>> menu_clients = { _menuclient_dynamic_quicklist };
-
-  for (auto const& client : menu_clients)
+  for (auto const& menus : {GetRemoteMenus(), _menu_desktop_shortcuts})
   {
-    if (!client || !client.IsType(DBUSMENU_TYPE_CLIENT))
-      continue;
-
-    DbusmenuMenuitem* root = dbusmenu_client_get_root(client);
-
-    if (!root || !dbusmenu_menuitem_property_get_bool(root, DBUSMENU_MENUITEM_PROP_VISIBLE))
-      continue;
-
-    for (GList* l = dbusmenu_menuitem_get_children(root); l; l = l->next)
+    if (!menus.IsType(DBUSMENU_TYPE_MENUITEM))
+      continue;
+
+    for (GList* l = dbusmenu_menuitem_get_children(menus); l; l = l->next)
     {
       glib::Object<DbusmenuMenuitem> item(static_cast<DbusmenuMenuitem*>(l->data), glib::AddRef());
 
@@ -940,29 +934,36 @@
 
       if (dbusmenu_menuitem_property_get_bool(item, DBUSMENU_MENUITEM_PROP_VISIBLE))
       {
+        dbusmenu_menuitem_property_set_bool(item, QuicklistMenuItem::MARKUP_ENABLED_PROPERTY, FALSE);
+
+        const gchar* type = dbusmenu_menuitem_property_get(item, DBUSMENU_MENUITEM_PROP_TYPE);
+
+        if (!type) // (g_strcmp0 (type, DBUSMENU_MENUITEM_PROP_LABEL) == 0)
+        {
+          if (dbusmenu_menuitem_property_get_bool(item, QuicklistMenuItem::QUIT_ACTION_PROPERTY))
+          {
+            quit_item = item;
+            continue;
+          }
+
+          const gchar* l = dbusmenu_menuitem_property_get(item, DBUSMENU_MENUITEM_PROP_LABEL);
+          auto const& label = glib::gchar_to_string(l);
+
+          if (label == _("Quit")  || label == "Quit"  ||
+              label == _("Exit")  || label == "Exit"  ||
+              label == _("Close") || label == "Close")
+          {
+            quit_item = item;
+            continue;
+          }
+        }
+
         separator_needed = true;
-        dbusmenu_menuitem_property_set_bool(item, QuicklistMenuItem::MARKUP_ENABLED_PROPERTY, FALSE);
-
         result.push_back(item);
       }
     }
   }
 
-  // FIXME: this should totally be added as a _menu_client
-  if (DBUSMENU_IS_MENUITEM(_menu_desktop_shortcuts.RawPtr()))
-  {
-    for (GList* l = dbusmenu_menuitem_get_children(_menu_desktop_shortcuts); l; l = l->next)
-    {
-      glib::Object<DbusmenuMenuitem> item(static_cast<DbusmenuMenuitem*>(l->data), glib::AddRef());
-
-      if (!item.IsType(DBUSMENU_TYPE_MENUITEM))
-        continue;
-
-      separator_needed = true;
-      result.push_back(item);
-    }
-  }
-
   if (separator_needed)
   {
     result.push_back(_menu_items[MenuItemType::SEPARATOR]);
@@ -975,9 +976,7 @@
     std::string bold_app_name("<b>"+app_name.Str()+"</b>");
 
     glib::Object<DbusmenuMenuitem> item(dbusmenu_menuitem_new());
-    dbusmenu_menuitem_property_set(item,
-                                   DBUSMENU_MENUITEM_PROP_LABEL,
-                                   bold_app_name.c_str());
+    dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, bold_app_name.c_str());
     dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
     dbusmenu_menuitem_property_set_bool(item, QuicklistMenuItem::MARKUP_ENABLED_PROPERTY, TRUE);
 
@@ -1011,29 +1010,11 @@
 
   if (IsRunning())
   {
-    bool exists = false;
-    auto const& it = _menu_items[MenuItemType::QUIT];
-    const gchar* label = dbusmenu_menuitem_property_get(it, DBUSMENU_MENUITEM_PROP_LABEL);
-    auto const& label_default = glib::gchar_to_string(label);
-
-    for (auto menu_item : result)
-    {
-      const gchar* type = dbusmenu_menuitem_property_get(menu_item, DBUSMENU_MENUITEM_PROP_TYPE);
-
-      if (!type)//(g_strcmp0 (type, DBUSMENU_MENUITEM_PROP_LABEL) == 0)
-      {
-        label = dbusmenu_menuitem_property_get(menu_item, DBUSMENU_MENUITEM_PROP_LABEL);
-
-        if (glib::gchar_to_string(label) == label_default)
-        {
-          exists = true;
-          break;
-        }
-      }
-    }
-
-    if (!exists)
-      result.push_back(it);
+    if (!quit_item)
+      quit_item = _menu_items[MenuItemType::QUIT];
+
+    dbusmenu_menuitem_property_set(quit_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Quit"));
+    result.push_back(quit_item);
   }
 
   return result;

=== modified file 'launcher/ApplicationLauncherIcon.h'
--- launcher/ApplicationLauncherIcon.h	2013-06-28 14:06:31 +0000
+++ launcher/ApplicationLauncherIcon.h	2013-06-28 14:06:31 +0000
@@ -114,7 +114,7 @@
   void DisconnectApplicationSignalsConnections();
   void EnsureWindowState();
   void EnsureMenuItemsWindowsReady();
-  void EnsureMenuItemsControlReady();
+  void EnsureMenuItemsDefaultReady();
   void UpdateBackgroundColor();
   void UpdateMenus();
   void UpdateDesktopQuickList();

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2013-05-24 16:16:40 +0000
+++ launcher/LauncherIcon.cpp	2013-06-28 14:06:31 +0000
@@ -1113,7 +1113,7 @@
   if (_remote_urgent)
     SetQuirk(Quirk::URGENT, false);
 
-  _menuclient_dynamic_quicklist = nullptr;
+  _remote_menus = nullptr;
 }
 
 void
@@ -1160,7 +1160,7 @@
 void
 LauncherIcon::OnRemoteQuicklistChanged(LauncherEntryRemote* remote)
 {
-  _menuclient_dynamic_quicklist = remote->Quicklist();
+  _remote_menus = remote->Quicklist();
 }
 
 void
@@ -1194,6 +1194,22 @@
     SetProgress(remote->Progress());
 }
 
+glib::Object<DbusmenuMenuitem> LauncherIcon::GetRemoteMenus() const
+{
+  if (!_remote_menus.IsType(DBUSMENU_TYPE_CLIENT))
+    return glib::Object<DbusmenuMenuitem>();
+
+  glib::Object<DbusmenuMenuitem> root(dbusmenu_client_get_root(_remote_menus), glib::AddRef());
+
+  if (!root.IsType(DBUSMENU_TYPE_MENUITEM) ||
+      !dbusmenu_menuitem_property_get_bool(root, DBUSMENU_MENUITEM_PROP_VISIBLE))
+  {
+    return glib::Object<DbusmenuMenuitem>();
+  }
+
+  return root;
+}
+
 void LauncherIcon::EmitNeedsRedraw()
 {
   if (OwnsTheReference() && GetReferenceCount() > 0)

=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2013-05-17 22:53:57 +0000
+++ launcher/LauncherIcon.h	2013-06-28 14:06:31 +0000
@@ -198,6 +198,8 @@
 
   virtual void UnStick();
 
+  virtual glib::Object<DbusmenuMenuitem> GetRemoteMenus() const;
+
   void PerformScroll(ScrollDirection direction, Time timestamp) override;
 
 protected:
@@ -291,8 +293,6 @@
   // This looks like a case for boost::logical::tribool
   static int _current_theme_is_mono;
 
-  glib::Object<DbusmenuClient> _menuclient_dynamic_quicklist;
-
 private:
   IconType _icon_type;
 
@@ -339,6 +339,7 @@
   bool             _allow_quicklist_to_show;
 
   std::list<LauncherEntryRemote::Ptr> _entry_list;
+  glib::Object<DbusmenuClient> _remote_menus;
 
   nux::animation::AnimateValue<double> _tooltip_fade_animator;
 

=== modified file 'launcher/QuicklistMenuItem.cpp'
--- launcher/QuicklistMenuItem.cpp	2013-04-18 10:32:43 +0000
+++ launcher/QuicklistMenuItem.cpp	2013-06-28 14:06:31 +0000
@@ -32,6 +32,7 @@
 const char* QuicklistMenuItem::MARKUP_ACCEL_DISABLED_PROPERTY = "unity-disable-accel";
 const char* QuicklistMenuItem::MAXIMUM_LABEL_WIDTH_PROPERTY = "unity-max-label-width";
 const char* QuicklistMenuItem::OVERLAY_MENU_ITEM_PROPERTY = "unity-overlay-item";
+const char* QuicklistMenuItem::QUIT_ACTION_PROPERTY = "unity-quit-action";
 
 NUX_IMPLEMENT_OBJECT_TYPE(QuicklistMenuItem);
 

=== modified file 'launcher/QuicklistMenuItem.h'
--- launcher/QuicklistMenuItem.h	2013-04-09 18:35:24 +0000
+++ launcher/QuicklistMenuItem.h	2013-06-28 14:06:31 +0000
@@ -90,6 +90,7 @@
   static const char* MARKUP_ACCEL_DISABLED_PROPERTY;
   static const char* MAXIMUM_LABEL_WIDTH_PROPERTY;
   static const char* OVERLAY_MENU_ITEM_PROPERTY;
+  static const char* QUIT_ACTION_PROPERTY;
 
 protected:
   // Introspection

=== modified file 'tests/data/applications/ubuntu-software-center.desktop'
--- tests/data/applications/ubuntu-software-center.desktop	2013-03-25 18:22:32 +0000
+++ tests/data/applications/ubuntu-software-center.desktop	2013-06-28 14:06:31 +0000
@@ -11,3 +11,14 @@
 StartupNotify=true
 X-Ubuntu-Gettext-Domain=software-center
 X-Unity-IconBackgroundColor=#aabbcc
+Actions=TestAction;Quit;
+
+[Desktop Action TestAction]
+Name=Test Action
+Exec=/bin/true
+OnlyShowIn=Unity;
+
+[Desktop Action Quit]
+Name=Quit
+Exec=/bin/true
+OnlyShowIn=Unity;
\ No newline at end of file

=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2013-06-28 14:06:31 +0000
+++ tests/test_application_launcher_icon.cpp	2013-06-28 14:06:31 +0000
@@ -52,12 +52,14 @@
     ON_CALL(*this, Stick(_)).WillByDefault(Invoke([this] (bool save) { ApplicationLauncherIcon::Stick(save); }));
     ON_CALL(*this, Stick()).WillByDefault(Invoke([this] { ApplicationLauncherIcon::Stick(); }));
     ON_CALL(*this, UnStick()).WillByDefault(Invoke([this] { ApplicationLauncherIcon::UnStick(); }));
+    ON_CALL(*this, GetRemoteMenus()).WillByDefault(Invoke([] { return glib::Object<DbusmenuMenuitem>(); }));
   }
 
   MOCK_METHOD1(ActivateLauncherIcon, void(ActionArg));
   MOCK_METHOD1(Stick, void(bool));
   MOCK_METHOD0(Stick, void());
   MOCK_METHOD0(UnStick, void());
+  MOCK_CONST_METHOD0(GetRemoteMenus, glib::Object<DbusmenuMenuitem>());
 
   using ApplicationLauncherIcon::IsFileManager;
 };
@@ -572,7 +574,7 @@
 {
   mock_app->SetRunState(true);
   auto const& menu_item = GetMenuItemWithLabel(mock_icon, "Quit");
-  EXPECT_NE(menu_item, nullptr);
+  ASSERT_NE(menu_item, nullptr);
 
   EXPECT_CALL(*mock_app, Quit());
   dbusmenu_menuitem_handle_event(menu_item, DBUSMENU_MENUITEM_EVENT_ACTIVATED, nullptr, 0);
@@ -606,6 +608,168 @@
   EXPECT_TRUE(method_called);
 }
 
+TEST_F(TestApplicationLauncherIcon, QuicklistMenuItemDesktopAction)
+{
+  EXPECT_TRUE(HasMenuItemWithLabel(usc_icon, "Test Action"));
+}
+
+TEST_F(TestApplicationLauncherIcon, QuicklistMenuItemDesktopActionOverridesQuitNotRunning)
+{
+  mock_app->SetRunState(false);
+  EXPECT_FALSE(HasMenuItemWithLabel(usc_icon, "Quit"));
+}
+
+TEST_F(TestApplicationLauncherIcon, QuicklistMenuItemDesktopActionOverridesQuitRunning)
+{
+  usc_app->SetRunState(true);
+  auto const& item = GetMenuItemWithLabel(usc_icon, "Quit");
+  ASSERT_NE(item, nullptr);
+  EXPECT_CALL(*usc_app, Quit()).Times(0);
+
+  dbusmenu_menuitem_handle_event(item, DBUSMENU_MENUITEM_EVENT_ACTIVATED, nullptr, 0);
+}
+
+TEST_F(TestApplicationLauncherIcon, QuicklistMenuItemRemote)
+{
+  unsigned time = g_random_int();
+  glib::Object<DbusmenuMenuitem> root(dbusmenu_menuitem_new());
+  glib::Object<DbusmenuMenuitem> item(dbusmenu_menuitem_new());
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "RemoteLabel");
+  dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+  dbusmenu_menuitem_child_append(root, item);
+
+  bool cb_called = false;
+  glib::Signal<void, DbusmenuMenuitem*, unsigned> signal(item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+  [&cb_called, item, time] (DbusmenuMenuitem* menu, unsigned timestamp) {
+    cb_called = true;
+    EXPECT_EQ(menu, item);
+    EXPECT_EQ(timestamp, time);
+  });
+
+  ON_CALL(*mock_icon, GetRemoteMenus()).WillByDefault(Invoke([&root] { return root; }));
+  EXPECT_CALL(*mock_icon, GetRemoteMenus());
+  EXPECT_TRUE(HasMenuItemWithLabel(mock_icon, "RemoteLabel"));
+
+  dbusmenu_menuitem_handle_event(item, DBUSMENU_MENUITEM_EVENT_ACTIVATED, nullptr, time);
+  EXPECT_TRUE(cb_called);
+}
+
+TEST_F(TestApplicationLauncherIcon, QuicklistMenuItemRemoteDisablesMarkup)
+{
+  glib::Object<DbusmenuMenuitem> root(dbusmenu_menuitem_new());
+  glib::Object<DbusmenuMenuitem> item(dbusmenu_menuitem_new());
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "RemoteLabel");
+  dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+  dbusmenu_menuitem_property_set_bool(item, QuicklistMenuItem::MARKUP_ENABLED_PROPERTY, TRUE);
+  ASSERT_TRUE(dbusmenu_menuitem_property_get_bool(item, QuicklistMenuItem::MARKUP_ENABLED_PROPERTY));
+  dbusmenu_menuitem_child_append(root, item);
+
+  ON_CALL(*mock_icon, GetRemoteMenus()).WillByDefault(Invoke([&root] { return root; }));
+
+  item = GetMenuItemWithLabel(mock_icon, "RemoteLabel");
+  ASSERT_NE(item, nullptr);
+  EXPECT_FALSE(dbusmenu_menuitem_property_get_bool(item, QuicklistMenuItem::MARKUP_ENABLED_PROPERTY));
+}
+
+TEST_F(TestApplicationLauncherIcon, QuicklistMenuItemRemoteIgnoresInvisible)
+{
+  glib::Object<DbusmenuMenuitem> root(dbusmenu_menuitem_new());
+  glib::Object<DbusmenuMenuitem> item(dbusmenu_menuitem_new());
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "InvisibleLabel");
+  dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+  dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
+  ASSERT_FALSE(dbusmenu_menuitem_property_get_bool(item, DBUSMENU_MENUITEM_PROP_VISIBLE));
+  dbusmenu_menuitem_child_append(root, item);
+
+  ON_CALL(*mock_icon, GetRemoteMenus()).WillByDefault(Invoke([&root] { return root; }));
+
+  EXPECT_FALSE(HasMenuItemWithLabel(mock_icon, "InvisibleLabel"));
+}
+
+struct QuitLabel : TestApplicationLauncherIcon, testing::WithParamInterface<std::string> {};
+INSTANTIATE_TEST_CASE_P(TestApplicationLauncherIcon, QuitLabel, testing::Values("Quit", "Exit", "Close"));
+
+TEST_P(/*TestApplicationLauncherIcon*/QuitLabel, QuicklistMenuItemRemoteOverridesQuitByLabelNotRunning)
+{
+  mock_app->SetRunState(false);
+  glib::Object<DbusmenuMenuitem> root(dbusmenu_menuitem_new());
+  glib::Object<DbusmenuMenuitem> item(dbusmenu_menuitem_new());
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, GetParam().c_str());
+  dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+  dbusmenu_menuitem_child_append(root, item);
+
+  ON_CALL(*mock_icon, GetRemoteMenus()).WillByDefault(Invoke([&root] { return root; }));
+
+  EXPECT_FALSE(HasMenuItemWithLabel(mock_icon, GetParam()));
+}
+
+TEST_P(/*TestApplicationLauncherIcon*/QuitLabel, QuicklistMenuItemRemoteOverridesQuitByLabel)
+{
+  mock_app->SetRunState(true);
+  unsigned time = g_random_int();
+  glib::Object<DbusmenuMenuitem> root(dbusmenu_menuitem_new());
+  glib::Object<DbusmenuMenuitem> item(dbusmenu_menuitem_new());
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, GetParam().c_str());
+  dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+  dbusmenu_menuitem_child_append(root, item);
+
+  bool cb_called = false;
+  glib::Signal<void, DbusmenuMenuitem*, unsigned> signal(item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
+  [&cb_called, item, time] (DbusmenuMenuitem* menu, unsigned timestamp) {
+    cb_called = true;
+    EXPECT_EQ(menu, item);
+    EXPECT_EQ(timestamp, time);
+  });
+
+  ON_CALL(*mock_icon, GetRemoteMenus()).WillByDefault(Invoke([&root] { return root; }));
+
+  if (GetParam() != "Quit")
+    ASSERT_FALSE(HasMenuItemWithLabel(mock_icon, GetParam()));
+
+  item = GetMenuItemWithLabel(mock_icon, "Quit");
+  ASSERT_NE(item, nullptr);
+  EXPECT_CALL(*mock_app, Quit()).Times(0);
+
+  dbusmenu_menuitem_handle_event(item, DBUSMENU_MENUITEM_EVENT_ACTIVATED, nullptr, time);
+  EXPECT_TRUE(cb_called);
+}
+
+TEST_F(TestApplicationLauncherIcon, QuicklistMenuItemRemoteOverridesQuitByPropertyNotRunning)
+{
+  mock_app->SetRunState(false);
+  glib::Object<DbusmenuMenuitem> root(dbusmenu_menuitem_new());
+  glib::Object<DbusmenuMenuitem> item(dbusmenu_menuitem_new());
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "Custom Quit Label");
+  dbusmenu_menuitem_property_set_bool(item, QuicklistMenuItem::QUIT_ACTION_PROPERTY, TRUE);
+  dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+  dbusmenu_menuitem_child_append(root, item);
+
+  ON_CALL(*mock_icon, GetRemoteMenus()).WillByDefault(Invoke([&root] { return root; }));
+
+  EXPECT_FALSE(HasMenuItemWithLabel(mock_icon, "Custom Quit Label"));
+  EXPECT_FALSE(HasMenuItemWithLabel(mock_icon, "Quit"));
+}
+
+TEST_F(TestApplicationLauncherIcon, QuicklistMenuItemRemoteOverridesQuitByProperty)
+{
+  mock_app->SetRunState(true);
+  glib::Object<DbusmenuMenuitem> root(dbusmenu_menuitem_new());
+  glib::Object<DbusmenuMenuitem> item(dbusmenu_menuitem_new());
+  dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "Custom Quit Label");
+  dbusmenu_menuitem_property_set_bool(item, QuicklistMenuItem::QUIT_ACTION_PROPERTY, TRUE);
+  dbusmenu_menuitem_property_set_bool(item, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
+  dbusmenu_menuitem_child_append(root, item);
+
+  ON_CALL(*mock_icon, GetRemoteMenus()).WillByDefault(Invoke([&root] { return root; }));
+
+  EXPECT_FALSE(HasMenuItemWithLabel(mock_icon, "Custom Quit Label"));
+  auto new_item = GetMenuItemWithLabel(mock_icon, "Quit");
+  ASSERT_EQ(new_item, item);
+
+  EXPECT_CALL(*mock_app, Quit()).Times(0);
+  dbusmenu_menuitem_handle_event(item, DBUSMENU_MENUITEM_EVENT_ACTIVATED, nullptr, 0);
+}
+
 TEST_F(TestApplicationLauncherIcon, IsFileManager)
 {
   EXPECT_FALSE(usc_icon->IsFileManager());