Merge remote-tracking branch 'origin/master' into agd/ignore-tray-applets
# Conflicts: # include/modules/sni/tray.hpp # src/modules/sni/host.cpp # src/modules/sni/tray.cpp
This commit is contained in:
@@ -21,9 +21,9 @@ class Tray : public AModule {
|
||||
void onRemove(std::unique_ptr<Item>& item);
|
||||
void checkIgnoreList(std::unique_ptr<Item>* item);
|
||||
std::vector<std::string> parseIgnoreList(const Json::Value& config);
|
||||
void queueUpdate();
|
||||
|
||||
static inline std::size_t nb_hosts_ = 0;
|
||||
bool show_passive_ = false;
|
||||
Gtk::Box box_;
|
||||
SNI::Watcher::singleton watcher_;
|
||||
std::vector<std::string> ignore_list_;
|
||||
|
||||
Reference in New Issue
Block a user