3 files changed, 24 insertions, 16 deletions

diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
index 6c32b40..f4f3c94 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
@@ -139,5 +139,5 @@ void ODateBookAccessBackend_SQL::initFields()
         // Create a map that maps the column name to the id
         QMapConstIterator<int, QString> it;
-        for ( it = ++m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
+        for ( it = m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
                 m_reverseFieldMap.insert( it.data(), it.key() );
         }
diff --git a/libopie2/opiepim/core/opimevent.cpp b/libopie2/opiepim/core/opimevent.cpp
index 8bf8b25..9d46651 100644
--- a/libopie2/opiepim/core/opimevent.cpp
+++ b/libopie2/opiepim/core/opimevent.cpp
@@ -556,7 +556,10 @@ QMap<int, QString> OPimEvent::toMap() const
     retMap.insert( OPimEvent::FLocation, Qtopia::escapeString( location() ) );
     retMap.insert( OPimEvent::FType, isAllDay() ? "AllDay" : "" );
-    OPimAlarm alarm = notifiers().alarms() [ 0 ];
-    retMap.insert( OPimEvent::FAlarm, QString::number( alarm.dateTime().secsTo( startDateTime() ) / 60 ) );
-    retMap.insert( OPimEvent::FSound, ( alarm.sound() == OPimAlarm::Loud ) ? "loud" : "silent" );
+    if ( notifiers().alarms().count() ){ 
+            // Currently we just support one alarm.. (eilers)
+            OPimAlarm alarm = notifiers().alarms() [ 0 ];
+            retMap.insert( OPimEvent::FAlarm, QString::number( alarm.dateTime().secsTo( startDateTime() ) / 60 ) );
+            retMap.insert( OPimEvent::FSound, ( alarm.sound() == OPimAlarm::Loud ) ? "loud" : "silent" );
+    }
 
     OPimTimeZone zone( timeZone().isEmpty() ? OPimTimeZone::current() : timeZone() );
@@ -620,15 +623,4 @@ void OPimEvent::fromMap( const QMap<int, QString>& map )
         setAllDay( false );
 
-    int alarmTime = -1;
-    if ( !map[ OPimEvent::FAlarm ].isEmpty() )
-        alarmTime = map[ OPimEvent::FAlarm ].toInt();
-
-    int sound = ( ( map[ OPimEvent::FSound ] == "loud" ) ? OPimAlarm::Loud : OPimAlarm::Silent );
-    if ( ( alarmTime != -1 ) )
-    {
-        QDateTime dt = startDateTime().addSecs( -1 * alarmTime * 60 );
-        OPimAlarm al( sound , dt );
-        notifiers().add( al );
-    }
     if ( !map[ OPimEvent::FTimeZone ].isEmpty() && ( map[ OPimEvent::FTimeZone ] != "None" ) )
     {
@@ -660,4 +652,20 @@ void OPimEvent::fromMap( const QMap<int, QString>& map )
     }
 
+    int alarmTime = -1;
+    if ( !map[ OPimEvent::FAlarm ].isEmpty() )
+        alarmTime = map[ OPimEvent::FAlarm ].toInt();
+
+    int sound = ( ( map[ OPimEvent::FSound ] == "loud" ) ? OPimAlarm::Loud : OPimAlarm::Silent );
+    if ( ( alarmTime != -1 ) )
+    {
+            QDateTime dt = startDateTime().addSecs( -1 * alarmTime * 60 );
+            OPimAlarm al( sound , dt );
+            notifiers().add( al );
+    }
+
+
+    if ( !map[ OPimEvent::FNote ].isEmpty() )
+            setNote( map[ OPimEvent::FNote ] );
+
     if ( !map[ OPimEvent::FRecParent ].isEmpty() )
         setParent( map[ OPimEvent::FRecParent ].toInt() );
diff --git a/libopie2/opiepim/core/opimevent.h b/libopie2/opiepim/core/opimevent.h
index 56fe917..5553cac 100644
--- a/libopie2/opiepim/core/opimevent.h
+++ b/libopie2/opiepim/core/opimevent.h
@@ -80,5 +80,5 @@ class OPimEvent : public OPimRecord
         FUid = Qtopia::UID_ID,
         FCategories = Qtopia::CATEGORY_ID,
-        FDescription = 0,
+        FDescription /* = 0 Why this ? (eilers) */,
         FLocation,
         FType,