Browse Source

Rename startkde to starttde

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
5ddc4d2fa0

+ 3
- 3
CMakeLists.txt View File

@@ -107,7 +107,7 @@ option( BUILD_TDESU "Build tdesu" ${BUILD_ALL} )
107 107
 option( BUILD_KDM "Build kdm" ${BUILD_ALL} )
108 108
 option( BUILD_KSMSERVER "Build ksmserver" ${BUILD_ALL} )
109 109
 option( BUILD_KSPLASHML "Build ksplashml" ${BUILD_ALL} )
110
-option( BUILD_STARTKDE "Build startkde" ${BUILD_ALL} )
110
+option( BUILD_STARTKDE "Build starttde" ${BUILD_ALL} )
111 111
 option( BUILD_KFIND "Build kfind" ${BUILD_ALL} )
112 112
 option( BUILD_DRKONQI "Build drkonqi" ${BUILD_ALL} )
113 113
 option( BUILD_KDCOP "Build kdcop" ${BUILD_ALL} )
@@ -201,10 +201,10 @@ tde_conditional_add_subdirectory( BUILD_TSAK tsak )
201 201
 tde_conditional_add_subdirectory( BUILD_KROOTBACKING krootbacking )
202 202
 tde_conditional_add_subdirectory( BUILD_TQT3INTEGRATION tqt3integration ) 
203 203
 
204
-##### install startkde & related stuff ##########
204
+##### install starttde & related stuff ##########
205 205
 
206 206
 if( BUILD_STARTKDE )
207
-  install( PROGRAMS startkde DESTINATION ${BIN_INSTALL_DIR} )
207
+  install( PROGRAMS starttde DESTINATION ${BIN_INSTALL_DIR} )
208 208
 endif()
209 209
 
210 210
 

+ 1
- 1
Mainpage.dox View File

@@ -2,7 +2,7 @@
2 2
 *   Trinity Base API Dox.
3 3
 *
4 4
 * tdebase is the SVN module with the "basic applications" needed 
