From kde-commits  Thu Sep 30 22:08:38 2010
From: Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date: Thu, 30 Sep 2010 22:08:38 +0000
To: kde-commits
Subject: branches/trinity/kdebase/kdesktop
Message-Id: <20100930220838.1B5DAAC891 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=128588454425557

SVN commit 1181397 by tpearson:

[CRITICAL] Remove second non-user-removable Trash icon from new users' Desktop
[MINOR IMPACT] Fix kdesktop Konsole launch shortcut


 M  +1 -1      init/Makefile.am  
 D             init/directory.trash  
 M  +1 -1      krootwm.cc  


--- branches/trinity/kdebase/kdesktop/init/Makefile.am #1181396:1181397
@@ -1,6 +1,6 @@
 SUBDIRS = Templates
 
-kdesktop_init_data_DATA = directory.trash directory.autostart directory.templates directory.desktop
+kdesktop_init_data_DATA = directory.autostart directory.templates directory.desktop
 kdesktop_init_datadir = $(kde_datadir)/kdesktop
 
 kdesktop_builtin_data_DATA = My_Computer My_Documents My_Network_Places Printers Trash Web_Browser
--- branches/trinity/kdebase/kdesktop/krootwm.cc #1181396:1181397
@@ -760,7 +760,7 @@
     KConfigGroupSaver gs(KGlobal::config(), "General");
     TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole");
 
-    *p << terminal << " --workdir \"$HOME/Desktop\"";
+    *p << terminal << "--workdir=" + KGlobalSettings::desktopPath() + "/";
 
     p->start(KProcess::DontCare);