Do not notify service owner change if initial query fails.

When using valgrind, it's very likely the GetNameOwner will fail with timeout, which does not mean anything. Only org.freedesktop.DBus.Error.NameHasNoOwner is meaningful to us.
fcitx · Apr 22, 2024 · 4312998 · 4312998
1 parent 26e833e
commit 4312998
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/lib/fcitx-utils/dbus/servicewatcher.cpp b/src/lib/fcitx-utils/dbus/servicewatcher.cpp
@@ -40,6 +40,10 @@ class ServiceWatcherPrivate : public TrackableObject<ServiceWatcherPrivate> {
                           std::string newName;
                           if (msg.type() != dbus::MessageType::Error) {
                               msg >> newName;
+                          } else {
+                            if (msg.errorName() != "org.freedesktop.DBus.Error.NameHasNoOwner") {
+                                return false;
+                            }
                           }
                           for (auto &entry : watcherMap_.view(pivotKey)) {
                               entry(pivotKey, "", newName);

diff --git a/src/modules/dbus/dbusmodule.cpp b/src/modules/dbus/dbusmodule.cpp
@@ -784,9 +784,11 @@ DBusModule::DBusModule(Instance *instance)
         });
 
     selfWatcher_ = serviceWatcher_->watchService(
-        FCITX_DBUS_SERVICE,
-        [uniqueName, instance](const std::string &, const std::string &,
-                               const std::string &newName) {
+        FCITX_DBUS_SERVICE, [uniqueName, instance](const std::string &service,
+                                                   const std::string &oldName,
+                                                   const std::string &newName) {
+            FCITX_INFO() << "Service name change: " << service << " " << oldName
+                         << " " << newName;
             if (newName != uniqueName) {
                 instance->exit();
             }