5
-* for Trinity. These include startkde (a shell script to start the whole
5
+* for Trinity. These include starttde (a shell script to start the whole
6 6
 * desktop), kdesktop (the desktop), konqueror (the browser and file-
7 7
 * manager) and lots of other things. Nearly none of it has dox.
8 8
 *

+ 1
- 1
Makefile.am.in View File

@@ -9,7 +9,7 @@ COMPILE_AFTER_kcontrol = kdm kdesktop
9 9
 
10 10
 AUTOMAKE_OPTIONS = foreign 1.6.1
11 11
 
12
-bin_SCRIPTS = startkde trinity
12
+bin_SCRIPTS = starttde trinity
13 13
 
14 14
 EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd kscreensaver.pamd mkpamserv
15 15
 

+ 11
- 11
doc/faq/install.docbook View File

@@ -377,16 +377,16 @@ calling them, you can only benefit fully from &kde;'s advanced
377 377
 features if you use the &kde; window manager and its helper
378 378
 programs.</para>
379 379
 <para>In order to make it easy for you, we have provided a simple
380
-script called <filename>startkde</filename> which gets installed in <filename
380
+script called <filename>starttde</filename> which gets installed in <filename
381 381
 class="directory">$<envar>KDEDIR</envar>/bin</filename> and is therefore in your
382 382
 path.</para>
383 383
 <para>Edit the file <filename>.xinitrc</filename> in your home folder (make a backup
384 384
 copy first!), remove everything that looks like calling a window
385
-manager, and insert <command>startkde</command> instead.  Restart the &X-Server;.  If you use
385
+manager, and insert <command>starttde</command> instead.  Restart the &X-Server;.  If you use
386 386
 &kdm;/<application>xdm</application>, you will have to edit the file <filename>.xsession</filename> instead of
387 387
 <filename>.xinitrc</filename>.  And if there is no <filename>.xinitrc</filename> or <filename>.xsession</filename> in your home
388 388
 folder, simply create a new one with just one line containing
389
-<command>startkde</command>.
389
+<command>starttde</command>.
390 390
 <note>
391 391
 <para>Some systems (notably &RedHat; &Linux;) use <filename>.Xclients</filename>
392 392
 instead.</para>
@@ -420,19 +420,19 @@ can lead to problems if you are not careful. </para>
420 420
 </qandaentry>
421 421
 
422 422
 <qandaentry>
423
-<question id="startkde">
423
+<question id="starttde">
424 424
 <para>How do I start &kde;?</para>
425 425
 </question>
426 426
 <answer>
427 427
 <para>The most comfortable method to start &kde; is to use the
428
-<filename>startkde</filename> script.  Simply put the line
429
-<command>startkde</command> at the end of your <filename>.xsession</filename>
428
+<filename>starttde</filename> script.  Simply put the line
429
+<command>starttde</command> at the end of your <filename>.xsession</filename>
430 430
 file (or your <filename>.xinitrc</filename> or <filename>.Xclients</filename>
431 431
 file if you are not using &kdm; or <application>xdm</application>).  Please
432 432
 also remove the lines that start your previous window manager.  If there is no
433 433
 <filename>.xsession</filename>, <filename>.xinitrc</filename>, or
434 434
 <filename>.Xclients</filename> in your home folder, simply create a new one
435
-that contains just one line: <command>startkde</command>.</para>
435
+that contains just one line: <command>starttde</command>.</para>
436 436
 </answer>
437 437
 </qandaentry>
438 438
 <!-- Still needed?
@@ -524,16 +524,16 @@ screen, so this option will not work.</para>
524 524
 
525 525
 <qandaentry>
526 526
 <question>
527
-<para><command>startkde</command> fails with <errorname>can not connect to X
527
+<para><command>starttde</command> fails with <errorname>can not connect to X
528 528
 server</errorname>.  What is wrong?</para>
529 529
 </question>
530 530
 <answer>
531
-<para>You probably tried to start the X server with <command>startkde</command>.  The X
531
+<para>You probably tried to start the X server with <command>starttde</command>.  The X
532 532
 server is started with <command>startx</command>.
533
-<command>startkde</command> is the 
533
+<command>starttde</command> is the 
534 534
 script that should be run from your <filename>.xinitrc</filename>, <filename>.xsession</filename>, or
535 535
 <filename>.Xclients</filename> to activate the window manager and the necessary server
536
-daemons for &kde;.  See also <xref linkend="startkde"/>.</para>
536
+daemons for &kde;.  See also <xref linkend="starttde"/>.</para>
537 537
 </answer>
538 538
 </qandaentry>
539 539
 

+ 1
- 1
doc/kdm/index.docbook View File

@@ -126,7 +126,7 @@ the next step</para>
126 126
 <filename>~/.xinitrc</filename> to start your preferred window manager
127 127
 or desktop environment.</para>
128 128
 <para>For &kde; you should enter:</para>
129
-<screen><userinput>startkde</userinput></screen>
129
+<screen><userinput>starttde</userinput></screen>
130 130
 <para>For other window managers or desktop environments, you should
131 131
 look in their documentation for the correct command.</para>
132 132
 </step>

+ 4
- 4
doc/userguide/index.docbook View File

@@ -357,8 +357,8 @@ programs here (and not links to removable media, like CDs).</para>
357 357
 </sect1info>
358 358
 
359 359
 <title>Logging In and Logging Out</title>
360
-<para>Basic KDM &amp; startkde stuff.</para>
361
-<!-- Not sure what exactly to say about startkde and where to say it -->
360
+<para>Basic KDM &amp; starttde stuff.</para>
361
+<!-- Not sure what exactly to say about starttde and where to say it -->
362 362
 <!-- (Phil) -->
363 363
 <para>There are two ways to log into &kde;: graphically and via the
364 364
 command line. We'll look at them both briefly:</para>
@@ -382,12 +382,12 @@ it is done, &kde; will be ready to use.</para>
382 382
 
383 383
 <sect2 id="logging-in-via-cmdline">
384 384
 <title>Logging in via the Command Line</title>
385
-<indexterm><primary><command>startkde</command></primary></indexterm>
385
+<indexterm><primary><command>starttde</command></primary></indexterm>
386 386
 <indexterm><primary><command>startx</command></primary></indexterm>
387 387
 
388 388
 <para>If you prefer using the command line, you can log in to &kde;
389 389
 with the <command>startx</command> command. Add the line
390
-<userinput>exec startkde</userinput> to the
390
+<userinput>exec starttde</userinput> to the
391 391
 <filename>.xinitrc</filename> file in your home folder (create it
392 392
 if it does not exist), save the file, and then run
393 393
 <command>startx</command>. &kde; should start in the same way as if

+ 9
- 9
doc/userguide/kde-for-admins.docbook View File

@@ -811,7 +811,7 @@ Startup - <filename>/etc/X11/xdm/Xstartup</filename> - prepare as root
811 811
 Session - <filename>/etc/X11/xdm/Xsession</filename> - starts session as user
812 812
 </member>
813 813
 <member>
814
-= For a KDE session: <command>kde</command> or <command>startkde</command>
814
+= For a KDE session: <command>kde</command> or <command>starttde</command>
815 815
 </member>
816 816
 <member>
817 817
 = If present <filename>~/.xsession</filename> or <filename>~/.xinitrc</filename>
@@ -823,13 +823,13 @@ Reset - <filename>/etc/X11/xdm/Xreset</filename> - after session finished
823 823
 
824 824
 </sect2>
825 825
 
826
-<sect2 id="startkde">
827
-<title>The &kde; Startup Script: <command>startkde</command></title>
826
+<sect2 id="starttde">
827
+<title>The &kde; Startup Script: <command>starttde</command></title>
828 828
 
829 829
 <para>The &kde; startup sequence starts with the
830
-<filename>startkde</filename> script. In most cases this script gets called
830
+<filename>starttde</filename> script. In most cases this script gets called
831 831
 from the display manager (&kdm;) once the user has been authenticated. Their
832
-are two very important lines in the <filename>startkde</filename>
832
+are two very important lines in the <filename>starttde</filename>
833 833
 script:</para>
834 834
 
835 835
 <programlisting>
@@ -945,7 +945,7 @@ programs started as <acronym>KLM</acronym>s.</para>
945 945
 <para>When <command>tdeinit</command> starts for the first time it will
946 946
 launch <command>dcopserver</command>, <command>klauncher</command>, and
947 947
 <command>kded</command>, as well as any additional programs specified on its
948
-command line in the <command>startkde</command> script, normally
948
+command line in the <command>starttde</command> script, normally
949 949
 <command>kcminit</command> and <command>knotify</command>.</para>
950 950
 
951 951
 </sect2>
@@ -1184,7 +1184,7 @@ class="username">root</systemitem>.</para>
1184 1184
 <varlistentry><term>$<envar>KDEWM</envar></term><listitem><para>If the
1185 1185
 <envar>KDEWM</envar> environment variable has been set, then it will
1186 1186
 be used as &kde;'s window manager within the
1187
-<command>startkde</command> script instead of &twin;.</para>
1187
+<command>starttde</command> script instead of &twin;.</para>
1188 1188
 </listitem>
1189 1189
 </varlistentry>
1190 1190
 
@@ -1626,7 +1626,7 @@ class="directory">$<envar>KDEDIR</envar>/apps/kdesktop/DesktopLinks</filename>
1626 1626
 merged)</para></listitem>
