Skip to content

fix: handle SNI NewMenu signal and empty menu path #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BLumia merged 1 commit into from
Oct 20, 2026
Merged

fix: handle SNI NewMenu signal and empty menu path #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions plugins/application-tray/api/dbus/org.kde.StatusNotifierItem.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
<signal name="NewAttentionIcon"/>
<signal name="NewOverlayIcon"/>
<signal name="NewToolTip"/>
<signal name="NewMenu"/>
<signal name="NewStatus">
<arg type="s" name="status"/>
</signal>
Expand Down
13 changes: 11 additions & 2 deletions plugins/application-tray/sniprotocolhandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,13 @@ SniTrayProtocolHandler::SniTrayProtocolHandler(const QString &sniServicePath, QO
connect(m_sniInter, &StatusNotifierItem::NewTitle, this, &SniTrayProtocolHandler::titleChanged);
connect(m_sniInter, &StatusNotifierItem::NewStatus, this, &SniTrayProtocolHandler::statusChanged);
connect(m_sniInter, &StatusNotifierItem::NewToolTip, this, &SniTrayProtocolHandler::tooltiChanged);
connect(m_sniInter, &StatusNotifierItem::NewMenu, this, [this] {
m_menuPath = m_sniInter->menu().path();
if (m_dbusMenuImporter) {
delete m_dbusMenuImporter;
m_dbusMenuImporter = nullptr;
}
});
connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::themeTypeChanged, this, [this](DGuiApplicationHelper::ColorType themeType) {
Q_UNUSED(themeType)
if (auto menu = menuImporter()) {
Expand All @@ -200,7 +207,6 @@ SniTrayProtocolHandler::~SniTrayProtocolHandler()
void SniTrayProtocolHandler::init()
{
generateId();
m_menuPath = m_sniInter->menu().path();
m_cachedIcon = dbusImageList2QIcon(m_sniInter->iconPixmap());
m_cachedAttentionIcon = dbusImageList2QIcon(m_sniInter->attentionIconPixmap());
m_cachedOverlayIcon = dbusImageList2QIcon(m_sniInter->overlayIconPixmap());
Expand All @@ -216,7 +222,10 @@ DBusMenuImporter *SniTrayProtocolHandler::menuImporter() const
{
if (!m_dbusMenuImporter) {
auto that = const_cast<SniTrayProtocolHandler *>(this);
if (that->m_menuPath == QLatin1String("/NO_DBUSMENU")) {
if (that->m_menuPath.isEmpty()) {
that->m_menuPath = m_sniInter->menu().path();
}
if (that->m_menuPath.isEmpty() || that->m_menuPath == QLatin1String("/NO_DBUSMENU")) {
return nullptr;
}
that->m_dbusMenuImporter = new DBusMenu(m_service, m_menuPath, that);
Expand Down
Loading