Merged branches from BRANCH_1_0

1 files changed, 33 insertions, 19 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 619b4cb..4e08a1f 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -145,281 +145,289 @@ public:
 
 		qcopq.clear();
 	}
 	static void show_mx(QWidget* mw, bool nomaximize)
 	{
 
             // ugly hack, remove that later after finding a sane solution
             // Addendum: Only Sharp currently has models with high resolution but (physically) small displays,
             // so this is only useful if QT_QWS_SIMPAD is NOT defined. E.g. SIMpad has 800x600 but has
             // a (physically) large enough display to use the small icons
 #ifndef QT_QWS_SIMPAD
             if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) )  {
                 ( (  QMainWindow* ) mw )->setUsesBigPixmaps( true );
             }
 #endif
 
 		if ( mw->layout() && mw->inherits("QDialog") ) {
 			QPEApplication::showDialog((QDialog*)mw, nomaximize);
 		}
 		else {
 #ifdef Q_WS_QWS
 			if ( !nomaximize )
 				mw->showMaximized();
 			else
 #endif
 
 				mw->show();
 		}
 	}
 	static bool setWidgetCaptionFromAppName( QWidget* /*mw*/, const QString& /*appName*/, const QString& /*appsPath*/ )
 	{
 		/*
 		// This works but disable it for now until it is safe to apply
 		// What is does is scan the .desktop files of all the apps for
 		// the applnk that has the corresponding argv[0] as this program
 		// then it uses the name stored in the .desktop file as the caption
 		// for the main widget. This saves duplicating translations for
 		// the app name in the program and in the .desktop files.
 
 		AppLnkSet apps( appsPath );
 
 		QList<AppLnk> appsList = apps.children();
 		for ( QListIterator<AppLnk> it(appsList); it.current(); ++it ) {
 		  if ( (*it)->exec() == appName ) {
 		mw->setCaption( (*it)->name() );
 		return TRUE;
 		  }
 		}
 		*/
 		return FALSE;
 	}
 
 
 	void show(QWidget* mw, bool nomax)
 	{
 		setWidgetCaptionFromAppName( mw, appName, QPEApplication::qpeDir() + "apps" );
 		nomaximize = nomax;
 		qpe_main_widget = mw;
 #ifndef QT_NO_COP
 
 		sendQCopQ();
 #endif
 
 		if ( preloaded ) {
 			if (forceshow)
 				show_mx(mw, nomax);
 		}
 		else if ( keep_running ) {
 			show_mx(mw, nomax);
 		}
 	}
 
 	void loadTextCodecs()
 	{
 		QString path = QPEApplication::qpeDir() + "/plugins/textcodecs";
 		QDir dir( path, "lib*.so" );
 		QStringList list;
 		if ( dir. exists ( ))
 		    list = dir.entryList();
 		QStringList::Iterator it;
 		for ( it = list.begin(); it != list.end(); ++it ) {
 			TextCodecInterface *iface = 0;
 			QLibrary *lib = new QLibrary( path + "/" + *it );
 			if ( lib->queryInterface( IID_QtopiaTextCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
 				QValueList<int> mibs = iface->mibEnums();
 				for (QValueList<int>::ConstIterator i = mibs.begin(); i != mibs.end(); ++i) {
 					(void)iface->createForMib(*i);
 					// ### it exists now; need to remember if we can delete it
 				}
 			}
 			else {
 				lib->unload();
 				delete lib;
 			}
 		}
 	}
 
 	void loadImageCodecs()
 	{
 		QString path = QPEApplication::qpeDir() + "/plugins/imagecodecs";
 		QDir dir( path, "lib*.so" );
 		QStringList list;
 		if ( dir. exists ( ))
 		    list = dir.entryList();
 		QStringList::Iterator it;
 		for ( it = list.begin(); it != list.end(); ++it ) {
 			ImageCodecInterface *iface = 0;
 			QLibrary *lib = new QLibrary( path + "/" + *it );
 			if ( lib->queryInterface( IID_QtopiaImageCodec, (QUnknownInterface**)&iface ) == QS_OK && iface ) {
 				QStringList formats = iface->keys();
 				for (QStringList::ConstIterator i = formats.begin(); i != formats.end(); ++i) {
 					(void)iface->installIOHandler(*i);
 					// ### it exists now; need to remember if we can delete it
 				}
 			}
 			else {
 				lib->unload();
 				delete lib;
 			}
 		}
 	}
 	QString styleName;
 	QString decorationName;
 };
 
 class ResourceMimeFactory : public QMimeSourceFactory
 {
 public:
-	ResourceMimeFactory()
+        ResourceMimeFactory() : resImage( 0 )
 	{
 		setFilePath( Global::helpPath() );
 		setExtensionType( "html", "text/html;charset=UTF-8" );
 	}
+        ~ResourceMimeFactory() {
+            delete resImage;
+        }
 
 	const QMimeSource* data( const QString& abs_name ) const
 	{
 		const QMimeSource * r = QMimeSourceFactory::data( abs_name );
 		if ( !r ) {
 			int sl = abs_name.length();
 			do {
 				sl = abs_name.findRev( '/', sl - 1 );
 				QString name = sl >= 0 ? abs_name.mid( sl + 1 ) : abs_name;
 				int dot = name.findRev( '.' );
 				if ( dot >= 0 )
 					name = name.left( dot );
 				QImage img = Resource::loadImage( name );
-				if ( !img.isNull() )
-					r = new QImageDrag( img );
+				if ( !img.isNull() ) {
+                                    delete resImage;
+                                    resImage = new QImageDrag( img );
+                                    r = resImage;
+                                }
 			}
 			while ( !r && sl > 0 );
 		}
 		return r;
 	}
+private:
+    mutable QImageDrag *resImage;
 };
 
 static int muted = 0;
 static int micMuted = 0;
 
 static void setVolume( int t = 0, int percent = -1 )
 {
 	switch ( t ) {
 		case 0: {
 				Config cfg( "qpe" );
 				cfg.setGroup( "Volume" );
 				if ( percent < 0 )
 					percent = cfg.readNumEntry( "VolumePercent", 50 );
 				int fd = 0;
 				if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
 					int vol = muted ? 0 : percent;
 					// set both channels to same volume
 					vol |= vol << 8;
 					ioctl( fd, MIXER_WRITE( 0 ), &vol );
 					::close( fd );
 				}
 			}
 			break;
 	}
 }
 
 static void setMic( int t = 0, int percent = -1 )
 {
 	switch ( t ) {
 		case 0: {
 				Config cfg( "qpe" );
 				cfg.setGroup( "Volume" );
 				if ( percent < 0 )
 					percent = cfg.readNumEntry( "Mic", 50 );
 
 				int fd = 0;
 				int mic = micMuted ? 0 : percent;
 				if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
 					ioctl( fd, MIXER_WRITE( SOUND_MIXER_MIC ), &mic );
 					::close( fd );
 				}
 			}
 			break;
 	}
 }
 
 
 static void setBass( int t = 0, int percent = -1 )
 {
 	switch ( t ) {
 		case 0: {
 				Config cfg( "qpe" );
 				cfg.setGroup( "Volume" );
 				if ( percent < 0 )
 					percent = cfg.readNumEntry( "BassPercent", 50 );
 
 				int fd = 0;
 				int bass = percent;
                                 if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
 					ioctl( fd, MIXER_WRITE( SOUND_MIXER_BASS ), &bass );
 					::close( fd );
 				}
 			}
 			break;
 	}
 }
 
 
 static void setTreble( int t = 0, int percent = -1 )
 {
 	switch ( t ) {
 		case 0: {
 				Config cfg( "qpe" );
 				cfg.setGroup( "Volume" );
 				if ( percent < 0 )
 					percent = cfg.readNumEntry( "TreblePercent", 50 );
 
 				int fd = 0;
 				int treble = percent;
 				if ( ( fd = open( "/dev/mixer", O_RDWR ) ) >= 0 ) {
 					ioctl( fd, MIXER_WRITE( SOUND_MIXER_TREBLE ), &treble );
 					::close( fd );
 				}
 			}
 			break;
 	}
 }
 
 
 /*!
   \class QPEApplication qpeapplication.h
   \brief The QPEApplication class implements various system services
     that are available to all Qtopia applications.
 
   Simply by using QPEApplication instead of QApplication, a standard Qt
   application becomes a Qtopia application. It automatically follows
   style changes, quits and raises, and in the
   case of \link docwidget.html document-oriented\endlink applications,
   changes the currently displayed document in response to the environment.
 
   To create a \link docwidget.html document-oriented\endlink
   application use showMainDocumentWidget(); to create a
   non-document-oriented application use showMainWidget(). The
   keepRunning() function indicates whether the application will
   continue running after it's processed the last \link qcop.html
   QCop\endlink message. This can be changed using setKeepRunning().
 
   A variety of signals are emitted when certain events occur, for
   example, timeChanged(), clockChanged(), weekChanged(),
   dateFormatChanged() and volumeChanged(). If the application receives
   a \link qcop.html QCop\endlink message on the application's
   QPE/Application/\e{appname} channel, the appMessage() signal is
   emitted. There are also flush() and reload() signals, which
   are emitted when synching begins and ends respectively - upon these
   signals, the application should save and reload any data
   files that are involved in synching. Most of these signals will initially
   be received and unfiltered through the appMessage() signal.
 
   This class also provides a set of useful static functions. The
   qpeDir() and documentDir() functions return the respective paths.
   The grabKeyboard() and ungrabKeyboard() functions are used to
   control whether the application takes control of the device's
   physical buttons (e.g. application launch keys). The stylus' mode of
   operation is set with setStylusOperation() and retrieved with
   stylusOperation(). There are also setInputMethodHint() and
   inputMethodHint() functions.
 
   \ingroup qtopiaemb
@@ -858,286 +866,286 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e )
 		}
 		if ( fe->simpleData.get_focus && inputMethodDict ) {
 			InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) );
 			if ( m == AlwaysOff )
 				Global::hideInputMethod();
 			if ( m == AlwaysOn )
 				Global::showInputMethod();
 		}
 	}
 
 
 	return QApplication::qwsEventFilter( e );
 }
 #endif
 
 /*!
   Destroys the QPEApplication.
 */
 QPEApplication::~QPEApplication()
 {
 	ungrabKeyboard();
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 	// Need to delete QCopChannels early, since the display will
 	// be gone by the time we get to ~QObject().
 	delete sysChannel;
 	delete pidChannel;
 #endif
 
 	delete d;
 }
 
 /*!
   Returns <tt>$OPIEDIR/</tt>.
 */
 QString QPEApplication::qpeDir()
 {
 	const char * base = getenv( "OPIEDIR" );
 	if ( base )
 		return QString( base ) + "/";
 
 	return QString( "../" );
 }
 
 /*!
   Returns the user's current Document directory. There is a trailing "/".
   .. well, it does now,, and there's no trailing '/'
 */
 QString QPEApplication::documentDir()
 {
 	const char* base = getenv( "HOME");
 	if ( base )
 		return QString( base ) + "/Documents";
 
 	return QString( "../Documents" );
 }
 
 static int deforient = -1;
 
 /*!
   \internal
 */
 int QPEApplication::defaultRotation()
 {
 	if ( deforient < 0 ) {
 		QString d = getenv( "QWS_DISPLAY" );
 		if ( d.contains( "Rot90" ) ) {
 			deforient = 90;
 		}
 		else if ( d.contains( "Rot180" ) ) {
 			deforient = 180;
 		}
 		else if ( d.contains( "Rot270" ) ) {
 			deforient = 270;
 		}
 		else {
 			deforient = 0;
 		}
 	}
 	return deforient;
 }
 
 /*!
   \internal
 */
 void QPEApplication::setDefaultRotation( int r )
 {
 	if ( qApp->type() == GuiServer ) {
 		deforient = r;
 		setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
 		Config config("qpe");
 		config.setGroup( "Rotation" );
 		config.writeEntry( "Rot", r );
 	}
 	else {
 #ifndef QT_NO_COP
 		{ QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" );
 			e << r;
 		}
 #endif
 
 	}
 }
 
 
 /*!
   \internal
 */
 void QPEApplication::applyStyle()
 {
 	Config config( "qpe" );
 	config.setGroup( "Appearance" );
 
     #if QT_VERSION > 233
 	// don't block ourselves ...
 	Opie::force_appearance = 0;
 
 	static QString appname = Opie::binaryName ( );
 
 	QStringList ex = config. readListEntry ( "NoStyle", ';' );
 	int nostyle = 0;
 	for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) {
 		if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) {
 			nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 );
 			break;
 		}
 	}
 
 	// Widget style