1627 1627
 
1628 1628
 <listitem><para>Distribution Specific SUSE Linux copies certain icons
1629
-in startkde.theme from <filename
1629
+in starttde.theme from <filename
1630 1630
 class="directory">/opt/trinity/share/config/SuSE/default/</filename></para></listitem>
1631 1631
 
1632 1632
 </itemizedlist>
@@ -2356,7 +2356,7 @@ there.</para>
2356 2356
 <title>Making it Work</title>
2357 2357
 
2358 2358
 Making It Work
2359
-KDE 3.2: Set $KDEDIRS from startkde script
2359
+KDE 3.2: Set $KDEDIRS from starttde script
2360 2360
 Distribute profiles to all clients
2361 2361
 
2362 2362
 </para>

+ 1
- 1
kcminit/main.cpp View File

@@ -231,7 +231,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
231 231
   }
232 232
   close( ready[ 0 ] );
233 233
 
234
-  startup = ( strcmp( argv[ 0 ], "kcminit_startup" ) == 0 ); // started from startkde?
234
+  startup = ( strcmp( argv[ 0 ], "kcminit_startup" ) == 0 ); // started from starttde?
235 235
 
236 236
   KLocale::setMainCatalogue("kcontrol");
237 237
   KAboutData aboutData( "kcminit", I18N_NOOP("KCMInit"),

+ 1
- 1
kcontrol/kfontinst/ChangeLog View File

@@ -259,7 +259,7 @@ KDE3.1 -> KDE3.2
259 259
    configuring StarOffice - as this requires some other files to be modified, which won't be possible if SO has been installed
260 260
    by root.
261 261
 
262
-   ...Also to accomplish this, some changes are needed to 'startkde' - see file README.startkde
262
+   ...Also to accomplish this, some changes are needed to 'starttde' - see file README.starttde
263 263
 
264 264
 11. Because of the above, when started as non-root, KFontinst will create Type1 and TrueType sub-folders in
265 265
     $KDEHOME/share/fonts - if they do not already exist.

+ 2
- 2
kcontrol/konqhtml/pluginopts.cpp View File

@@ -195,7 +195,7 @@ void KPluginOptions::load( bool useDefaults )
195 195
   config->setReadDefaults( useDefaults );
196 196
 
197 197
   config->setGroup("Misc");
198
-  m_widget->scanAtStartup->setChecked( config->readBoolEntry( "startkdeScan", false ) );
198
+  m_widget->scanAtStartup->setChecked( config->readBoolEntry( "starttdeScan", false ) );
199 199
 
200 200
   m_widget->dirEdit->setURL("");
201 201
   m_widget->dirEdit->setEnabled( false );
@@ -242,7 +242,7 @@ void KPluginOptions::save()
242 242
     pluginSave( config );
243 243
 
244 244
     config->setGroup("Misc");
245
-    config->writeEntry( "startkdeScan", m_widget->scanAtStartup->isChecked() );
245
+    config->writeEntry( "starttdeScan", m_widget->scanAtStartup->isChecked() );
246 246
     config->writeEntry( "HTTP URLs Only", enableHTTPOnly->isChecked() );
247 247
     config->writeEntry( "demandLoad", enableUserDemand->isChecked() );
248 248
     config->writeEntry("Nice Level", (int)(100 - priority->value()) / 5);

+ 1
- 1
kcontrol/kthememanager/ktheme.cpp View File

@@ -200,7 +200,7 @@ TQString KTheme::createYourself( bool pack )
200 200
     KConfig * soundConf = new KConfig( "knotify.eventsrc", true );
201 201
     TQStringList stdEvents;
202 202
     stdEvents << "cannotopenfile" << "catastrophe" << "exitkde" << "fatalerror"
203
-              << "notification" << "printerror" << "startkde" << "warning"
203
+              << "notification" << "printerror" << "starttde" << "warning"
204 204
               << "messageCritical" << "messageInformation" << "messageWarning"
205 205
               << "messageboxQuestion";
206 206
 

+ 1
- 1
kdesktop/main.cc View File

@@ -279,7 +279,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
279 279
        myApp->config()->reparseConfiguration();
280 280
     }
