summaryrefslogtreecommitdiff
blob: ed135a257ae66df03fe7ffc80effca5a3f8f864f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
diff -ur gtk-qt-engine.org/src/qt_qt_wrapper.cpp gtk-qt-engine/src/qt_qt_wrapper.cpp
--- gtk-qt-engine.org/src/qt_qt_wrapper.cpp	2007-08-28 21:30:38.000000000 +0100
+++ gtk-qt-engine/src/qt_qt_wrapper.cpp	2008-05-04 19:59:46.000000000 +0100
@@ -334,8 +334,10 @@
 		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("gnome-wm")
+		|| cmdLine.contains("metacity") || cmdLine.contains("xfwm4")
+		|| cmdLine.contains("nspluginviewer")  || (getenv("GTK_QT_ENGINE_DISABLE")
+		|| ((qApp) && (qApp->type() == QApplication::Tty))))
 	{
 		printf("Not initializing the Gtk-Qt theme engine\n");
 	}