diff -Nru /tmp/wUIsw2Ruuv/gtk-qt-engine-0.8~svn-rev36/debian/changelog /tmp/rlUepmxgxE/gtk-qt-engine-0.8~svn-rev36/debian/changelog --- /tmp/wUIsw2Ruuv/gtk-qt-engine-0.8~svn-rev36/debian/changelog 2008-01-29 21:29:19.000000000 +0000 +++ /tmp/rlUepmxgxE/gtk-qt-engine-0.8~svn-rev36/debian/changelog 2008-01-29 21:29:19.000000000 +0000 @@ -1,3 +1,11 @@ +gtk-qt-engine (1:0.8~svn-rev36-2ubuntu2.1) gutsy-proposed; urgency=low + + * Stable release update, support new Flash in Konqueror + * Add kubuntu_03_xembed_fix_flashplayer.patch, turns off + gtk-qt engine for plugins + + -- Jonathan Riddell Tue, 29 Jan 2008 19:24:52 +0000 + gtk-qt-engine (1:0.8~svn-rev36-2ubuntu2) gutsy; urgency=low * Added gtk2-engines-gtk-qt back in - we need this to do the LTS-->LTS diff -Nru /tmp/wUIsw2Ruuv/gtk-qt-engine-0.8~svn-rev36/debian/patches/kubuntu_03_xembed_fix_flashplayer.patch /tmp/rlUepmxgxE/gtk-qt-engine-0.8~svn-rev36/debian/patches/kubuntu_03_xembed_fix_flashplayer.patch --- /tmp/wUIsw2Ruuv/gtk-qt-engine-0.8~svn-rev36/debian/patches/kubuntu_03_xembed_fix_flashplayer.patch 1970-01-01 00:00:00.000000000 +0000 +++ /tmp/rlUepmxgxE/gtk-qt-engine-0.8~svn-rev36/debian/patches/kubuntu_03_xembed_fix_flashplayer.patch 2008-01-29 21:29:19.000000000 +0000 @@ -0,0 +1,13 @@ +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 +--- gtk-qt-engine-0.8/src/qt_qt_wrapper.cpp 2007-08-28 22:30:38.000000000 +0200 ++++ gtk-qt-engine-0.8.new/src/qt_qt_wrapper.cpp 2008-01-29 12:25:34.000000000 +0100 +@@ -334,8 +334,7 @@ + printf("createQApp()\n"); + + char* sessionEnv = getenv("SESSION_MANAGER"); +- if (QString(sessionEnv).endsWith(QString::number(getpid())) || cmdLine.contains("gnome-wm") || cmdLine.contains("metacity") || cmdLine.contains("xfwm4") || (getenv("GTK_QT_ENGINE_DISABLE") != NULL) || +- ((qApp) && (qApp->type() == QApplication::Tty))) ++ 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)) + { + printf("Not initializing the Gtk-Qt theme engine\n"); + }