Merge remote-tracking branch 'origin/master' into tray-gdbus

This commit is contained in:
topisani
2018-10-04 18:04:36 +02:00
21 changed files with 132 additions and 63 deletions

View File

@ -14,10 +14,10 @@ waybar::IModule* waybar::Factory::makeModule(const std::string &name) const
if (name == "sway/workspaces") {
return new waybar::modules::sway::Workspaces(bar_, config_[name]);
}
#endif
if (name == "sway/window") {
return new waybar::modules::sway::Window(bar_, config_[name]);
}
#endif
if (name == "memory") {
return new waybar::modules::Memory(config_[name]);
}