281 281
 
282
-    // for the KDE-already-running check in startkde
282
+    // for the KDE-already-running check in starttde
283 283
     KSelectionOwner kde_running( "_KDE_RUNNING", 0 );
284 284
     kde_running.claim( false );
285 285
 

+ 2
- 2
kdm/ChangeLog View File

@@ -98,7 +98,7 @@ if they affect the configuration.
98 98
 
99 99
 	* The default Xsession no longer tries to merge kdm's PATH into the
100 100
 	  one set up by the shell startup scripts. Instead, kde.desktop
101
-	  contains a full pathname and startkde fixes up PATH if necessary.
101
+	  contains a full pathname and starttde fixes up PATH if necessary.
102 102
 	* The default Xsession will emulate the startup behaviour of more
103 103
 	  shells, in particular bash, zsh and csh/tcsh.
104 104
 	* Setting up the session log is now done by kdm, not the Session
@@ -144,7 +144,7 @@ if they affect the configuration.
144 144
 	* Session types are now defined with .desktop files; consequently the
145 145
 	  SessionTypes option is gone and we got SessionsDirs instead.
146 146
 	* The default Xsession now hard-wires the session types
147
-	  - "default" to startkde
147
+	  - "default" to starttde
148 148
 	  - "custom" to ~/.xsession
149 149
 	* The previous session type choice is now saved in a different file
150 150
 	  (~/.dmrc) in a different format (ini-file); the SessSaveFile option

+ 2
- 2
kdm/kfrontend/sessions/tde.desktop.cmake View File

@@ -1,8 +1,8 @@
1 1
 [Desktop Entry]
2 2
 Encoding=UTF-8
3 3
 Type=XSession
