fixed some bugs

8 files changed, 60 insertions, 15 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 4905631..eb7cf13 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -2,2 +2,24 @@ Info about the changes in new versions of KDE-Pim/Pi
 
+********** VERSION 1.9.14 ************
+
+Fixed some problems with the dialog sizes when switching 
+portrait/landscape mode on 640x480 PDA display.
+
+Fixed some other small bugs.
+
+Fixed an ugly bug in KOpieMail: 
+KOpieMail was not able to write files (mails) to MSDOS file system, 
+like on an usual preformatted SD card. That should work now.
+To save your mail data on the Sd card do the following:
+Create a dir on the SD card:
+mkdir /mnt/card/localmail
+Go to your home dir:
+cd
+Go to kopiemail data storage dir:
+cd kdepim/apps/kopiemail
+Create a symlink to the SD card:
+ls -s /mnt/card/localmail
+Now KOpieMail will store all mails on the SD card.
+
+
 ********** VERSION 1.9.13 ************
diff --git a/kmicromail/libetpan/maildir/maildir.c b/kmicromail/libetpan/maildir/maildir.c
index 0e038b1..1ef0b7a 100644
--- a/kmicromail/libetpan/maildir/maildir.c
+++ b/kmicromail/libetpan/maildir/maildir.c
@@ -110,5 +110,7 @@ static char * maildir_get_new_message_filename(struct maildir * md,
   time_t now;
-  
+  struct stat f_stat;
   now = time(NULL);
   k = 0;
+
+  fprintf(stderr,"maildir_get_new_message_filename: %s  \n", tmpfile);
   while (k < MAX_TRY_ALLOC) {
@@ -118,4 +120,6 @@ static char * maildir_get_new_message_filename(struct maildir * md,
         md->mdir_path, basename);
-    
-    if (link(tmpfile, filename) == 0) {
+      fprintf(stderr,"filename %s  \n", filename); 
+    // LR changed following lines
+    if ( stat( filename,  &f_stat   ) == -1 ) {
+        //if (link(tmpfile, filename) == 0) {
       char * dup_filename;
@@ -124,7 +128,8 @@ static char * maildir_get_new_message_filename(struct maildir * md,
       if (dup_filename == NULL) {
-        unlink(filename);
+          //unlink(filename);
         return NULL;
       }
-      
-      unlink(tmpfile);
+      fprintf(stderr,"filename %s %s \n", tmpfile,dup_filename);
+      //unlink(tmpfile);
+      rename (tmpfile,dup_filename );
       md->mdir_counter ++;
@@ -274,2 +279,3 @@ static int add_message(struct maildir * md,
   
+  fprintf(stderr,"add_message filename: %s  \n", filename);
   msg = msg_new(filename, is_new);
@@ -448,2 +454,3 @@ int maildir_message_add_uid(struct maildir * md,
   
+  fprintf(stderr,"maildir_message_add_uid for uid: %s  \n", uid);
   r = maildir_update(md);
@@ -560,2 +567,3 @@ int maildir_message_add_file_uid(struct maildir * md, int fd,
   
+  fprintf(stderr,"maildir_message_add_file_uid: %s  \n", uid);
   if (fstat(fd, &buf) == -1)
@@ -576,2 +584,3 @@ int maildir_message_add_file(struct maildir * md, int fd)
 {
+  fprintf(stderr,"maildir_message_add_file \n");
   return maildir_message_add_file_uid(md, fd,
@@ -590,2 +599,3 @@ char * maildir_message_get(struct maildir * md, const char * uid)
   
+  fprintf(stderr,"maildir_message_get for uid: %s  \n", uid);
   key.data = (void *) uid;
@@ -622,2 +632,3 @@ int maildir_message_remove(struct maildir * md, const char * uid)
 
+  fprintf(stderr,"maildir_message_remove for uid: %s  \n", uid);
   key.data = (void *) uid;
@@ -664,3 +675,3 @@ int maildir_message_change_flags(struct maildir * md,
   int res;
-
+  fprintf(stderr,"maildir_message_change_flags for uid: %s  \n", uid);
   key.data = (void *) uid;
diff --git a/kmicromail/libetpan/mh/mailmh.c b/kmicromail/libetpan/mh/mailmh.c
index 119f217..5e2b4cc 100644
--- a/kmicromail/libetpan/mh/mailmh.c
+++ b/kmicromail/libetpan/mh/mailmh.c
@@ -609,2 +609,3 @@ static int mailmh_folder_alloc_msg(struct mailmh_folder * folder,
   size_t len;
+  struct stat f_stat;
 
@@ -617,2 +618,3 @@ static int mailmh_folder_alloc_msg(struct mailmh_folder * folder,
 
+  //fprintf(stderr,"mailmh_folder_alloc_msg filename: %s  \n", filename);
   k = 0;
@@ -621,8 +623,10 @@ static int mailmh_folder_alloc_msg(struct mailmh_folder * folder,
              MAIL_DIR_SEPARATOR, (unsigned long) (max + k));
-
-    if (link(filename, new_filename) == 0) {
+    //fprintf(stderr,"mailmh_folder_alloc_msg new_filename: %s  \n", new_filename);
+    if ( stat( new_filename,  &f_stat   ) == -1 ) {
+     // if (link(filename, new_filename) == 0) {
       int r;
-
+      //fprintf(stderr,"filename found  \n");
+      //unlink(filename);
+      rename (filename,new_filename );
       free(new_filename);
-      unlink(filename);
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 2321087..3908dbb 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2449,2 +2449,4 @@ void CalendarView::showEventEditor()
 #else
+    if ( mEventEditor->width() != QApplication::desktop()->width() )
+        mEventEditor->hide();
     mEventEditor->showMaximized();
@@ -2457,2 +2459,4 @@ void CalendarView::showTodoEditor()
 #else
+    if ( mTodoEditor->width() != QApplication::desktop()->width() )
+        mTodoEditor->hide();
     mTodoEditor->showMaximized();
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index a12acd1..9cafc60 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -376,2 +376,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mTodoListView->setColumnWidthMode(5, QListView::Manual);
+  mTodoListView->setColumnWidthMode(6, QListView::Manual);
   mTodoListView->setColumnAlignment( 2, AlignCenter );
diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 85647b1..ae0b334 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -44,3 +44,3 @@ QString KOTodoViewItem::key(int column,bool) const
   if (it == mKeyMap.end()) {
-    return text(column);
+      return text(column).lower();
   } else {
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index 24b8349..c2ee2c9 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -256,4 +256,7 @@ class SharpParser : public QObject
                 todo->setCompleted( true );
-            else
-                todo->setCompleted( false );
+            else {
+                // do not change percent complete
+                if ( todo->isCompleted() )
+                    todo->setCompleted( false );
+            }
             mCalendar->addTodo( todo );
diff --git a/version b/version
index c4fe6e2..0343cbb 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "1.9.13";
+version = "1.9.14";