Branch 'kolab/integration/4.13.0' - kontact/src

[Christian Mollekopf]

 kontact/src/mainwindow.cpp |   34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

New commits:
commit 2e4bc7773c52bb55e90521678d00c5d4ef9083a8
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Wed Jan 28 13:52:23 2015 +0100

    Workaround for berserk KIO processes
    
    The KWebView somehow goes berserk with the html set. Since I can't figure out why,
    we disable the introduction page for now.
    
    KOLAB 4168

diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index cb581d3..fedc374 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -397,12 +397,13 @@ void MainWindow::paintAboutScreen( const QString &msg )
     content = content.arg( QString() );
   }
 
-  mIntroPart->setHtml(
-    content.arg( QFont().pointSize() + 2 ).
-    arg( i18nc( "@item:intext", "KDE Kontact" ) ).
-    arg( i18nc( "@item:intext", "Get Organized!" ) ).
-    arg( i18nc( "@item:intext", "The KDE Personal Information Management Suite" ) ).
-    arg( msg ) );
+  //FIXME: Disabled due to bug https://issues.kolab.org/show_bug.cgi?id=4168
+  // mIntroPart->setHtml(
+  //   content.arg( QFont().pointSize() + 2 ).
+  //   arg( i18nc( "@item:intext", "KDE Kontact" ) ).
+  //   arg( i18nc( "@item:intext", "Get Organized!" ) ).
+  //   arg( i18nc( "@item:intext", "The KDE Personal Information Management Suite" ) ).
+  //   arg( msg ) );
 }
 
 void MainWindow::initAboutScreen()
@@ -466,16 +467,17 @@ void MainWindow::setupActions()
   actionCollection()->addAction( QLatin1String("settings_configure_kontact"), action );
   connect( action, SIGNAL(triggered(bool)), SLOT(slotPreferences()) );
 
-  action =
-    new KAction( KIcon( QLatin1String("kontact") ),
-                 i18nc( "@action:inmenu", "&Kontact Introduction" ), this );
-  action->setHelpText(
-    i18nc( "@info:status", "Show the Kontact Introduction page" ) );
-  action->setWhatsThis(
-    i18nc( "@info:whatsthis",
-           "Choose this option to see the Kontact Introduction page." ) );
-  actionCollection()->addAction( QLatin1String("help_introduction"), action );
-  connect( action, SIGNAL(triggered(bool)), SLOT(slotShowIntroduction()) );
+  //FIXME: Disabled due to bug https://issues.kolab.org/show_bug.cgi?id=4168
+  // action =
+  //   new KAction( KIcon( QLatin1String("kontact") ),
+  //                i18nc( "@action:inmenu", "&Kontact Introduction" ), this );
+  // action->setHelpText(
+  //   i18nc( "@info:status", "Show the Kontact Introduction page" ) );
+  // action->setWhatsThis(
+  //   i18nc( "@info:whatsthis",
+  //          "Choose this option to see the Kontact Introduction page." ) );
+  // actionCollection()->addAction( QLatin1String("help_introduction"), action );
+  // connect( action, SIGNAL(triggered(bool)), SLOT(slotShowIntroduction()) );
 
   action =
     new KAction( KIcon( QLatin1String("ktip") ),