debugging term title again

[feisty_meow.git] / scripts / tty / terminal_titler.sh

diff --git a/scripts/tty/terminal_titler.sh b/scripts/tty/terminal_titler.sh
index b59dd3dd8e7fc54049d24b66aaa532d7e3f4fc6e..df3e6a8cb36fabda4cf6546f6591ef0ebbb6b204 100644 (file)
--- a/scripts/tty/terminal_titler.sh
+++ b/scripts/tty/terminal_titler.sh
@@ -51,7 +51,9 @@ function get_terminal_title()
   which xprop &>/dev/null
   if [ $? -eq 0 ]; then
     # make sure we're actually using xterm *and* that we have a window ID.
-    if [[ "$TERM" =~ .*"xterm".* && ! -z "$WINDOWID" ]]; then
+    if [[ ! -z "$GNOME_TERMINAL_SCREEN" ]]; then
+      term_title_found="$(xprop -id $WINDOWID | perl -nle 'print $1 if /^WM_NAME.+= \"(.*)\"$/')"
+    elif [[ "$TERM" =~ .*"xterm".* && ! -z "$WINDOWID" ]]; then
       term_title_found="$(xprop -id $WINDOWID | perl -nle 'print $1 if /^WM_NAME.+= \"(.*)\"$/')"
     fi
   fi
@@ -102,7 +104,7 @@ function label_terminal_with_info()
     fi
     pruned_host=$(echo $HOSTNAME | sed -e 's/^\([^\.]*\)\..*$/\1/')
     date_string=$(date +"%Y %b %e @ %T")
-    user=$USER
+    user="$(logname)"
     if [ -z "$user" ]; then
       # try snagging the windoze name.
       user=$USERNAME