Backing out unintentional merge from TT branch.

1 files changed, 5 insertions, 4 deletions

diff --git a/library/qpedecoration_qws.cpp b/library/qpedecoration_qws.cpp
index b6085ef..e041945 100644
--- a/library/qpedecoration_qws.cpp
+++ b/library/qpedecoration_qws.cpp
@@ -14,12 +14,13 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+#define QTOPIA_INTERNAL_LANGLIST
 #include <qapplication.h>
 #include <qstyle.h>
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
@@ -241,16 +242,16 @@ QPEDecoration::QPEDecoration()
     : QWSDefaultDecoration()
 {
     imageOk = Resource::loadImage( "OKButton" );
     imageClose = Resource::loadImage( "CloseButton" );
     imageHelp = Resource::loadImage( "HelpButton" );
     helpFile = QString(qApp->argv()[0]) + ".html";
-    QString lang = getenv( "LANG" );
-    helpExists = QFile::exists( QPEApplication::qpeDir() + "/help/" + lang + "/html/" + helpFile );
-    if ( !helpExists )
-	helpExists = QFile::exists( QPEApplication::qpeDir() + "/help/en/html/" + helpFile );
+    QStringList path = Global::helpPath();
+    helpExists = FALSE;
+    for (QStringList::ConstIterator it=path.begin(); it!=path.end() && !helpExists; ++it)
+	helpExists = QFile::exists( *it + "/" + helpFile );
 #ifndef MINIMIZE_HELP_HACK
     qpeManager = new QPEManager( this );
 #else
     qpeManager = 0;
 #endif
 }