Revert "Revert "Fix bug reports link in about dialog""

The reversion was done by mistake and inadvertently. Sorry for the
mess :-(

This reverts commit dcb480334c2e8a53fd5ca421b6bd686ea594d4ac.

4 files changed, 10 insertions, 8 deletions

diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index 7a2862cbf..44243715d 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.pearsoncomputing.net") )
+  //if ( m_aboutData->bugAddress() == TQString::fromLatin1("submit@bugs.trinitydesktop.org") )
   //{
   //  // 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.pearsoncomputing.net/enter_bug.cgi" );
+    KURL url ( "http://bugs.trinitydesktop.org/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.pearsoncomputing.net/ for instructions.");
+                           "See http://bugs.trinitydesktop.org/ 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.pearsoncomputing.net") );
+    TQString::fromLatin1("submit@bugs.trinitydesktop.org") );
 
   TQString command;
   command = locate("exe", "tdesendbugmail");
diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h
index e95c49902..3110d3dd6 100644
--- a/tdeui/kbugreport.h
+++ b/tdeui/kbugreport.h
@@ -71,7 +71,7 @@ protected slots:
    */
   virtual void slotSetFrom();
   /**
-   * The URL-Label "http://bugs.pearsoncomputing.net/" was clicked.
+   * The URL-Label "http://bugs.trinitydesktop.org/" was clicked.
    * @deprecated remove in KDE4.0
    */
   virtual void slotUrlClicked(const TQString &);
diff --git a/tdeui/tdeaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp
index ef9efb181..e9eb2f4b8 100644
--- a/tdeui/tdeaboutapplication.cpp
+++ b/tdeui/tdeaboutapplication.cpp
@@ -113,8 +113,10 @@ void TDEAboutApplication::buildDialog( const TDEAboutData *aboutData )
       KActiveLabel* activeLabel = new KActiveLabel( authorPage );
       if (!aboutData->customAuthorTextEnabled())
       {
-        if ( aboutData->bugAddress().isEmpty() || aboutData->bugAddress() == "submit@bugs.pearsoncomputing.net")
-          text = i18n( "Please use <a href=\"http://bugs.pearsoncomputing.net\">http://bugs.pearsoncomputing.net</a> to report bugs.\n" );
+        if ( aboutData->bugAddress().isEmpty()
+             || aboutData->bugAddress() == "submit@bugs.trinitydesktop.org"
+             || aboutData->bugAddress() == "http://bugs.trinitydesktop.org")
+          text = i18n( "Please use <a href=\"http://bugs.trinitydesktop.org\">http://bugs.trinitydesktop.org</a> 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 c76388caf..4f028d51d 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.<br><br>"
     "The Trinity Desktop Environment has a bug tracking system. Visit "
-    "<A HREF=\"http://bugs.pearsoncomputing.net\">http://bugs.pearsoncomputing.net</A> or "
+    "<a href=\"http://bugs.trinitydesktop.org\">http://bugs.trinitydesktop.org</a> or "
     "use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs.<br><br>"
     "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 "