4
-Exec=@TDE_BIN_DIR@/startkde
5
-TryExec=@TDE_BIN_DIR@/startkde
4
+Exec=@TDE_BIN_DIR@/starttde
5
+TryExec=@TDE_BIN_DIR@/starttde
6 6
 Name=TDE
7 7
 Name[hi]=केडीई
8 8
 Name[mn]=КДЭ

+ 2
- 2
kdm/kfrontend/sessions/tde.desktop.in View File

@@ -1,8 +1,8 @@
1 1
 [Desktop Entry]
2 2
 Encoding=UTF-8
3 3
 Type=XSession
4
-Exec=@TDE_BINDIR@/startkde
5
-TryExec=@TDE_BINDIR@/startkde
4
+Exec=@TDE_BINDIR@/starttde
5
+TryExec=@TDE_BINDIR@/starttde
6 6
 Name=Trinity
7 7
 Name[hi]=केडीई
8 8
 Name[mn]=КДЭ

+ 6
- 6
ksmserver/README View File

@@ -24,13 +24,13 @@ Here's a short overview on how session management works.
24 24
 Starting the server
25 25
 -------------------
26 26
 
27
-The server is usually started from the 'startkde' script. It supports the following options:
27
+The server is usually started from the 'starttde' script. It supports the following options:
28 28
 
29 29
   -r, --restore             Restores the previous session if available
30 30
   -w, --windowmanager <wm>  Starts 'wm' in case no other window manager is
31 31
                             participating in the session. Default is 'twin'
32 32
 
33
-The default 'startkde' launches 'ksmserver --restore'.  The
33
+The default 'starttde' launches 'ksmserver --restore'.  The
34 34
 'windowmanager' option is useful for users that prefer a window
35 35
 manager other than twin. Since the window manager has to participate
36 36
 in the session (it has to remember window positions and states), it is
@@ -47,13 +47,13 @@ KDE startup sequence
47 47
 --------------------
48 48
 
49 49
 Ksmserver controls the second part of the KDE startup sequence,
50
-after it gets control from the startkde script, which controls
50
+after it gets control from the starttde script, which controls
51 51
 the first part of the startup sequence. All code related to startup
52 52
 should be in startup.cpp and going down in that source file should
53 53
 follow the startup order (but note that this is just a documentation
54 54
 which may get outdated, so in case of doubts the source wins ;) ).
55 55
 
56
-The startkde scripts already launches tdeinit, which in turns launches
56
+The starttde scripts already launches tdeinit, which in turns launches
57 57
 KDE daemons like dcopserver, klauncher and kded. Kded loads autoloaded
58 58
 kded modules, i.e. those that have X-KDE-Kded-autoload=true in .desktop
59 59
 files. The exact way autoloading works is controlled by X-KDE-Kded-phase=,
@@ -68,7 +68,7 @@ Startkde also launches kcminit, which performs initialization done by kcontrol
68 68
 modules. There are three kcminit phases, 0, 1 and 2, controlled
69 69
 by X-KDE-Init-Phase= in the .desktop file, which defaults to 1. Phase 0 kcminit
70 70
 modules should be only those that really need to be run early in the startup
