← Back to branch summary

~ubuntu-branches/ubuntu/edgy/gtk-qt-engine/edgy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu_03_xembed_fix_flashplayer.patch

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2008-01-29 23:47:59 UTC
  • Revision ID: james.westby@ubuntu.com-20080129234759-aj3kam5zdisb0kel
Tags: 0.70-0ubuntu1.2
https://launchpad.net/bugs/184149
* Stable release update, support new Flash in Konqueror
* Add kubuntu_03_xembed_fix_flashplayer.patch, turns off
  gtk-qt engine for plugins
* LP: #184149

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu_03_xembed_fix_flashplayer.patch
1
 
diff -Nur -x '*.orig' -x '*~' gtk-qt-engine-0.8/src/qt_qt_wrapper.cpp gtk-qt-engine-0.8.new/src/qt_qt_wrapper.cpp
2
 
--- gtk-qt-engine-0.8/src/qt_qt_wrapper.cpp     2007-08-28 22:30:38.000000000 +0200
3
 
+++ gtk-qt-engine-0.8.new/src/qt_qt_wrapper.cpp 2008-01-29 12:25:34.000000000 +0100
4
 
@@ -334,8 +334,7 @@
 
1
--- gtk-qt-engine-0.70/src/qt_qt_wrapper.cpp~   2006-07-05 22:38:38.000000000 +0100
 
2
+++ gtk-qt-engine-0.70/src/qt_qt_wrapper.cpp    2008-02-01 12:27:23.000000000 +0000
 
3
@@ -276,7 +276,7 @@
5
4
                printf("createQApp()\n");
6
5
        
7
6
        char* sessionEnv = getenv("SESSION_MANAGER");
8
7
-       if (QString(sessionEnv).endsWith(QString::number(getpid())) || cmdLine.contains("gnome-wm") || cmdLine.contains("metacity") || cmdLine.contains("xfwm4") || (getenv("GTK_QT_ENGINE_DISABLE") != NULL) ||
9
 
-       ((qApp) && (qApp->type() == QApplication::Tty)))
10
 
+       if (QString(sessionEnv).endsWith(QString::number(getpid())) || cmdLine.contains("nspluginviewer") || cmdLine.contains("gnome-wm") || cmdLine.contains("metacity") || cmdLine.contains("xfwm4") || (getenv("GTK_QT_ENGINE_DISABLE") != NULL))
 
8
+       if (QString(sessionEnv).endsWith(QString::number(getpid())) || cmdLine.contains("nspluginviewer") || cmdLine.contains("gnome-wm") || cmdLine.contains("metacity") || cmdLine.contains("xfwm4") || (getenv("GTK_QT_ENGINE_DISABLE") != NULL) ||
 
9
        ((qApp) && (qApp->type() == QApplication::Tty)))
11
10
        {
12
11
                printf("Not initializing the Gtk-Qt theme engine\n");
13
 
        }