Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdenetwork

ktalkd/ChangeLog

@@ -362,7 +362,7 @@
 1998-04-15  David Faure  <faure@kde.org> (0.5.1)
 
 	ktalkd doesn't use anymore tdedir() because it's protected.
-	It sets now $KDEBINDIR, for portable ktalkdrc files. KDEBINDIR 
+	It sets now $TDEBINDIR, for portable ktalkdrc files. TDEBINDIR 
 	is determined by a call to the kde_bindir() function.
 	Makefile doesn't define TALKD_CONF anymore for compilation :
 	ktalkd now opens ktalkdrc from KApplication::kde_configdir().

ktalkd/kcmktalkd/soundpage.cpp

@@ -287,7 +287,7 @@ void KSoundPageConfig::load() {
     config->setGroup("ktalkd");
     announceconfig->setGroup("ktalkannounce");
 
-    setenv("KDEBINDIR",TQFile::encodeName(KStandardDirs::kde_default("exe")),false/*don't overwrite*/);
+    setenv("TDEBINDIR",TQFile::encodeName(KStandardDirs::kde_default("exe")),false/*don't overwrite*/);
            // for the first reading of  the config file
 
     extprg_edit->lineEdit()->setText(config->readPathEntry("ExtPrg",

ktalkd/ktalkd/ktalkdrc

@@ -8,7 +8,7 @@
 
 # Mail sender (can be mail.local, sendmail(preferred), qmail(as good:)) )
 #  mail.local is included in the dist., just in case you don't have sendmail
-MailProg=$KDEBINDIR/mail.local
+MailProg=$TDEBINDIR/mail.local
 
 # What should I do if somebody tries to talk to a non-existent user ?
 # 0 = Launch answer machine saying 'non-existent user...' 
@@ -50,14 +50,14 @@ XAnnounce=1
 # ktalkdlg, a pop-up KDE dialog box, which can launch any talk client
 # or ktalk, the KDE talk client.
 # Will be launched with the caller's address as parameter
-#   KDEBINDIR will be set by ktalkd.
-ExtPrg=$KDEBINDIR/ktalkdlg
+#   TDEBINDIR will be set by ktalkd.
+ExtPrg=$TDEBINDIR/ktalkdlg
 
 # Which talk client should ktalkdlg launch ? (Default value)
-# The default is "$KDEBINDIR/konsole -e talk". If ktalk is installed,
-# use "$KDEBINDIR/ktalk"
-#   KDEBINDIR will be set by ktalkd.
-talkprg=$KDEBINDIR/konsole -e talk
+# The default is "$TDEBINDIR/konsole -e talk". If ktalk is installed,
+# use "$TDEBINDIR/ktalk"
+#   TDEBINDIR will be set by ktalkd.
+talkprg=$TDEBINDIR/konsole -e talk
 
 # Set to 1 to enable talk notifications with sound.
 Sound=1

ktalkd/ktalkd/readcfg++.cpp

@@ -182,8 +182,8 @@ int process_config_file(void)
   // Where is ktalkdlg installed ?
   TQString ktalkdlg_dir = locate("exe", "ktalkdlg");
   ktalkdlg_dir.truncate( ktalkdlg_dir.findRev('/') );
-  // Has to be done, for any $KDEBINDIR in ktalkdrc.
-  setenv("KDEBINDIR", TQFile::encodeName(ktalkdlg_dir), 0/*don't overwrite*/);
+  // Has to be done, for any $TDEBINDIR in ktalkdrc.
+  setenv("TDEBINDIR", TQFile::encodeName(ktalkdlg_dir), 0/*don't overwrite*/);
 
   KConfig * syscfg = new KConfig( "ktalkdrc" );
 

ktalkd/ktalkdlg/ktalkdlg.cpp

@@ -141,7 +141,7 @@ int main (int argc, char **argv)
         TQString konsole = locate("exe", "konsole");
         TQString konsole_dir = konsole;
         konsole_dir.truncate( konsole.findRev('/') );
-        setenv("KDEBINDIR", TQFile::encodeName(konsole_dir).data(), 0/*don't overwrite*/);
+        setenv("TDEBINDIR", TQFile::encodeName(konsole_dir).data(), 0/*don't overwrite*/);
         TQString cmd0 = cfg->readPathEntry ("talkprg", konsole + " -e talk");
 
 	TQString cmd = cmd0.stripWhiteSpace();