Correct Konsole tab renaming

Terminals from other applications like Konqueror or Dolphin were
incorrectly changing Konsole sessions tabs titles instead of their
own (hidden) one.

diff --git a/S61_konsoletabs b/S61_konsoletabs
index 7bdace149b68b5fa60e5b974885d8e3b2e572d4c..58dbb9fdde8f5a82ed2c0d61190bdcf3b318b9dd 100644 (file)
--- a/S61_konsoletabs
+++ b/S61_konsoletabs
@@ -18,8 +18,8 @@ konsole-rename-path () {
           dcop ${KONSOLE_DCOP_SESSION} renameSession "$SDIR"
         elif [ -n "$KONSOLE_DBUS_SESSION" ]
         then
-          qdbus org.kde.konsole ${KONSOLE_DBUS_SESSION} setTitle 0 "$SDIR" > /dev/null 2>&1
-          qdbus org.kde.konsole ${KONSOLE_DBUS_SESSION} setTitle 1 "$SDIR" > /dev/null 2>&1
+          qdbus ${KONSOLE_DBUS_SERVICE} ${KONSOLE_DBUS_SESSION} setTitle 0 "$SDIR" > /dev/null 2>&1
+          qdbus ${KONSOLE_DBUS_SERVICE} ${KONSOLE_DBUS_SESSION} setTitle 1 "$SDIR" > /dev/null 2>&1
         fi
     fi
 }
@@ -45,8 +45,8 @@ konsole-rename-cmd () {
               dcop ${KONSOLE_DCOP_SESSION} renameSession "$TXT"
             elif [ -n "$KONSOLE_DBUS_SESSION" ]
             then
-              qdbus org.kde.konsole ${KONSOLE_DBUS_SESSION} setTitle 0 "$TXT" > /dev/null 2>&1
-              qdbus org.kde.konsole ${KONSOLE_DBUS_SESSION} setTitle 1 "$TXT" > /dev/null 2>&1
+              qdbus ${KONSOLE_DBUS_SERVICE} ${KONSOLE_DBUS_SESSION} setTitle 0 "$TXT" > /dev/null 2>&1
+              qdbus ${KONSOLE_DBUS_SERVICE} ${KONSOLE_DBUS_SESSION} setTitle 1 "$TXT" > /dev/null 2>&1
             fi
         fi
     fi

diff --git a/wrappers/konsoleautowrap b/wrappers/konsoleautowrap
index 78ebd5a569bc0e3982e5712ead53f8ed70b854dd..2bc9dca9f82cd3676b7c6e388858703bc91e19e1 100755 (executable)
--- a/wrappers/konsoleautowrap
+++ b/wrappers/konsoleautowrap
@@ -10,8 +10,8 @@ then
   dcop ${KONSOLE_DCOP_SESSION} renameSession "$lastarg"
 elif [ -n "$KONSOLE_DBUS_SESSION" ]
 then
-  qdbus org.kde.konsole ${KONSOLE_DBUS_SESSION} setTitle 0 "$lastarg" > /dev/null
-  qdbus org.kde.konsole ${KONSOLE_DBUS_SESSION} setTitle 1 "$lastarg" > /dev/null
+  qdbus ${KONSOLE_DBUS_SERVICE} ${KONSOLE_DBUS_SESSION} setTitle 0 "$lastarg" > /dev/null
+  qdbus ${KONSOLE_DBUS_SERVICE} ${KONSOLE_DBUS_SESSION} setTitle 1 "$lastarg" > /dev/null
 fi
 exec $cmd "$@"