[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdab-post-4.0/kdepim
From:       Volker Krause <vkrause () kde ! org>
Date:       2007-12-13 9:08:34
Message-ID: 1197536914.396946.15519.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 747975 by vkrause:

Merged revisions 747971 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r747971 | vkrause | 2007-12-13 09:51:18 +0100 (Thu, 13 Dec 2007) | 5 lines
  
  Overwrite local flags of read-only folders if we don't allow local
  flags for them.
  
  Kolab issue 2220
........


 _M            . (directory)  
 M  +2 -2      kmail/kmfoldercachedimap.cpp  
 M  +5 -2      kmail/kmfolderimap.cpp  


** branches/work/kdab-post-4.0/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,71 \
1623,712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,7293 \
06,729611,731653,733159,733883,734242,734247,734273,735684,738629,739069,739670,743884,744689,747182,747318 \
/trunk/KDE/kdepim:1-738080  + \
/branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,711623, \
712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,729306,72 \
9611,731653,733159,733883,734242,734247,734273,735684,738629,739069,739670,743884,744689,747182,747318,747971 \
                /trunk/KDE/kdepim:1-738080
--- branches/work/kdab-post-4.0/kdepim/kmail/kmfoldercachedimap.cpp #747974:747975
@@ -1709,9 +1709,9 @@
            * server since we can't write our status back our local version
            * is what has to be considered correct.
            */
-          if ( !mReadOnly ) {
+          if ( !mReadOnly || !GlobalSettings::allowLocalFlags() ) {
             /* The message is OK, update flags */
-            KMFolderImap::flagsToStatus( existingMessage, flags,  false, \
mPermanentFlags ); +            KMFolderImap::flagsToStatus( existingMessage, flags,  \
false, mReadOnly ? INT_MAX : mPermanentFlags );  } else if ( mUserRights & \
KMail::ACLJobs::WriteSeenFlag ) {  KMFolderImap::seenFlagToStatus( existingMessage, \
flags );  }
--- branches/work/kdab-post-4.0/kdepim/kmail/kmfolderimap.cpp #747974:747975
@@ -1361,8 +1361,11 @@
         // if this is a read only folder, ignore status updates from the
         // server since we can't write our status back our local version
         // is what has to be considered correct.
-        if ( !mReadOnly ) {
-          flagsToStatus( msgBase, serverFlags, false, mUploadAllFlags ? 31 : \
mPermanentFlags ); +        if ( !mReadOnly || !GlobalSettings::allowLocalFlags() ) {
+          int supportedFlags = mUploadAllFlags ? 31 : mPermanentFlags;
+          if ( mReadOnly )
+            supportedFlags = INT_MAX;
+          flagsToStatus( msgBase, serverFlags, false, supportedFlags );
         } else {
           seenFlagToStatus( msgBase, serverFlags, false );
         }


[prev in list] [next in list] [prev in thread] [next in thread]