Revert change on create_message method in dbus plugin

oskarsh · May 24, 2024 · 828a1ab · 828a1ab
1 parent b6bdd4e
commit 828a1ab
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/yin_yang/plugins/_plugin.py b/yin_yang/plugins/_plugin.py
@@ -268,11 +268,11 @@ def set_theme(self, theme: str):
         if not theme:
             raise ValueError(f'Theme \"{theme}\" is invalid')
 
-        self.create_message(theme)
+        self.message = self.create_message(theme)
         self.call()
 
     @abstractmethod
-    def create_message(self, theme: str) -> None:
+    def create_message(self, theme: str) -> QDBusMessage:
         raise NotImplementedError(f'Plugin {self.name} did not implement create_message()')
 
     def call(self) -> QDBusMessage:

diff --git a/yin_yang/plugins/gtk.py b/yin_yang/plugins/gtk.py
@@ -77,9 +77,10 @@ def __init__(self):
         self.theme_light = 'Breeze'
         self.theme_dark = 'Breeze'
 
-    def create_message(self, theme: str):
-        self.message = QDBusMessage.createMethodCall(*self.message_data)
-        self.message.setArguments([theme])
+    def create_message(self, theme: str) -> QDBusMessage:
+        message = QDBusMessage.createMethodCall(*self.message_data)
+        message.setArguments([theme])
+        return message
 
     def set_theme(self, theme: str):
         """Call DBus interface of kde-gtk-config if installed.

diff --git a/yin_yang/plugins/konsole.py b/yin_yang/plugins/konsole.py
@@ -52,9 +52,10 @@ def theme_dark(self, value):
         self.update_profile(True, value)
         self._theme_dark = value
 
-    def create_message(self, theme: str):
+    def create_message(self, theme: str) -> QDBusMessage:
         message = QDBusMessage.createMethodCall(*self.message_data)
         message.setArguments([theme])
+        return message
 
     def set_mode(self, dark: bool) -> bool:
         # run checks

diff --git a/yin_yang/plugins/notify.py b/yin_yang/plugins/notify.py
@@ -1,3 +1,5 @@
+from PySide6.QtDBus import QDBusMessage
+
 from ..NotificationHandler import create_dbus_message
 from ._plugin import DBusPlugin
 
@@ -8,5 +10,5 @@ def __init__(self):
         self.theme_light = "Day"
         self.theme_dark = "Night"
 
-    def create_message(self, theme: str):
-        self.message = create_dbus_message("Theme changed", f"Set the theme to {theme}")
+    def create_message(self, theme: str) -> QDBusMessage:
+        return create_dbus_message("Theme changed", f"Set the theme to {theme}")
diff --git a/yin_yang/plugins/wallpaper.py b/yin_yang/plugins/wallpaper.py
@@ -118,7 +118,7 @@ def theme_dark(self, value: str):
     def available(self) -> bool:
         return True
 
-    def create_message(self, theme: str):
+    def create_message(self, theme: str) -> QDBusMessage:
         message = QDBusMessage.createMethodCall(*self.message_data)
         message.setArguments([
             'string:'
@@ -130,6 +130,7 @@ def create_message(self, theme: str):
             f'    d.writeConfig("Image", "file:{theme}");'
             '}'
         ])
+        return message
 
 
 class _Xfce(PluginCommandline):