From f2edc8f9653b390f23812afa613e2146fb27f3f5 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 20 May 2019 11:47:45 +0200 Subject: [PATCH] feat(Watcher): define watcher_id --- include/modules/sni/watcher.hpp | 2 +- src/modules/sni/tray.cpp | 1 + src/modules/sni/watcher.cpp | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/modules/sni/watcher.hpp b/include/modules/sni/watcher.hpp index 30a2115d..599380af 100644 --- a/include/modules/sni/watcher.hpp +++ b/include/modules/sni/watcher.hpp @@ -8,7 +8,7 @@ namespace waybar::modules::SNI { class Watcher { public: - Watcher(); + Watcher(std::size_t id); ~Watcher(); private: diff --git a/src/modules/sni/tray.cpp b/src/modules/sni/tray.cpp index 500df42f..dc1aefbe 100644 --- a/src/modules/sni/tray.cpp +++ b/src/modules/sni/tray.cpp @@ -6,6 +6,7 @@ namespace waybar::modules::SNI { Tray::Tray(const std::string& id, const Bar& bar, const Json::Value& config) : config_(config), box_(bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0), + watcher_(nb_hosts_), host_(nb_hosts_, config, std::bind(&Tray::onAdd, this, std::placeholders::_1), std::bind(&Tray::onRemove, this, std::placeholders::_1)) { box_.set_name("tray"); diff --git a/src/modules/sni/watcher.cpp b/src/modules/sni/watcher.cpp index 596a06d4..39284818 100644 --- a/src/modules/sni/watcher.cpp +++ b/src/modules/sni/watcher.cpp @@ -4,13 +4,14 @@ using namespace waybar::modules::SNI; -Watcher::Watcher() +Watcher::Watcher(std::size_t id) : bus_name_id_(Gio::DBus::own_name(Gio::DBus::BusType::BUS_TYPE_SESSION, "org.kde.StatusNotifierWatcher", sigc::mem_fun(*this, &Watcher::busAcquired), Gio::DBus::SlotNameAcquired(), Gio::DBus::SlotNameLost(), Gio::DBus::BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT | Gio::DBus::BUS_NAME_OWNER_FLAGS_REPLACE)), + watcher_id_(id), watcher_(sn_watcher_skeleton_new()) {} Watcher::~Watcher() {