rev 18620 - in trunk/packages/kde3libs/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2010-08-07 20:09:00 +0000 (Sat, 07 Aug 2010)
New Revision: 18620

Added:
   trunk/packages/kde3libs/debian/patches/68_support_khelpcenter4.diff
Modified:
   trunk/packages/kde3libs/debian/changelog
   trunk/packages/kde3libs/debian/patches/series
Log:
Support opening of KDE 4 khelpcenter in Help -> Handbook. (Closes: #525621)
Thanks to Ben Burton for the patch.

Modified: trunk/packages/kde3libs/debian/changelog
===================================================================
--- trunk/packages/kde3libs/debian/changelog	2010-08-07 20:01:15 UTC (rev 18619)
+++ trunk/packages/kde3libs/debian/changelog	2010-08-07 20:09:00 UTC (rev 18620)
@@ -11,6 +11,8 @@
   * Fix corruption of zip files caused by wrong encoding of umlauts in kzip
     (patch 67_kio_zip_file_encoding.diff). (Closes: #563942) Thanks to Bjoern
     Ricks for the patch.
+  * Support opening of KDE 4 khelpcenter in Help -> Handbook. (Closes: #525621)
+    Thanks to Ben Burton for the patch.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 07 Aug 2010 10:08:47 +0300
 

Added: trunk/packages/kde3libs/debian/patches/68_support_khelpcenter4.diff
===================================================================
--- trunk/packages/kde3libs/debian/patches/68_support_khelpcenter4.diff	                        (rev 0)
+++ trunk/packages/kde3libs/debian/patches/68_support_khelpcenter4.diff	2010-08-07 20:09:00 UTC (rev 18620)
@@ -0,0 +1,37 @@
+From: Ben Burton <bab at debian.org>
+Description: support opening of KDE 4 khelpcenter in Help -> Handbook
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525621
+Forwarded: no
+Last-Update: 2010-08-07
+
+--- a/kdecore/kapplication.cpp
++++ b/kdecore/kapplication.cpp
+@@ -2236,20 +2236,14 @@ void KApplication::invokeHelp( const QSt
+      url = QString("help:/%1/index.html").arg(appname);
+ 
+    QString error;
+-   if ( !dcopClient()->isApplicationRegistered("khelpcenter") )
+-   {
+-       if (startServiceByDesktopName("khelpcenter", url, &error, 0, 0, startup_id, false))
+-       {
+-           if (Tty != kapp->type())
+-               QMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"),
+-               i18n("Could not launch the KDE Help Center:\n\n%1").arg(error), i18n("&OK"));
+-           else
+-               kdWarning() << "Could not launch help:\n" << error << endl;
+-	   return;
+-       }
+-   }
+-   else
+-       DCOPRef( "khelpcenter", "KHelpCenterIface" ).send( "openUrl", url, startup_id );
++   // TODO this should check if cmd has a .desktop file, and use data from it, together
++   // with sending more ASN data
++   if (kdeinitExec("khelpcenter", url, &error, NULL, startup_id ))
++     if (Tty != kapp->type())
++       QMessageBox::critical(kapp->mainWidget(), i18n("Could not Launch Help Center"),
++             i18n("Could not launch the KDE Help Center:\n\n%1").arg(error), i18n("&OK"));
++     else
++       kdWarning() << "Could not launch help:\n" << error << endl;
+ }
+ #endif
+ 

Modified: trunk/packages/kde3libs/debian/patches/series
===================================================================
--- trunk/packages/kde3libs/debian/patches/series	2010-08-07 20:01:15 UTC (rev 18619)
+++ trunk/packages/kde3libs/debian/patches/series	2010-08-07 20:09:00 UTC (rev 18620)
@@ -36,6 +36,7 @@
 65_gcc4.4_ftbfs.diff
 66_gcc4.5_1074155.diff
 67_kio_zip_file_encoding.diff
+68_support_khelpcenter4.diff
 97_automake_cleanup.diff
 98_buildprep.diff
 CVE-2009-0689.diff