[rkward-cvs] SF.net SVN: rkward:[2484] branches/release_branch_0.4.9

[tfry at users.sourceforge.net]

Revision: 2484
          http://rkward.svn.sourceforge.net/rkward/?rev=2484&view=rev
Author:   tfry
Date:     2009-05-17 20:11:14 +0000 (Sun, 17 May 2009)

Log Message:
-----------
Fix problem when opening e.g. PDFs in help browser on the KDE 3 branch as well.

Modified Paths:
--------------
    branches/release_branch_0.4.9/ChangeLog
    branches/release_branch_0.4.9/debian/changelog
    branches/release_branch_0.4.9/rkward/windows/rkhtmlwindow.cpp

Modified: branches/release_branch_0.4.9/ChangeLog
===================================================================
--- branches/release_branch_0.4.9/ChangeLog	2009-05-16 20:09:56 UTC (rev 2483)
+++ branches/release_branch_0.4.9/ChangeLog	2009-05-17 20:11:14 UTC (rev 2484)
@@ -1,3 +1,5 @@
+- Fix: Do not try to open mimetypes other than text/html directly in the help browser.
+
 --- Version 0.4.9b - May-10-2009
 - Workaround: Deactivate all filemanagement shortcuts in the File Browser. These would sometimes trigger when they should not.
 - Fix crash while inserting rows in a data.frame with string variables

Modified: branches/release_branch_0.4.9/debian/changelog
===================================================================
--- branches/release_branch_0.4.9/debian/changelog	2009-05-16 20:09:56 UTC (rev 2483)
+++ branches/release_branch_0.4.9/debian/changelog	2009-05-17 20:11:14 UTC (rev 2484)
@@ -1,3 +1,9 @@
+rkward (0.4.9b-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Mon, 11 May 2009 15:30:00 +0200
+
 rkward (0.4.9a-1) unstable; urgency=low
 
   * new upstream release

Modified: branches/release_branch_0.4.9/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- branches/release_branch_0.4.9/rkward/windows/rkhtmlwindow.cpp	2009-05-16 20:09:56 UTC (rev 2483)
+++ branches/release_branch_0.4.9/rkward/windows/rkhtmlwindow.cpp	2009-05-17 20:11:14 UTC (rev 2484)
@@ -24,6 +24,7 @@
 #include <kmessagebox.h>
 #include <krun.h>
 #include <kparts/partmanager.h>
+#include <kmimetype.h>
 
 #include <qfileinfo.h>
 #include <qwidget.h>
@@ -164,8 +165,8 @@
 	RK_TRACE (APP);
 
 	// asyncrhonously dealing with non-local files would be quite a task. We chose the simple answer instead...
-	if (!url.isLocalFile ()) {
-		if (KMessageBox::questionYesNo (this, i18n ("The url you are trying to open ('%1') is not a local file. Do you want to open the url in the default application?").arg (url.prettyURL ()), i18n ("Open in default application?")) != KMessageBox::Yes) {
+	if (!(url.isLocalFile () && KMimeType::findByURL (url)->is ("text/html"))) {
+		if (KMessageBox::questionYesNo (this, i18n ("The url you are trying to open ('%1') is not a local file or not HTML. Do you want to open the url in the default application?").arg (url.prettyURL ()), i18n ("Open in default application?")) != KMessageBox::Yes) {
 			return false;
 		}
 		KRun *runner = new KRun (url);		// according to KRun-documentation, KRun will self-destruct when done.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.