Tabs renaming for konsole/kde4

diff --git a/S50_aliases b/S50_aliases
index a42c3f7dbd3ba0643c9b3f37cdb2de29f84e18ea..6e825dc30a784f9206757035088731ac87c4404a 100644 (file)
--- a/S50_aliases
+++ b/S50_aliases
@@ -55,7 +55,7 @@ alias scr='screen -rd'
 
 # Konsole tab renaming. Courtesy of Sebastian Kuegler
 # http://vizzzion.org/?blogentry=737
-if [ "$KONSOLE_DCOP_SESSION" ]
+if [ -n "$KONSOLE_DCOP_SESSION" -o -n "$KONSOLE_DBUS_SESSION" ]
 then
     if [ `/usr/bin/whoami` != 'root' ]
     then

diff --git a/S61_konsoletabs b/S61_konsoletabs
index 8af1f116354e80b597bb566c74d81fb8e11dc32f..e93f3897413b389b5a0064051c6e935dc6f71b8a 100644 (file)
--- a/S61_konsoletabs
+++ b/S61_konsoletabs
@@ -2,7 +2,7 @@
 
 # Change konsole tab to current path
 konsole-rename-path () {
-    if [ "$KONSOLE_DCOP_SESSION" ]
+    if [ -n "$KONSOLE_DCOP_SESSION" -o -n "$KONSOLE_DBUS_SESSION" ]
     then
         local DIR
         DIR=${PWD/#${HOME}/\~}
@@ -13,13 +13,20 @@ konsole-rename-path () {
         else
            SDIR="$DIR"
         fi
-        dcop ${KONSOLE_DCOP_SESSION} renameSession "$SDIR"
+        if [ -n "$KONSOLE_DCOP_SESSION" ]
+        then
+          dcop ${KONSOLE_DCOP_SESSION} renameSession "$SDIR"
+        elif [ -n "$KONSOLE_DBUS_SESSION" ]
+        then
+          qdbus org.kde.konsole ${KONSOLE_DBUS_SESSION} setTitle 0 "$SDIR" > /dev/null
+          qdbus org.kde.konsole ${KONSOLE_DBUS_SESSION} setTitle 1 "$SDIR" > /dev/null
+        fi
     fi
 }
 
 # Change konsole tab to current command
 konsole-rename-cmd () {
-    if [ "$KONSOLE_DCOP_SESSION" ]
+    if [ -n "$KONSOLE_DCOP_SESSION" -o -n "$KONSOLE_DBUS_SESSION" ]
     then
         # We don't need to change tab to "cd xyz" or precmd redefinition
         # Yes, this is a dirty hack
@@ -33,7 +40,14 @@ konsole-rename-cmd () {
             else
                 TXT="$1"
             fi
-            dcop ${KONSOLE_DCOP_SESSION} renameSession "$TXT"
+            if [ -n "$KONSOLE_DCOP_SESSION" ]
+            then
+              dcop ${KONSOLE_DCOP_SESSION} renameSession "$TXT"
+            elif [ -n "$KONSOLE_DBUS_SESSION" ]
+            then
+              qdbus org.kde.konsole ${KONSOLE_DBUS_SESSION} setTitle 0 "$TXT" > /dev/null
+              qdbus org.kde.konsole ${KONSOLE_DBUS_SESSION} setTitle 1 "$TXT" > /dev/null
+            fi
         fi
     fi
 }

diff --git a/wrappers/konsoleautowrap b/wrappers/konsoleautowrap
index de72cfd7b742a6ef9361e955ef8059b09b3a3e10..78ebd5a569bc0e3982e5712ead53f8ed70b854dd 100755 (executable)
--- a/wrappers/konsoleautowrap
+++ b/wrappers/konsoleautowrap
@@ -5,6 +5,13 @@ typeset -a args
 cmd=`basename $0`
 args=$@
 lastarg="${args[(w)-1]}"
-dcop ${KONSOLE_DCOP_SESSION} renameSession "$lastarg"
+if [ -n "$KONSOLE_DCOP_SESSION" ]
+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
+fi
 exec $cmd "$@"