Skip to content

sni/watcher: accept combined "bus_name/object_path" item registrations (Electron 43.4.1+) #5287

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

Open
teivng wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −0
Open

sni/watcher: accept combined "bus_name/object_path" item registrations (Electron 43.4.1+) #5287

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
6 changes: 6 additions & 0 deletions src/modules/sni/watcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,16 @@ gboolean Watcher::handleRegisterItem(Watcher* obj, GDBusMethodInvocation* invoca
const gchar* service) {
const gchar* bus_name = service;
const gchar* object_path = "/StatusNotifierItem";
g_autofree gchar* bus_name_buf = nullptr;

if (*service == '/') {
bus_name = g_dbus_method_invocation_get_sender(invocation);
object_path = service;
} else if (const gchar* slash = g_strstr_len(service, -1, "/")) {
// Electron >= 43.4.1 registers with a combined "bus_name/object_path" string
bus_name_buf = g_strndup(service, slash - service);
bus_name = bus_name_buf;
object_path = slash;
}
if (g_dbus_is_name(bus_name) == FALSE) {
g_dbus_method_invocation_return_error(invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
Expand Down
Loading