-	QString style = config.readEntry( "Style", "Light" );
+	QString style = config.readEntry( "Style", "FlatStyle" );
 
 	// don't set a custom style
 	if ( nostyle & Opie::Force_Style )
-		style = "Light";
+		style = "FlatStyle";
 
 	internalSetStyle ( style );
 
-	// Colors
-	QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) );
-	QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) );
+	// Colors - from /etc/colors/Liquid.scheme
+	QColor bgcolor( config.readEntry( "Background", "#E0E0E0" ) );
+	QColor btncolor( config.readEntry( "Button", "#96c8fa" ) );
 	QPalette pal( btncolor, bgcolor );
-	QString color = config.readEntry( "Highlight", "#800000" );
+	QString color = config.readEntry( "Highlight", "#73adef" );
 	pal.setColor( QColorGroup::Highlight, QColor( color ) );
 	color = config.readEntry( "HighlightedText", "#FFFFFF" );
 	pal.setColor( QColorGroup::HighlightedText, QColor( color ) );
 	color = config.readEntry( "Text", "#000000" );
 	pal.setColor( QColorGroup::Text, QColor( color ) );
 	color = config.readEntry( "ButtonText", "#000000" );
 	pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) );
 	color = config.readEntry( "Base", "#FFFFFF" );
 	pal.setColor( QColorGroup::Base, QColor( color ) );
 
 	pal.setColor( QPalette::Disabled, QColorGroup::Text,
 	              pal.color( QPalette::Active, QColorGroup::Background ).dark() );
 
 	setPalette( pal, TRUE );
 
 	// Window Decoration
