Skip to content

tray: keep the action prefix valid for well-known bus names #578

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
borisi1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tray: keep the action prefix valid for well-known bus names #578

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
15 changes: 14 additions & 1 deletion src/panel/widgets/tray/item.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,23 @@ std::string StatusNotifierItem::dbus_name_as_prefix()
map[CHARS_IN[i]] = CHARS_OUT[i];
}

// Well-known names (e.g. Electron's "org.freedesktop.StatusNotifierItem-2916-1") contain
// letters and '-', which map[] doesn't cover: map[c] would insert '\0' and the prefix
// would no longer match the inserted action group, so menu clicks did nothing.
std::stringstream ss;
for (int i = 0; i < (int)dbus_name.length(); i++)
{
ss << map[dbus_name[i]];
const char c = dbus_name[i];
if (map.count(c))
{
ss << map[c];
} else if (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')))
{
ss << c;
} else
{
ss << 'y';
}
}

return ss.str();
Expand Down
Loading