Merge lp:~3v1n0/unity/remove-bamf-indicators into lp:unity

[Marco Trevisan (Treviño)]

ApplicationManager: remove ApplicationMenu support

Since BamfIndicators are deprecated

This is the work needed to merge lp:~3v1n0/bamf/remove-indicators

Bamf Indicators were used to add quicklist to unity, but this is now completely handled by libunity so we can safely delete this.

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2012-12-05 10:24:53 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2012-12-18 18:24:21 +0000
@@ -662,17 +662,6 @@
 
 void ApplicationLauncherIcon::UpdateMenus()
 {
-  for (auto& app_menu : app_->GetRemoteMenus())
-  {
-    // we already have this
-    if (_menu_clients.find(app_menu.path) != _menu_clients.end())
-      continue;
-
-    glib::Object<DbusmenuClient> client(dbusmenu_client_new(app_menu.remote_address.c_str(),
-                                                            app_menu.path.c_str()));
-    _menu_clients[app_menu.path] = client;
-  }
-
   // add dynamic quicklist
   if (_menuclient_dynamic_quicklist && _menuclient_dynamic_quicklist.IsType(DBUSMENU_TYPE_CLIENT))
   {

=== modified file 'tests/mock-application.h'
--- tests/mock-application.h	2012-11-28 09:34:44 +0000
+++ tests/mock-application.h	2012-12-18 18:24:21 +0000
@@ -71,7 +71,6 @@
   virtual bool OwnsWindow(Window window_id) const { return false; }
 
   virtual std::vector<std::string> GetSupportedMimeTypes() const { return {}; }
-  virtual std::vector<unity::ApplicationMenu> GetRemoteMenus() const { return {}; }
 
   virtual unity::ApplicationWindowPtr GetFocusableWindow() const { return unity::ApplicationWindowPtr(); }
   virtual void Focus(bool show_on_visible, int monitor) const  {}

=== modified file 'unity-shared/ApplicationManager.h'
--- unity-shared/ApplicationManager.h	2012-11-28 08:47:23 +0000
+++ unity-shared/ApplicationManager.h	2012-12-18 18:24:21 +0000
@@ -67,15 +67,6 @@
   nux::ROProperty<bool> urgent;
 };
 
-// Used for dbus menus, and nicer than a std::pair of strings.
-struct ApplicationMenu
-{
-  ApplicationMenu(std::string const& path, std::string const& address)
-    : path(path), remote_address(address) {}
-  std::string path;
-  std::string remote_address;
-};
-
 
 class Application
 {
@@ -94,7 +85,6 @@
   virtual bool OwnsWindow(Window window_id) const = 0;
 
   virtual std::vector<std::string> GetSupportedMimeTypes() const = 0;
-  virtual std::vector<ApplicationMenu> GetRemoteMenus() const = 0;
 
   virtual ApplicationWindowPtr GetFocusableWindow() const = 0;
   virtual void Focus(bool show_on_visible, int monitor) const = 0;

=== modified file 'unity-shared/BamfApplicationManager.cpp'
--- unity-shared/BamfApplicationManager.cpp	2012-11-28 22:00:12 +0000
+++ unity-shared/BamfApplicationManager.cpp	2012-12-18 18:24:21 +0000
@@ -398,27 +398,6 @@
   return result;
 }
 
-std::vector<ApplicationMenu> Application::GetRemoteMenus() const
-{
-  std::vector<ApplicationMenu> result;
-  std::shared_ptr<GList> children(bamf_view_get_children(bamf_view_), g_list_free);
-  for (GList* l = children.get(); l; l = l->next)
-  {
-    if (!BAMF_IS_INDICATOR(l->data))
-      continue;
-
-    auto indicator = static_cast<BamfIndicator*>(l->data);
-    const gchar* path = bamf_indicator_get_dbus_menu_path(indicator);
-    const gchar* address = bamf_indicator_get_remote_address(indicator);
-
-    // It is possible for path or address to be null on error condintions, or if
-    // the remote is not ready.
-    if (path && address)
-      result.push_back(ApplicationMenu(path, address));
-  }
-  return result;
-}
-
 ApplicationWindowPtr Application::GetFocusableWindow() const
 {
   glib::Object<BamfView> view(bamf_application_get_focusable_child(bamf_app_),

=== modified file 'unity-shared/BamfApplicationManager.h'
--- unity-shared/BamfApplicationManager.h	2012-11-28 08:47:23 +0000
+++ unity-shared/BamfApplicationManager.h	2012-12-18 18:24:21 +0000
@@ -120,7 +120,6 @@
   virtual bool OwnsWindow(Window window_id) const;
 
   virtual std::vector<std::string> GetSupportedMimeTypes() const;
-  virtual std::vector<ApplicationMenu> GetRemoteMenus() const;
 
   virtual ApplicationWindowPtr GetFocusableWindow() const;
   virtual void Focus(bool show_on_visible, int monitor) const;