71
-process (and those should probably actually use kstartupconfig in startkde
71
+process (and those should probably actually use kstartupconfig in starttde
72 72
 to be done even before tdeinit and daemons). After executing phase 0
73 73
 modules kcminit returns and waits.
74 74
 
@@ -91,7 +91,7 @@ i.e. launching all applications that were running during last session
91 91
 saving (usually logout).
92 92
 
93 93
 By this time KDE session is considered to be more or less ready and
94
-ksmserver does the knotify startkde event (i.e. plays the login sound).
94
+ksmserver does the knotify starttde event (i.e. plays the login sound).
95 95
 It also tells klauncher to perform autostart phase 2, kded to load all
96 96
 remaining autoload (i.e. kded phase 2) modules, kcminit to execute
97 97
 kcminit phase 2 (kcontrol modules that do initialization that can wait,

+ 1
- 1
ksmserver/startup.cpp View File

@@ -329,7 +329,7 @@ void KSMServer::autoStart2()
329 329
     DCOPRef( "kcminit", "kcminit" ).send( "runPhase2" );
330 330
     if( !defaultSession())
331 331
         restoreLegacySession( KGlobal::config());
332
-    KNotifyClient::event( 0, "startkde" ); // this is the time KDE is up, more or less
332
+    KNotifyClient::event( 0, "starttde" ); // this is the time KDE is up, more or less
333 333
 }
334 334
 
335 335
 void KSMServer::autoStart2Done()

+ 1
- 1
ksplashml/wndmain.cpp View File

@@ -348,7 +348,7 @@ ThemeEngine *KSplash::_loadThemeEngine( const TQString& pluginName, const TQStri
348 348
 {
349 349
   // Since we may be called before the DCOP server is active, we cannot use the KTrader framework for obtaining plugins. In its
350 350
   // place, we use the following naive heuristic to locate plugins. If we are not in managed mode, and we are not in testing mode
351
-  // either, we assume that we have been called by startkde. In this case, we simply try to load the library whose name should
351
+  // either, we assume that we have been called by starttde. In this case, we simply try to load the library whose name should
352 352
   // conform to the following specification:
353 353
   //       TQString("ksplash") + pluginName.lower()
354 354
   // The object should be called as follows:

+ 1
- 1
ksysguard/gui/SensorDisplayLib/ProcessList.cc View File

@@ -192,7 +192,7 @@ ProcessList::ProcessList(TQWidget *parent, const char* name)
192 192
 		aliases.insert("kwrapper", new TQString("kdeapp"));
193 193
 		aliases.insert("kwrited", new TQString("kdeapp"));
194 194
 		aliases.insert("kxmlrpcd", new TQString("kdeapp"));
195
-		aliases.insert("startkde", new TQString("kdeapp"));
195
+		aliases.insert("starttde", new TQString("kdeapp"));
196 196
 		/* other processes */
197 197
 		aliases.insert("bash", new TQString("shell"));
198 198
 		aliases.insert("cat", new TQString("tools"));

+ 1
- 1
nsplugins/kcm_nsplugins.cpp View File

@@ -90,7 +90,7 @@ extern "C"
90 90
     {
91 91
         KConfig *config = new KConfig("kcmnspluginrc", true /* readonly */, false /* no globals*/);
92 92
         config->setGroup("Misc");
93
-        bool scan = config->readBoolEntry( "startkdeScan", false );
93
+        bool scan = config->readBoolEntry( "starttdeScan", false );
94 94
         bool firstTime = config->readBoolEntry( "firstTime", true );
95 95
         
96 96
         if( !scan )

+ 26
- 26
startkde View File

@@ -3,15 +3,15 @@
3 3
 #  DEFAULT TRINITY STARTUP SCRIPT ( KDE-3.5.12 )
4 4
 #
5 5
 
6
-echo "[startkde] Starting startkde." 1>&2
6
+echo "[starttde] Starting starttde." 1>&2
7 7
 
8 8
 # When the X server dies we get a HUP signal from xinit. We must ignore it
9 9
 # because we still need to do some cleanup.
10
-trap '[startkde] echo GOT SIGHUP' HUP
10
+trap '[starttde] echo GOT SIGHUP' HUP
11 11
 
12 12
 # Check if a KDE session is already running.
13 13
 if kcheckrunning >/dev/null 2>&1; then
14
-	echo "[startkde] KDE seems to be already running on this display."
14
+	echo "[starttde] KDE seems to be already running on this display."
15 15
 	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
16 16
 	exit 1
17 17
 fi
@@ -71,18 +71,18 @@ fi
71 71
 # $HOME/.kde as their preferred profile location for Trinity KDE.
72 72
 
73 73
 if [ -n "$KDEHOME" ]; then
74
-  echo "[startkde] KDEHOME is preset to $KDEHOME." 1>&2
74
+  echo "[starttde] KDEHOME is preset to $KDEHOME." 1>&2
75 75
   export KDEHOME=$KDEHOME
76 76
 else
77 77
   # $KDEHOME is NOT already preset in the environment. Try to help.
78 78
   # This might be overkill but does provide flexibility.
79
-  echo "[startkde] KDEHOME is not set." 1>&2
79
+  echo "[starttde] KDEHOME is not set." 1>&2
80 80
   if [ -d $HOME/.trinity ]; then
81 81
     # OK, this one is obvious.
82 82
     export KDEHOME=$HOME/.trinity
83 83
   elif [ -d $HOME/.trinity ]; then
84 84
     # Looks like the user had an old version of Trinity installed at last login
85
-    echo "[startkde] Migrating old ~/.trinity directory to new ~/.trinity name." 1>&2
85
+    echo "[starttde] Migrating old ~/.trinity directory to new ~/.trinity name." 1>&2
86 86
     mv $HOME/.trinity $HOME/.trinity
87 87
     export KDEHOME=$HOME/.trinity
88 88
   elif [ -f /usr/bin/kde4-config ]; then
@@ -107,12 +107,12 @@ else
107 107
     # Resort to this and hope for the best!
108 108
     export KDEHOME=$HOME/.trinity
109 109
   fi
110
-  echo "[startkde] Set KDEHOME to $KDEHOME." 1>&2
110
+  echo "[starttde] Set KDEHOME to $KDEHOME." 1>&2
111 111
 fi
112 112
 
113 113
 # Run a quick test for root.
114 114
 if [ -z "$KDEROOTHOME" ] && [ "$UID" = "0" ]; then
115
-  echo "[startkde] User ID is $UID. Setting KDEROOTHOME to $KDEHOME."
115
+  echo "[starttde] User ID is $UID. Setting KDEROOTHOME to $KDEHOME."
116 116
   export KDEROOTHOME=$KDEHOME
117 117
 fi
118 118
 
@@ -163,7 +163,7 @@ if [ -d /opt/trinity ]; then
163 163
 fi
164 164
 
165 165
 test -n "$KDEHOME" && kdehome=`echo "$KDEHOME" | sed "s,^~/,$HOME/,"`
166
-echo "[startkde] kdehome: $kdehome" 1>&2
166
+echo "[starttde] kdehome: $kdehome" 1>&2
167 167
 
168 168
 # Allow interested applications, such as the Plasma control wrapper,
169 169
 # to know that this is a Trinity desktop and not a KDE one.
@@ -387,8 +387,8 @@ if [ ! -n "$KDEDIR" ]; then
387 387
   export KDEDIR=`echo "$KDEDIRS" | sed -e 's/:.*//'`
388 388
 fi
389 389
 
390
-echo "[startkde] KDEDIR: $KDEDIR" 1>&2
391
-echo "[startkde] KDEDIRS: $KDEDIRS" 1>&2
390
+echo "[starttde] KDEDIR: $KDEDIR" 1>&2
391
+echo "[starttde] KDEDIRS: $KDEDIRS" 1>&2
392 392
 
393 393
 if test -n "$KDEDIRS"; then
394 394
   kdedirs_first=`echo "$KDEDIRS" | sed -e 's/:.*//'`
@@ -401,9 +401,9 @@ fi
401 401
 
402 402
 if test -n "$KDEDIRS"; then
403 403
   kdedirs_first=`echo "$KDEDIRS" | sed -e 's/:.*//'`
404
-  echo "[startkde] kdedirs_first: $kdedirs_first"
404
+  echo "[starttde] kdedirs_first: $kdedirs_first"
405 405
   if [ -r $kdedirs_first/share/kgtk/preload ]; then
406
-    echo "[startkde] Reading from $kdedirs_first/share/kgtk/preload"
406
+    echo "[starttde] Reading from $kdedirs_first/share/kgtk/preload"
407 407
     read -r KGTK_PRELOAD < $kdedirs_first/share/kgtk/preload
408 408
   fi
409 409
 else
@@ -464,7 +464,7 @@ fi
464 464
 # environment variables.
465 465
 for resource in tmp cache socket; do
466 466
   if ! lnusertemp $resource >/dev/null; then
467
-    echo "[startkde] Call to lnusertemp failed (temporary directories full?). Check your installation." 1>&2
467
+    echo "[starttde] Call to lnusertemp failed (temporary directories full?). Check your installation." 1>&2
468 468
     xmessage -geometry 600x100 "Call to lnusertemp failed (temporary directories full?). Check your installation."
469 469
     exit 1
470 470
   fi
@@ -473,7 +473,7 @@ done
473 473
 # In case of dcop sockets left by a previous session, cleanup.
474 474
 dcopserver_shutdown
475 475
 
476
-echo '[startkde] Starting Trinity...'  1>&2
476
+echo '[starttde] Starting Trinity...'  1>&2
477 477
 
478 478
 # Detect any running Xorg composition managers
479 479
 $KDEDIR/bin/kdetcompmgr
@@ -481,10 +481,10 @@ $KDEDIR/bin/kdetcompmgr
481 481
 # Run KPersonalizer before the session if this is the first login.
482 482
 if test "$kpersonalizerrc_general_firstlogin" = "true"; then
483 483
   if [ ! -x $KDEDIR/bin/kpersonalizer ]; then
484
-    echo "[startkde] kpersonalizer not found! Please install it in order to properly configure your user profile." 1>&2
484
+    echo "[starttde] kpersonalizer not found! Please install it in order to properly configure your user profile." 1>&2
485 485
   else
486 486
     # start only dcopserver, don't start whole tdeinit (takes too long)
487
-    echo "[startkde] Running kpersonalizer..." 1>&2
487
+    echo "[starttde] Running kpersonalizer..." 1>&2
488 488
     dcopserver
489 489
     twin --lock &
490 490
     kpersonalizer --before-session
@@ -541,20 +541,20 @@ fi
541 541
 TDE_FULL_SESSION=true
542 542
 export TDE_FULL_SESSION
543 543
 xprop -root -f TDE_FULL_SESSION 8t -set TDE_FULL_SESSION true
544
-echo "[startkde] TDE_FULL_SESSION: $TDE_FULL_SESSION" 1>&2
544
+echo "[starttde] TDE_FULL_SESSION: $TDE_FULL_SESSION" 1>&2
545 545
 KDE_SESSION_UID=$UID
546 546
 export KDE_SESSION_UID
547
-echo "[startkde] KDE_SESSION_UID: $KDE_SESSION_UID" 1>&2
547
+echo "[starttde] KDE_SESSION_UID: $KDE_SESSION_UID" 1>&2
548 548
 
549 549
 # We set LD_BIND_NOW to increase the efficiency of tdeinit.
550 550
 # tdeinit unsets this variable before loading applications.
551 551
 LD_BIND_NOW=true start_tdeinit_wrapper --new-startup +kcminit_startup
552 552
 if test $? -ne 0; then
553 553
   # Startup error
554
-  echo '[startkde] Could not start tdeinit. Check your installation.' 1>&2
554
+  echo '[starttde] Could not start tdeinit. Check your installation.' 1>&2
555 555
   xmessage -geometry 500x100 "Could not start tdeinit. Check your installation."
556 556
 fi
557
-echo "[startkde] tdeinit started successfully." 1>&2
557
+echo "[starttde] tdeinit started successfully." 1>&2
558 558
 
559 559
 # If the session should be locked from the start (locked autologin),
560 560
 # lock now and do the rest of the KDE startup underneath the locker.
@@ -579,7 +579,7 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
579 579
 kwrapper ksmserver $KDEWM
580 580
 if test $? -eq 255; then
581 581
   # Startup error
582
-  echo '[startkde] Could not start ksmserver. Check your installation.' 1>&2
582
+  echo '[starttde] Could not start ksmserver. Check your installation.' 1>&2
583 583
   xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
584 584
 fi
585 585
 
@@ -588,7 +588,7 @@ while dcop | grep -q ^drkonqi- ; do
588 588
     sleep 5
589 589
 done
590 590
 
591
-echo '[startkde] Shutting down Trinity...'  1>&2
591
+echo '[starttde] Shutting down Trinity...'  1>&2
592 592
 
593 593
 # Clean up
594 594
 tdeinit_shutdown
@@ -599,13 +599,13 @@ if [ -f /usr/bin/tdeinit4_shutdown ]; then
599 599
   kde4 tdeinit4_shutdown 2>/dev/null
600 600
 fi
601 601
 
602
-echo '[startkde] Running Trinity shutdown scripts...'  1>&2
602
+echo '[starttde] Running Trinity shutdown scripts...'  1>&2
603 603
 
604 604
 # Run scripts found in $KDEDIRS/shutdown
605 605
 for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
606 606
   for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
607 607
     if [ -x "${prefix}${file}" ]; then
608
-      echo "[startkde] Running ${prefix}${file}." 1>&2
608
+      echo "[starttde] Running ${prefix}${file}." 1>&2
609 609
       sh ${prefix}${file}
610 610
     fi
611 611
   done
@@ -616,4 +616,4 @@ xprop -root -remove TDE_FULL_SESSION
616 616
 unset KDE_SESSION_UID
617 617
 
618 618
 # Initialize_Status_Header
619
-echo "[startkde] Trinity shutdown complete." 1>&2
619
+echo "[starttde] Trinity shutdown complete." 1>&2

Loading…
Cancel
Save