-	QString dec = config.readEntry( "Decoration", "Qtopia" );
+	QString dec = config.readEntry( "Decoration", "Flat" );
 
 	// don't set a custom deco
 	if ( nostyle & Opie::Force_Decoration )
 		dec = "";
 
 	//qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle);
 
 	if ( dec != d->decorationName ) {
 		qwsSetDecoration( new QPEDecoration( dec ) );
 		d->decorationName = dec;
 	}
 
 	// Font
 	QString ff = config.readEntry( "FontFamily", font().family() );
 	int fs = config.readNumEntry( "FontSize", font().pointSize() );
 
 	// don't set a custom font
 	if ( nostyle & Opie::Force_Font ) {
 		ff = "Vera";
 		fs = 10;
 	}
 
 	setFont ( QFont ( ff, fs ), true );
 
 	// revert to global blocking policy ...
 	Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None;
 	Opie::force_appearance &= ~nostyle;
     #endif
 }
 
 void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data )
 {
 #ifdef Q_WS_QWS
 	QDataStream stream( data, IO_ReadOnly );
 	if ( msg == "applyStyle()" ) {
 		applyStyle();
 	}
 	else if ( msg == "toggleApplicationMenu()" ) {
 		QWidget *active = activeWindow ( );
 
 		if ( active ) {
 			QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( );
 			bool oldactive = man-> isActive ( );
 
 			man-> setActive( !man-> isActive() );
 
 			if ( !oldactive && !man-> isActive ( )) { // no menubar to toggle -> try O-Menu
 				QCopEnvelope e ( "QPE/TaskBar", "toggleStartMenu()" );
 			}
 		}
 	}
 	else if ( msg == "setDefaultRotation(int)" ) {
 		if ( type() == GuiServer ) {
 			int r;
 			stream >> r;
 			setDefaultRotation( r );
 		}
 	}
 	else if ( msg == "setCurrentRotation(int)" ) {
 		int r;
 		stream >> r;
 		setCurrentRotation( r );
  	}
 	else if ( msg == "shutdown()" ) {
 		if ( type() == GuiServer )
 			shutdown();
 	}
 	else if ( msg == "quit()" ) {
 		if ( type() != GuiServer )
 			tryQuit();
 	}
 	else if ( msg == "forceQuit()" ) {
 		if ( type() != GuiServer )
 			quit();
 	}
 	else if ( msg == "restart()" ) {
 		if ( type() == GuiServer )
 			restart();
 	}
 	else if ( msg == "language(QString)" ) {
 		if ( type() == GuiServer ) {
 			QString l;
 			stream >> l;
 			QString cl = getenv( "LANG" );
 			if ( cl != l ) {
 				if ( l.isNull() )
 					unsetenv( "LANG" );
 				else
 					setenv( "LANG", l.latin1(), 1 );
 				restart();
 			}
 		}
 	}
 	else if ( msg == "timeChange(QString)" ) {
 		QString t;
 		stream >> t;
 		if ( t.isNull() )
 			unsetenv( "TZ" );
 		else
 			setenv( "TZ", t.latin1(), 1 );
 		// emit the signal so everyone else knows...
 		emit timeChanged();
 	}
 	else if ( msg == "execute(QString)" ) {
 		if ( type() == GuiServer ) {
 			QString t;
 			stream >> t;
 			Global::execute( t );
 		}
 	}
 	else if ( msg == "execute(QString,QString)" ) {
 		if ( type() == GuiServer ) {
 			QString t, d;
 			stream >> t >> d;
 			Global::execute( t, d );
 		}
 	}
 	else if ( msg == "addAlarm(QDateTime,QCString,QCString,int)" ) {
 		if ( type() == GuiServer ) {
 			QDateTime when;
 			QCString channel, message;
 			int data;
 			stream >> when >> channel >> message >> data;
 			AlarmServer::addAlarm( when, channel, message, data );
 		}
 	}
 	else if ( msg == "deleteAlarm(QDateTime,QCString,QCString,int)" ) {
 		if ( type() == GuiServer ) {
@@ -1173,268 +1181,274 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data
 		stream >> muted;
 		setVolume();
 		emit volumeChanged( muted );
 	}
 	else if ( msg == "setMic(int,int)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
 		int t, v;
 		stream >> t >> v;
 		setMic( t, v );
 		emit micChanged( micMuted );
 	}
 	else if ( msg == "micChange(bool)" ) { // Added: 2002-02-08 by Jeremy Cowgar <jc@cowgar.com>
 		stream >> micMuted;
 		setMic();
 		emit micChanged( micMuted );
 	}
 	else if ( msg == "setBass(int,int)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
 		int t, v;
 		stream >> t >> v;
 		setBass( t, v );
 	}
 	else if ( msg == "bassChange(bool)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
 	        setBass();
 	}
     	else if ( msg == "setTreble(int,int)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
 		int t, v;
 		stream >> t >> v;
 		setTreble( t, v );
 	}
 	else if ( msg == "trebleChange(bool)" ) { // Added: 2002-12-13 by Maximilian Reiss <harlekin@handhelds.org>
 	        setTreble();
 	}
 
 
 
 #endif
 }
 
 /*!
   \internal
 */
 bool QPEApplication::raiseAppropriateWindow()
 {
 	bool r = FALSE;
 	// ########## raise()ing main window should raise and set active
 	// ########## it and then all childen. This belongs in Qt/Embedded
 	QWidget *top = d->qpe_main_widget;
 	if ( !top )
 		top = mainWidget();
 	if ( top && d->keep_running ) {
 		if ( top->isVisible() )
 			r = TRUE;
 		else if (d->preloaded) {
 			// We are preloaded and not visible.. pretend we just started..
 			QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
 			e << d->appName;
 		}
 
 		d->show_mx(top, d->nomaximize);
 		top->raise();
 		top->setActiveWindow();
 	}
 	QWidget *topm = activeModalWidget();
 	if ( topm && topm != top ) {
 		topm->show();
 		topm->raise();
 		topm->setActiveWindow();
 		// If we haven't already handled the fastAppShowing message
 		if (!top && d->preloaded) {
 			QCopEnvelope e("QPE/System", "fastAppShowing(QString)");
 			e << d->appName;
 		}
 		r = FALSE;
 	}
 	return r;
 }
 
 void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
 {
 #ifdef Q_WS_QWS
 
 	if ( msg == "quit()" ) {
 		tryQuit();
 	}
 	else if ( msg == "quitIfInvisible()" ) {
 		if ( d->qpe_main_widget && !d->qpe_main_widget->isVisible() )
 			quit();
 	}
 	else if ( msg == "close()" ) {
 		hideOrQuit();
 	}
 	else if ( msg == "disablePreload()" ) {
 		d->preloaded = FALSE;
 		d->keep_running = TRUE;
 		/* so that quit will quit */
 	}
 	else if ( msg == "enablePreload()" ) {
 		if (d->qpe_main_widget)
 			d->preloaded = TRUE;
 		d->keep_running = TRUE;
 		/* so next quit won't quit */
 	}
 	else if ( msg == "raise()" ) {
 		d->keep_running = TRUE;
 		d->notbusysent = FALSE;
 		raiseAppropriateWindow();
 		// Tell the system we're still chugging along...
 		QCopEnvelope e("QPE/System", "appRaised(QString)");
 		e << d->appName;
 	}
 	else if ( msg == "flush()" ) {
 		emit flush();
 		// we need to tell the desktop
 		QCopEnvelope e( "QPE/Desktop", "flushDone(QString)" );
 		e << d->appName;
 	}
 	else if ( msg == "reload()" ) {
 		emit reload();
 	}
 	else if ( msg == "setDocument(QString)" ) {
 		d->keep_running = TRUE;
 		QDataStream stream( data, IO_ReadOnly );
 		QString doc;
 		stream >> doc;
 		QWidget *mw = mainWidget();
 		if ( !mw )
 			mw = d->qpe_main_widget;
 		if ( mw )
 			Global::setDocument( mw, doc );
-	}
-	else if ( msg == "nextView()" ) {
-		qDebug("got nextView()");
-		/*
-		  if ( raiseAppropriateWindow() )
-		*/
+	} else {
+            bool p = d->keep_running;
+            d->keep_running = FALSE;
 		emit appMessage( msg, data);
+            if ( d->keep_running ) {
+                d->notbusysent = FALSE;
+                raiseAppropriateWindow();
+                if ( !p ) {
+                    // Tell the system we're still chugging along...
+#ifndef QT_NO_COP
+                    QCopEnvelope e("QPE/System", "appRaised(QString)");
+                    e << d->appName;
+#endif
 	}
-	else {
-		emit appMessage( msg, data);
 	}
-
+            if ( p )
+                d->keep_running = p;
+	}
 #endif
 }
 
 
 /*!
   Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
 
   \sa showMainDocumentWidget()
 */
 void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 {
             d->show(mw, nomaximize );
 }
 
 /*!
   Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
 
   This calls designates the application as
   a \link docwidget.html document-oriented\endlink application.
 
   The \a mw widget \e must have this slot: setDocument(const QString&).
 
   \sa showMainWidget()
 */
 void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 {
 	if ( mw && argc() == 2 )
 		Global::setDocument( mw, QString::fromUtf8(argv()[1]) );
 
 
 	d->show(mw, nomaximize );
 }
 
 
 /*!
   If an application is started via a \link qcop.html QCop\endlink
   message, the application will process the \link qcop.html
   QCop\endlink message and then quit. If the application calls this
   function while processing a \link qcop.html QCop\endlink message,
   after processing its outstanding \link qcop.html QCop\endlink
   messages the application will start 'properly' and show itself.
 
   \sa keepRunning()
 */
 void QPEApplication::setKeepRunning()
 {
 	if ( qApp && qApp->inherits( "QPEApplication" ) ) {
 		QPEApplication * qpeApp = ( QPEApplication* ) qApp;
 		qpeApp->d->keep_running = TRUE;
 	}
 }
 
 /*!
   Returns TRUE if the application will quit after processing the
   current list of qcop messages; otherwise returns FALSE.
 
   \sa setKeepRunning()
 */
 bool QPEApplication::keepRunning() const
 {
 	return d->keep_running;
 }
 
 /*!
   \internal
 */
 void QPEApplication::internalSetStyle( const QString &style )
 {
 #if QT_VERSION >= 300
 	if ( style == "QPE" ) {
 		setStyle( new QPEStyle );
 	}
 	else {
 		QStyle *s = QStyleFactory::create( style );
 		if ( s )
 			setStyle( s );
 	}
 #else
 	if ( style == "Windows" ) {
 		setStyle( new QWindowsStyle );
 	}
 	else if ( style == "QPE" ) {
 		setStyle( new QPEStyle );
 	}
 	else if ( style == "Light" ) {
 		setStyle( new LightStyle );
 	}
 #ifndef QT_NO_STYLE_PLATINUM
 	else if ( style == "Platinum" ) {
 		setStyle( new QPlatinumStyle );
 	}
 #endif
 #ifndef QT_NO_STYLE_MOTIF
 	else if ( style == "Motif" ) {
 		setStyle( new QMotifStyle );
 	}
 #endif
 #ifndef QT_NO_STYLE_MOTIFPLUS
 	else if ( style == "MotifPlus" ) {
 		setStyle( new QMotifPlusStyle );
 	}
 #endif
 
 	else {
 		QStyle *sty = 0;
 		QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/";
 
 		if ( style. find ( ".so" ) > 0 )
 			path += style;
 		else
 			path = path + "lib" + style. lower ( ) + ".so"; // compatibility
 
 		static QLibrary *lastlib = 0;
 		static StyleInterface *lastiface = 0;
 
 		QLibrary *lib = new QLibrary ( path );
 		StyleInterface *iface = 0;
 
 		if (( lib-> queryInterface ( IID_Style, ( QUnknownInterface ** ) &iface ) == QS_OK ) && iface )
 			sty = iface-> style ( );
 
 		if ( sty ) {
 			setStyle ( sty );
 
 			if ( lastiface )
 				lastiface-> release ( );