diff options
| author | Albert Astals <albert.astals@canonical.com> | 2012-10-08 11:18:35 +0200 | 
|---|---|---|
| committer | Albert Astals <albert.astals@canonical.com> | 2012-10-08 11:18:35 +0200 | 
| commit | 63a899219b3788bda993c1a34855f2e2b92355ae (patch) | |
| tree | 84c301a6f972d520c925fccc13a0724ef048601a /UnityCore | |
| parent | f008cce54c399805eb3503081d9936593998f9d9 (diff) | |
just use the proxy connected function
(bzr r2807.2.11)
Diffstat (limited to 'UnityCore')
| -rw-r--r-- | UnityCore/DBusIndicators.cpp | 6 | 
1 files changed, 1 insertions, 5 deletions
| diff --git a/UnityCore/DBusIndicators.cpp b/UnityCore/DBusIndicators.cpp index 8c62b75bf..30a935c62 100644 --- a/UnityCore/DBusIndicators.cpp +++ b/UnityCore/DBusIndicators.cpp @@ -74,7 +74,6 @@ public:  DBusIndicators* owner_; - bool connected_;  glib::DBusProxy gproxy_;  glib::Source::UniquePtr reconnect_timeout_;  glib::Source::UniquePtr show_entry_idle_; @@ -86,7 +85,6 @@ public:  // Public Methods  DBusIndicators::Impl::Impl(const std::string &dbus_name, DBusIndicators* owner)  : owner_(owner) - , connected_(false)  , gproxy_(dbus_name, SERVICE_PATH, SERVICE_IFACE,  G_BUS_TYPE_SESSION, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES)  { @@ -128,13 +126,11 @@ void DBusIndicators::Impl::CheckLocalService()  void DBusIndicators::Impl::OnConnected()  { - connected_ = true;  RequestSyncAll();  }  void DBusIndicators::Impl::OnDisconnected()  { - connected_ = false;  for (auto indicator : owner_->GetIndicators())  {  owner_->RemoveIndicator(indicator->name()); @@ -422,7 +418,7 @@ DBusIndicators::~DBusIndicators()  bool DBusIndicators::IsConnected() const  { - return pimpl->connected_; + return pimpl->gproxy_.IsConnected();  }  void DBusIndicators::SyncGeometries(std::string const& name, | 
