From 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 3 Jan 2011 20:16:47 +0000 Subject: Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- startkde | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'startkde') diff --git a/startkde b/startkde index 72a100b1b..fa5cd687b 100644 --- a/startkde +++ b/startkde @@ -12,7 +12,7 @@ trap '[startkde] echo GOT SIGHUP' HUP # Check if a KDE session is already running. if kcheckrunning >/dev/null 2>&1; then echo "[startkde] KDE seems to be already running on this display." - xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null + xmessage -tqgeometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null exit 1 fi @@ -182,7 +182,7 @@ kcmfonts General forceFontDPI 0 EOF kstartupconfig if test $? -ne 0; then - xmessage -geometry 500x100 "Could not start kstartupconfig. Check your installation." + xmessage -tqgeometry 500x100 "Could not start kstartupconfig. Check your installation." fi # $kdehome/share/config/startupconfig should exist but avoid script failure if not. if [ -r $kdehome/share/config/startupconfig ]; then @@ -457,7 +457,7 @@ fi for resource in tmp cache socket; do if ! lnusertemp $resource >/dev/null; then echo "[startkde] Call to lnusertemp failed (temporary directories full?). Check your installation." 1>&2 - xmessage -geometry 600x100 "Call to lnusertemp failed (temporary directories full?). Check your installation." + xmessage -tqgeometry 600x100 "Call to lnusertemp failed (temporary directories full?). Check your installation." exit 1 fi done @@ -541,7 +541,7 @@ LD_BIND_NOW=true start_kdeinit_wrapper --new-startup +kcminit_startup if test $? -ne 0; then # Startup error echo '[startkde] Could not start kdeinit. Check your installation.' 1>&2 - xmessage -geometry 500x100 "Could not start kdeinit. Check your installation." + xmessage -tqgeometry 500x100 "Could not start kdeinit. Check your installation." fi echo "[startkde] kdeinit started successfully." 1>&2 @@ -569,7 +569,7 @@ kwrapper ksmserver $KDEWM if test $? -eq 255; then # Startup error echo '[startkde] Could not start ksmserver. Check your installation.' 1>&2 - xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." + xmessage -tqgeometry 500x100 "Could not start ksmserver. Check your installation." fi # wait if there's any crashhandler shown @@ -604,5 +604,5 @@ unset KDE_FULL_SESSION xprop -root -remove KDE_FULL_SESSION unset KDE_SESSION_UID -# Initialize_Status_Header +# Initialize_tqStatus_Header echo "[startkde] Trinity shutdown complete." 1>&2 -- cgit v1.2.1