summaryrefslogtreecommitdiff
authorsimon <simon>2003-03-26 09:38:07 (UTC)
committer simon <simon>2003-03-26 09:38:07 (UTC)
commitb7a2238dad7f8f44c3354168d8e2685705616c78 (patch) (unidiff)
tree709e51929ffb25afbe498deb2e9ee1e3d4ccbe44
parent174bf901c2a59bbf1980ea3e770bfb33c50f1c08 (diff)
downloadopie-b7a2238dad7f8f44c3354168d8e2685705616c78.zip
opie-b7a2238dad7f8f44c3354168d8e2685705616c78.tar.gz
opie-b7a2238dad7f8f44c3354168d8e2685705616c78.tar.bz2
- in the systemMessage handler for setCurrentRotation, call
setCurrentRotation only if we're the display server
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 7463074..f5bf0c5 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1054,35 +1054,37 @@ void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data
1054 1054
1055 man-> setActive( !man-> isActive() ); 1055 man-> setActive( !man-> isActive() );
1056 1056
1057 if ( !oldactive && !man-> isActive ( )) { // no menubar to toggle -> try O-Menu 1057 if ( !oldactive && !man-> isActive ( )) { // no menubar to toggle -> try O-Menu
1058 QCopEnvelope e ( "QPE/TaskBar", "toggleStartMenu()" ); 1058 QCopEnvelope e ( "QPE/TaskBar", "toggleStartMenu()" );
1059 } 1059 }
1060 } 1060 }
1061 } 1061 }
1062 else if ( msg == "setDefaultRotation(int)" ) { 1062 else if ( msg == "setDefaultRotation(int)" ) {
1063 if ( type() == GuiServer ) { 1063 if ( type() == GuiServer ) {
1064 int r; 1064 int r;
1065 stream >> r; 1065 stream >> r;
1066 setDefaultRotation( r ); 1066 setDefaultRotation( r );
1067 } 1067 }
1068 } 1068 }
1069 else if ( msg == "setCurrentRotation(int)" ) { 1069 else if ( msg == "setCurrentRotation(int)" ) {
1070 int r; 1070 if ( type() == GuiServer ) {
1071 stream >> r; 1071 int r;
1072 setCurrentRotation( r ); 1072 stream >> r;
1073 setCurrentRotation( r );
1074 }
1073 } 1075 }
1074 else if ( msg == "shutdown()" ) { 1076 else if ( msg == "shutdown()" ) {
1075 if ( type() == GuiServer ) 1077 if ( type() == GuiServer )
1076 shutdown(); 1078 shutdown();
1077 } 1079 }
1078 else if ( msg == "quit()" ) { 1080 else if ( msg == "quit()" ) {
1079 if ( type() != GuiServer ) 1081 if ( type() != GuiServer )
1080 tryQuit(); 1082 tryQuit();
1081 } 1083 }
1082 else if ( msg == "forceQuit()" ) { 1084 else if ( msg == "forceQuit()" ) {
1083 if ( type() != GuiServer ) 1085 if ( type() != GuiServer )
1084 quit(); 1086 quit();
1085 } 1087 }
1086 else if ( msg == "restart()" ) { 1088 else if ( msg == "restart()" ) {
1087 if ( type() == GuiServer ) 1089 if ( type() == GuiServer )
1088 restart(); 1090 restart();