From dcb480334c2e8a53fd5ca421b6bd686ea594d4ac Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 26 Jul 2018 21:57:50 +0900 Subject: [PATCH] Revert "Fix bug reports link in about dialog" This reverts commit 69fc44f5d55b813aeeb0c06473ceede28400e7bf. --- README | 4 ++-- .../customization/de/entities/report-bugs.docbook | 2 +- .../customization/es/entities/report-bugs.docbook | 2 +- .../customization/nl/entities/report-bugs.docbook | 2 +- tdecore/tdecmdlineargs.cpp | 6 ++---- tdeio/misc/tdesendbugmail/main.cpp | 8 ++++---- tdeio/tdeio/global.cpp | 10 +++++----- tdeio/tdeio/kautomount.cpp | 2 +- tdeio/tests/kprotocolinfotest.cpp | 2 +- tdeio/tests/kurifiltertest.cpp | 2 +- tdeprint/kprintprocess.cpp | 2 +- tdeui/kbugreport.cpp | 8 ++++---- tdeui/kbugreport.h | 2 +- tdeui/tdeaboutapplication.cpp | 6 ++---- tdeui/tdeabouttde.cpp | 2 +- 15 files changed, 28 insertions(+), 32 deletions(-) diff --git a/README b/README index 6740935de..e2eba8a04 100644 --- a/README +++ b/README @@ -236,8 +236,8 @@ So, here are some tips on bug reporting: older, deprecated versions usually don't get that much attention :-) * Also the chance is high that another one experienced your problem. The - bug report wizard at http://bugs.trinitydesktop.org will help you to - find out if your problem has already been reported. + bug report wizard at http://bugs.kde.org will help you to find out if your + problem has already been reported. * The best bug report for a project based on voluntary work is of course one that comes with a patch that solves the problem. :-) diff --git a/kdoctools/customization/de/entities/report-bugs.docbook b/kdoctools/customization/de/entities/report-bugs.docbook index bdab68063..26ac76a23 100644 --- a/kdoctools/customization/de/entities/report-bugs.docbook +++ b/kdoctools/customization/de/entities/report-bugs.docbook @@ -1 +1 @@ -Berichten Sie über Probleme und Wünsche auf der Internetseite http://bugs.trinitydesktop.org. +Berichten Sie über Probleme und Wünsche auf der Internetseite http://bugs.kde.org. diff --git a/kdoctools/customization/es/entities/report-bugs.docbook b/kdoctools/customization/es/entities/report-bugs.docbook index 9a54332fb..7becde305 100644 --- a/kdoctools/customization/es/entities/report-bugs.docbook +++ b/kdoctools/customization/es/entities/report-bugs.docbook @@ -1 +1 @@ -Si encuentra algún error en la documentación o en su traducción dirijase a la página http://bugs.trinitydesktop.org para informar del error. +Si encuentra algún error en la documentación o en su traducción dirijase a la página http://bugs.kde.org para informar del error. diff --git a/kdoctools/customization/nl/entities/report-bugs.docbook b/kdoctools/customization/nl/entities/report-bugs.docbook index 6c5009213..c07a3d282 100644 --- a/kdoctools/customization/nl/entities/report-bugs.docbook +++ b/kdoctools/customization/nl/entities/report-bugs.docbook @@ -1 +1 @@ -Problemen en suggesties kunnen op de website http://bugs.trinitydesktop.org gemeld worden. +Problemen en suggesties kunnen op de website http://bugs.kde.nl gemeld worden. \ No newline at end of file diff --git a/tdecore/tdecmdlineargs.cpp b/tdecore/tdecmdlineargs.cpp index 0b9e2693f..46d1b9f4a 100644 --- a/tdecore/tdecmdlineargs.cpp +++ b/tdecore/tdecmdlineargs.cpp @@ -625,10 +625,8 @@ TDECmdLineArgs::parseAllArgs() { if (!about->customAuthorTextEnabled ()) { - if (about->bugAddress().isEmpty() - || about->bugAddress() == "submit@bugs.trinitydesktop.org" - || about->bugAddress() == "http://bugs.trinitydesktop.org" ) - printQ( i18n( "Please use http://bugs.trinitydesktop.org to report bugs.\n" ) ); + if (about->bugAddress().isEmpty() || about->bugAddress() == "bugs.pearsoncomputing.net" ) + printQ( i18n( "Please use http://bugs.pearsoncomputing.net to report bugs.\n" ) ); else { if( about->authors().count() == 1 && about->authors().first().emailAddress() == about->bugAddress() ) printQ( i18n( "Please report bugs to %1.\n" ).arg( about->authors().first().emailAddress() ) ); diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp index bf3099094..32465039d 100644 --- a/tdeio/misc/tdesendbugmail/main.cpp +++ b/tdeio/misc/tdesendbugmail/main.cpp @@ -20,7 +20,7 @@ static TDECmdLineOptions options[] = { { "subject ", I18N_NOOP("Subject line"), 0 }, - { "recipient ", I18N_NOOP("Recipient"), "submit@bugs.trinitydesktop.org" }, + { "recipient ", I18N_NOOP("Recipient"), "submit@bugs.kde.org" }, TDECmdLineLastOption }; @@ -60,7 +60,7 @@ int main(int argc, char **argv) { TDELocale::setMainCatalogue("tdelibs"); TDEAboutData d("tdesendbugmail", I18N_NOOP("KSendBugMail"), "1.0", - I18N_NOOP("Sends a short bug report to submit@bugs.trinitydesktop.org"), + I18N_NOOP("Sends a short bug report to submit@bugs.kde.org"), TDEAboutData::License_GPL, "(c) 2000 Stephan Kulow"); d.addAuthor("Stephan Kulow", I18N_NOOP("Author"), "coolo@kde.org"); @@ -72,7 +72,7 @@ int main(int argc, char **argv) { TQCString recipient = args->getOption("recipient"); if (recipient.isEmpty()) - recipient = "submit@bugs.trinitydesktop.org"; + recipient = "submit@bugs.kde.org"; else { if (recipient.at(0) == '\'') { recipient = recipient.mid(1).left(recipient.length() - 2); @@ -117,7 +117,7 @@ int main(int argc, char **argv) { TQString server = emailConfig.getSetting(KEMailSettings::OutServer); if (server.isEmpty()) - server=TQString::fromLatin1("bugs.trinitydesktop.org"); + server=TQString::fromLatin1("bugs.kde.org"); SMTP *sm = new SMTP; BugMailer bm(sm); diff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp index 4a5819bad..a75cc223f 100644 --- a/tdeio/tdeio/global.cpp +++ b/tdeio/tdeio/global.cpp @@ -243,7 +243,7 @@ TDEIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &err result = i18n( "Could not start process %1." ).arg( errorText ); break; case TDEIO::ERR_INTERNAL: - result = i18n( "Internal Error\nPlease send a full bug report at http://bugs.trinitydesktop.org\n%1" ).arg( errorText ); + result = i18n( "Internal Error\nPlease send a full bug report at http://bugs.kde.org\n%1" ).arg( errorText ); break; case TDEIO::ERR_MALFORMED_URL: result = i18n( "Malformed URL %1." ).arg( errorText ); @@ -429,7 +429,7 @@ TDEIO_EXPORT TQString TDEIO::buildErrorString(int errorCode, const TQString &err result = i18n( "Could not access %1.\nOffline mode active.").arg( errorText ); break; default: - result = i18n( "Unknown error code %1\n%2\nPlease send a full bug report at http://bugs.trinitydesktop.org." ).arg( errorCode ).arg( errorText ); + result = i18n( "Unknown error code %1\n%2\nPlease send a full bug report at http://bugs.kde.org." ).arg( errorCode ).arg( errorText ); break; } @@ -608,7 +608,7 @@ TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &er "high quality bug report. If the software is provided by a third party, " "please contact them directly. Otherwise, first look to see if " "the same bug has been submitted by someone else by searching at the " - "TDE bug reporting website. If not, take " + "TDE bug reporting website. If not, take " "note of the details given above, and include them in your bug report, along " "with as many other details as you think might help." ); TQString cNetwork = i18n( "There may have been a problem with your network " @@ -1118,8 +1118,8 @@ TDEIO_EXPORT TQByteArray TDEIO::rawErrorDetail(int errorCode, const TQString &er "authentication details, the authentication failed because the " "method that the server is using is not supported by the TDE " "program implementing the protocol %1." ).arg( protocol ); - solutions << i18n( "Please file a bug at " - "http://bugs.trinitydesktop.org/ to inform the TDE team of the unsupported " + solutions << i18n( "Please file a bug at " + "http://bugs.pearsoncomputing.net/ to inform the TDE team of the unsupported " "authentication method." ) << sSysadmin; break; diff --git a/tdeio/tdeio/kautomount.cpp b/tdeio/tdeio/kautomount.cpp index c6fa72371..f167a6ccb 100644 --- a/tdeio/tdeio/kautomount.cpp +++ b/tdeio/tdeio/kautomount.cpp @@ -57,7 +57,7 @@ void KAutoMount::slotResult( TDEIO::Job * job ) if ( mountpoint.path().isEmpty() ) kdWarning(7015) << m_strDevice << " was correctly mounted, but TDEIO::findDeviceMountPoint didn't find it. " - << "This looks like a bug, please report it on http://bugs.trinitydesktop.org, together with your /etc/fstab line" << endl; + << "This looks like a bug, please report it on http://bugs.kde.org, together with your /etc/fstab line" << endl; else if ( m_bShowFilemanagerWindow ) KRun::runURL( mountpoint, "inode/directory" ); diff --git a/tdeio/tests/kprotocolinfotest.cpp b/tdeio/tests/kprotocolinfotest.cpp index 8285396b8..d951f3696 100644 --- a/tdeio/tests/kprotocolinfotest.cpp +++ b/tdeio/tests/kprotocolinfotest.cpp @@ -48,7 +48,7 @@ int main(int argc, char **argv) { assert( TDEGlobalSettings::showFilePreview( "audiocd:/" ) == false ); TQString proxy; - TQString protocol = KProtocolManager::slaveProtocol( "http://bugs.trinitydesktop.org", proxy ); + TQString protocol = KProtocolManager::slaveProtocol( "http://bugs.kde.org", proxy ); assert( protocol == "http" ); TQStringList capabilities = KProtocolInfo::capabilities( "imap" ); diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp index 9de62e134..d9f6cdf87 100644 --- a/tdeio/tests/kurifiltertest.cpp +++ b/tdeio/tests/kurifiltertest.cpp @@ -343,7 +343,7 @@ int main(int argc, char **argv) TQCString sc; filter( sc.sprintf("gg%cfoo bar",delimiter), "http://www.google.com/search?q=foo+bar&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); - filter( sc.sprintf("bug%c55798", delimiter), "http://bugs.trinitydesktop.org/show_bug.cgi?id=55798", KURIFilterData::NET_PROTOCOL ); + filter( sc.sprintf("bug%c55798", delimiter), "http://bugs.pearsoncomputing.net/show_bug.cgi?id=55798", KURIFilterData::NET_PROTOCOL ); filter( sc.sprintf("gg%cC++", delimiter), "http://www.google.com/search?q=C%2B%2B&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL ); filter( sc.sprintf("ya%cfoo bar was here", delimiter), 0, -1 ); // this triggers default search, i.e. google diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp index 2b0c0f6f6..89ef5e2ca 100644 --- a/tdeprint/kprintprocess.cpp +++ b/tdeprint/kprintprocess.cpp @@ -86,7 +86,7 @@ void KPrintProcess::slotExited( TDEProcess* ) break; default: emit printError( this, "Internal error, printing terminated in unexpected state. " - "Report bug at http://bugs.trinitydesktop.org." ); + "Report bug at http://bugs.kde.org." ); break; } } diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp index 44243715d..7a2862cbf 100644 --- a/tdeui/kbugreport.cpp +++ b/tdeui/kbugreport.cpp @@ -88,7 +88,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou TQWidget * parent = plainPage(); d->submitBugButton = 0; - //if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@bugs.trinitydesktop.org") ) + //if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@bugs.pearsoncomputing.net") ) //{ // // This is a core KDE application -> redirect to the web form // Always redirect to the Web form for Trinity @@ -284,7 +284,7 @@ KBugReport::~KBugReport() void KBugReport::updateURL() { - KURL url ( "http://bugs.trinitydesktop.org/enter_bug.cgi" ); + KURL url ( "http://bugs.pearsoncomputing.net/enter_bug.cgi" ); url.addQueryItem( "product", "TDE" ); url.addQueryItem( "op_sys", d->os ); url.addQueryItem( "cf_kde_compiler", KDE_COMPILER_VERSION ); @@ -419,7 +419,7 @@ void KBugReport::slotOk( void ) { TQString msg = i18n("Unable to send the bug report.\n" "Please submit a bug report manually...\n" - "See http://bugs.trinitydesktop.org/ for instructions."); + "See http://bugs.pearsoncomputing.net/ for instructions."); KMessageBox::error(this, msg + "\n\n" + d->lastError); return; } @@ -487,7 +487,7 @@ bool KBugReport::sendBugReport() { TQString recipient ( m_aboutData ? m_aboutData->bugAddress() : - TQString::fromLatin1("submit@bugs.trinitydesktop.org") ); + TQString::fromLatin1("submit@bugs.pearsoncomputing.net") ); TQString command; command = locate("exe", "tdesendbugmail"); diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h index 3110d3dd6..e95c49902 100644 --- a/tdeui/kbugreport.h +++ b/tdeui/kbugreport.h @@ -71,7 +71,7 @@ protected slots: */ virtual void slotSetFrom(); /** - * The URL-Label "http://bugs.trinitydesktop.org/" was clicked. + * The URL-Label "http://bugs.pearsoncomputing.net/" was clicked. * @deprecated remove in KDE4.0 */ virtual void slotUrlClicked(const TQString &); diff --git a/tdeui/tdeaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp index e9eb2f4b8..ef9efb181 100644 --- a/tdeui/tdeaboutapplication.cpp +++ b/tdeui/tdeaboutapplication.cpp @@ -113,10 +113,8 @@ void TDEAboutApplication::buildDialog( const TDEAboutData *aboutData ) KActiveLabel* activeLabel = new KActiveLabel( authorPage ); if (!aboutData->customAuthorTextEnabled()) { - if ( aboutData->bugAddress().isEmpty() - || aboutData->bugAddress() == "submit@bugs.trinitydesktop.org" - || aboutData->bugAddress() == "http://bugs.trinitydesktop.org") - text = i18n( "Please use http://bugs.trinitydesktop.org to report bugs.\n" ); + if ( aboutData->bugAddress().isEmpty() || aboutData->bugAddress() == "submit@bugs.pearsoncomputing.net") + text = i18n( "Please use http://bugs.pearsoncomputing.net to report bugs.\n" ); else { if( aboutData->authors().count() == 1 && ( aboutData->authors().first().emailAddress() == aboutData->bugAddress() ) ) { diff --git a/tdeui/tdeabouttde.cpp b/tdeui/tdeabouttde.cpp index 4f028d51d..c76388caf 100644 --- a/tdeui/tdeabouttde.cpp +++ b/tdeui/tdeabouttde.cpp @@ -52,7 +52,7 @@ TDEAboutKDE::TDEAboutKDE( TQWidget *parent, const char *name, bool modal ) "do so. However, you - the user - must tell us when " "something does not work as expected or could be done better.

" "The Trinity Desktop Environment has a bug tracking system. Visit " - "http://bugs.trinitydesktop.org or " + "http://bugs.pearsoncomputing.net or " "use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.

" "If you have a suggestion for improvement then you are welcome to use " "the bug tracking system to register your wish. Make sure you use the "