Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4092 from RobertMueller2/issue_3981

Browse Source 
Issue 3981: try and fix memory leak in privacy module
This commit is contained in:
Alexis Rouillard
2025-06-22 08:31:06 +01:00
committed by GitHub
parent 456c3add4a bef539e4de
commit eea9561525
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/privacy/privacy_item.cpp
View File

@ -1,5 +1,7 @@
#include "modules/privacy/privacy_item.hpp" #include "modules/privacy/privacy_item.hpp"
#include <spdlog/spdlog.h>
#include <string> #include <string>
#include "glibmm/main.h" #include "glibmm/main.h"
@ -96,20 +98,22 @@ PrivacyItem::PrivacyItem(const Json::Value &config_, enum PrivacyNodeType privac
void PrivacyItem::update_tooltip() { void PrivacyItem::update_tooltip() {
// Removes all old nodes // Removes all old nodes
for (auto *child : tooltip_window.get_children()) { for (auto *child : tooltip_window.get_children()) {
tooltip_window.remove(*child);
// despite the remove, still needs a delete to prevent memory leak. Speculating that this might
// work differently in GTK4.
delete child; delete child;
} }
for (auto *node : *nodes) { for (auto *node : *nodes) {
Gtk::Box *box = new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL, 4); auto *box = Gtk::make_managed<Gtk::Box>(Gtk::ORIENTATION_HORIZONTAL, 4);
// Set device icon // Set device icon
Gtk::Image *node_icon = new Gtk::Image(); auto *node_icon = Gtk::make_managed<Gtk::Image>();
node_icon->set_pixel_size(tooltipIconSize); node_icon->set_pixel_size(tooltipIconSize);
node_icon->set_from_icon_name(node->getIconName(), Gtk::ICON_SIZE_INVALID); node_icon->set_from_icon_name(node->getIconName(), Gtk::ICON_SIZE_INVALID);
box->add(*node_icon); box->add(*node_icon);
// Set model // Set model
auto *nodeName = new Gtk::Label(node->getName()); auto *nodeName = Gtk::make_managed<Gtk::Label>(node->getName());
box->add(*nodeName); box->add(*nodeName);
tooltip_window.add(*box); tooltip_window.add(*box);