diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2015-10-02 14:01:56 +0000 |
|---|---|---|
| committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-10-02 14:01:56 +0000 |
| commit | b8f8a52649fca093b357278a7b61ebcc99385e4a (patch) | |
| tree | d7ca506b1c139247db76cea8d30e92a69b6b6676 /UnityCore | |
| parent | 819950dd99c444a45ae9dfc51da76404ea7d0076 (diff) | |
| parent | 9c4f0a314ba1f6b327a43cf9b6a3ecae9b53ef55 (diff) | |
PanelService, DBusIndicators: drop support for EntryShowNowChanged signal
We do handle this internally inside unity since long time now, so there's no need bother the bus for such thing. Approved by: Andrea Azzarone (bzr r4017)
Diffstat (limited to 'UnityCore')
| -rw-r--r-- | UnityCore/DBusIndicators.cpp | 15 | ||||
| -rw-r--r-- | UnityCore/Indicators.cpp | 5 |
2 files changed, 1 insertions, 19 deletions
diff --git a/UnityCore/DBusIndicators.cpp b/UnityCore/DBusIndicators.cpp index d19a4aec7..b890124c3 100644 --- a/UnityCore/DBusIndicators.cpp +++ b/UnityCore/DBusIndicators.cpp @@ -74,7 +74,6 @@ struct DBusIndicators::Impl void OnIconsPathChanged(GVariant* parameters); void OnEntryActivated(GVariant* parameters); void OnEntryActivatedRequest(GVariant* parameters); - void OnEntryShowNowChanged(GVariant* parameters); void OnEntryScroll(std::string const& entry_id, int delta); void OnEntryShowMenu(std::string const& entry_id, unsigned int xid, int x, int y, unsigned int button); @@ -102,7 +101,6 @@ DBusIndicators::Impl::Impl(std::string const& dbus_name, DBusIndicators* owner) gproxy_.Connect("IconPathsChanged", sigc::mem_fun(this, &DBusIndicators::Impl::OnIconsPathChanged)); gproxy_.Connect("EntryActivated", sigc::mem_fun(this, &DBusIndicators::Impl::OnEntryActivated)); gproxy_.Connect("EntryActivateRequest", sigc::mem_fun(this, &DBusIndicators::Impl::OnEntryActivatedRequest)); - gproxy_.Connect("EntryShowNowChanged", sigc::mem_fun(this, &DBusIndicators::Impl::OnEntryShowNowChanged)); gproxy_.connected.connect(sigc::mem_fun(this, &DBusIndicators::Impl::OnConnected)); gproxy_.disconnected.connect(sigc::mem_fun(this, &DBusIndicators::Impl::OnDisconnected)); @@ -242,19 +240,6 @@ void DBusIndicators::Impl::OnEntryActivatedRequest(GVariant* parameters) owner_->on_entry_activate_request.emit(entry_name); } -void DBusIndicators::Impl::OnEntryShowNowChanged(GVariant* parameters) -{ - if (!verify_variant_type(parameters, "(sb)")) - return; - - glib::String entry_name; - gboolean show_now; - g_variant_get(parameters, "(sb)", &entry_name, &show_now); - - if (entry_name) - owner_->SetEntryShowNow(entry_name, show_now); -} - void DBusIndicators::Impl::RequestSyncAll() { gproxy_.CallBegin("Sync", nullptr, sigc::mem_fun(this, &DBusIndicators::Impl::Sync)); diff --git a/UnityCore/Indicators.cpp b/UnityCore/Indicators.cpp index 6b929dcbf..08c88c1c9 100644 --- a/UnityCore/Indicators.cpp +++ b/UnityCore/Indicators.cpp @@ -121,11 +121,8 @@ void Indicators::Impl::ActivateEntry(std::string const& panel, std::string const void Indicators::Impl::SetEntryShowNow(std::string const& entry_id, bool show_now) { - Entry::Ptr entry = GetEntry(entry_id); - if (entry) - { + if (Entry::Ptr const& entry = GetEntry(entry_id)) entry->set_show_now(show_now); - } } Indicators::IndicatorsList Indicators::Impl::GetIndicators() const |