mirror of
https://github.com/rad4day/Waybar.git
synced 2023-12-21 10:22:59 +01:00
Merge branch 'tray-gdbus' into tray-gdbus
This commit is contained in:
commit
a13ce6e227
@ -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
|
||||||
|
|
||||||
|
@ -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) {
|
||||||
|
@ -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);
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user