← Back to branch summary

~ubuntu-branches/ubuntu/natty/arora/natty

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_05_no_javascript_fix.diff

  • Committer: Bazaar Package Importer
  • Author(s): Roderick B. Greening
  • Date: 2009-10-08 11:04:21 UTC
  • Revision ID: james.westby@ubuntu.com-20091008110421-agde640wxjcmqong
Tags: 0.10.1-0ubuntu3
* Add patches
  - kubuntu_04_webpage_destructor.diff - Fix crash when closing noaa.gov 
  - kubuntu_05_no_javascript_fix.diff - Workaround for crash when JS disabled

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_05_no_javascript_fix.diff
 
1
--- arora-0.10.1/src/webpage.cpp        2009-10-05 01:01:48.000000000 -0230
 
2
+++ arora-0.10.1/src/webpage.cpp.new    2009-10-08 11:09:11.181265660 -0230
 
3
@@ -194,6 +194,11 @@
 
4
 
 
5
 void WebPage::addExternalBinding(QWebFrame *frame)
 
6
 {
 
7
+#if QT_VERSION < 0x040600
 
8
+    QWebSettings *defaultSettings = QWebSettings::globalSettings();
 
9
+    if (!defaultSettings->testAttribute(QWebSettings::JavascriptEnabled))
 
10
+        return;
 
11
+#endif
 
12
     if (!m_javaScriptExternalObject)
 
13
         m_javaScriptExternalObject = new JavaScriptExternalObject(this);
 
14