1 files changed, 11 insertions, 11 deletions

diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 7377965..82e127e 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -99,24 +99,24 @@ struct z_button z_buttons_c700 [] = {
     "QPE/TaskBar", "toggleStartMenu()" },
     { Qt::Key_F13, QT_TRANSLATE_NOOP("Button", "Mail Button"),
     "devicebuttons/z_mail",
     "opiemail", "raise()",
     "opiemail", "newMail()" },
 
-    { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Display Rotate"),
-    "devicebuttons/z_hinge",
+    { Qt::Key_F15, QT_TRANSLATE_NOOP("Button", "Hinge1"),
+    "devicebuttons/z_hinge1",
     "QPE/Rotation", "rotateDefault()",
-    "QPE/Dummy", "doNothing()" },
-    { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Display Rotate"),
-    "devicebuttons/z_hinge",
+    "QPE/Rotation", "rotateDefault()" },
+    { Qt::Key_F16, QT_TRANSLATE_NOOP("Button", "Hinge2"),
+    "devicebuttons/z_hinge2",
     "QPE/Rotation", "rotateDefault()",
-    "QPE/Dummy", "doNothing()" },
-    { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Display Rotate"),
-    "devicebuttons/z_hinge",
+    "QPE/Rotation", "rotateDefault()" },
+    { Qt::Key_F17, QT_TRANSLATE_NOOP("Button", "Hinge3"),
+    "devicebuttons/z_hinge3",
     "QPE/Rotation", "rotateDefault()",
-    "QPE/Dummy", "doNothing()" },
+    "QPE/Rotation", "rotateDefault()" },
 };
 
 // FIXME This gets unnecessary complicated. We should think about splitting the Zaurus
 //       class up into individual classes. We need three classes
 //
 //       Zaurus-Collie (SA-model  w/ 320x240 lcd, for SL5500 and SL5000)
@@ -485,13 +485,13 @@ bool Zaurus::setDisplayStatus( bool on )
 bool Zaurus::suspend()
 {
     qDebug("ODevice::suspend");
     if ( !isQWS( ) ) // only qwsserver is allowed to suspend
         return false;
 
-    if ( d->m_model == Model_Unknown ) // better don't suspend in qvfb / on unkown devices
+    if ( d->m_model == Model_Unknown ) // better don't suspend on unknown devices
         return false;
 
     bool res = false;
     ODevice::sendSuspendmsg();
 
     struct timeval tvs, tvn;
@@ -531,13 +531,13 @@ Transformation Zaurus::rotation() const
                 if ( hs == CASE_PORTRAIT ) rot = Rot0;
                 else if ( hs == CASE_UNKNOWN ) rot = Rot0;
                 else rot = Rot270;
             }
             else
             {
-                if ( hs == CASE_PORTRAIT ) rot = Rot270;
+                if ( hs == CASE_PORTRAIT ) rot = Rot90;
                 else if ( hs == CASE_UNKNOWN ) rot = Rot0;
                 else rot = Rot0;
             }
         }
             break;
         case Model_Zaurus_SL6000: