Attachment 425 Details for Bug 860 – tdenetwork: Patch to rename certain environment variables

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tdenetwork: Patch to rename certain environment variables

tdenetwork-env-vars.diff (text/plain), 4.13 KB, created by Darrell on 2012-02-27 08:01:48 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2012-02-27 08:01:48 CST

Size: 4.13 KB

patch

obsolete

>diff -urN tdenetwork/ktalkd/ChangeLog tdenetwork.new/ktalkd/ChangeLog
>--- tdenetwork/ktalkd/ChangeLog	2011-12-25 01:10:51.000000000 -0600
>+++ tdenetwork.new/ktalkd/ChangeLog	2012-02-17 20:16:19.000000000 -0600
>@@ -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().
>diff -urN tdenetwork/ktalkd/kcmktalkd/soundpage.cpp tdenetwork.new/ktalkd/kcmktalkd/soundpage.cpp
>--- tdenetwork/ktalkd/kcmktalkd/soundpage.cpp	2011-12-25 01:10:51.000000000 -0600
>+++ tdenetwork.new/ktalkd/kcmktalkd/soundpage.cpp	2012-02-17 20:16:18.000000000 -0600
>@@ -287,7 +287,7 @@
>     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",
>diff -urN tdenetwork/ktalkd/ktalkd/ktalkdrc tdenetwork.new/ktalkd/ktalkd/ktalkdrc
>--- tdenetwork/ktalkd/ktalkd/ktalkdrc	2011-12-25 01:10:51.000000000 -0600
>+++ tdenetwork.new/ktalkd/ktalkd/ktalkdrc	2012-02-17 20:16:18.000000000 -0600
>@@ -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 @@
> # 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
>diff -urN tdenetwork/ktalkd/ktalkd/readcfg++.cpp tdenetwork.new/ktalkd/ktalkd/readcfg++.cpp
>--- tdenetwork/ktalkd/ktalkd/readcfg++.cpp	2011-12-25 01:10:51.000000000 -0600
>+++ tdenetwork.new/ktalkd/ktalkd/readcfg++.cpp	2012-02-17 20:16:18.000000000 -0600
>@@ -182,8 +182,8 @@
>   // 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" );
> 
>diff -urN tdenetwork/ktalkd/ktalkdlg/ktalkdlg.cpp tdenetwork.new/ktalkd/ktalkdlg/ktalkdlg.cpp
>--- tdenetwork/ktalkd/ktalkdlg/ktalkdlg.cpp	2011-12-25 01:10:52.000000000 -0600
>+++ tdenetwork.new/ktalkd/ktalkdlg/ktalkdlg.cpp	2012-02-17 20:16:19.000000000 -0600
>@@ -141,7 +141,7 @@
>         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();

Actions: View | Diff

Attachments on bug 860: 363 | 364 | 365 | 366 | 367 | 368 | 369 | 370 | 371 | 372 | 373 | 374 | 375 | 376 | 377 | 378 | 379 | 380 | 381 | 382 | 383 | 384 | 385 | 386 | 387 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 425 | 426 | 427 | 450