blankie
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'tray-gdbus' into tray-gdbus

This commit is contained in:
Tobias Pisani 2018-10-05 21:20:36 +02:00 committed by GitHub
parent 9a333088e5 091b460d03
commit a13ce6e227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/modules/sni/snw.hpp
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <dbus-status-notifier-watcher.h>
#include <gtkmm.h> #include <gtkmm.h>
#include <dbus-status-notifier-watcher.h>
namespace waybar::modules::SNI { namespace waybar::modules::SNI {
@ -44,3 +44,4 @@ private:
}; };
} // namespace waybar::modules::SNI } // namespace waybar::modules::SNI

3
src/modules/sni/sni.cpp
View File

@ -165,7 +165,8 @@ waybar::modules::SNI::Item::extractPixBuf(GVariant *variant) {
return Glib::RefPtr<Gdk::Pixbuf>{}; return Glib::RefPtr<Gdk::Pixbuf>{};
} }
void waybar::modules::SNI::Item::updateImage() { void waybar::modules::SNI::Item::updateImage()
{
if (!icon_name.empty()) { if (!icon_name.empty()) {
auto pixbuf = getIconByName(icon_name, icon_size); auto pixbuf = getIconByName(icon_name, icon_size);
if (pixbuf->gobj() == nullptr) { if (pixbuf->gobj() == nullptr) {

4
src/modules/sni/snw.cpp
View File

@ -2,7 +2,6 @@
#include <iostream> #include <iostream>
using namespace waybar::modules::SNI; using namespace waybar::modules::SNI;
Watcher::Watcher() Watcher::Watcher()
@ -44,7 +43,6 @@ void Watcher::busAcquired(GDBusConnection* connection, const gchar* name,
std::cout << "Bus aquired" << std::endl; std::cout << "Bus aquired" << std::endl;
} }
gboolean Watcher::handleRegisterHost(Watcher* obj, gboolean Watcher::handleRegisterHost(Watcher* obj,
GDBusMethodInvocation* invocation, const gchar* service) GDBusMethodInvocation* invocation, const gchar* service)
{ {
@ -182,4 +180,4 @@ void Watcher::updateRegisteredItems(SnOrgKdeStatusNotifierWatcher* obj)
obj, items); obj, items);
g_variant_unref(variant); g_variant_unref(variant);
g_free(items); g_free(items);
} }