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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/kresources/groupwise/soap
From:       Will Stephenson <wstephenson () kde ! org>
Date:       2007-05-10 14:39:26
Message-ID: 1178807966.919564.2851.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 663225 by wstephens:

Don't crash when the server misbehaves wrt its own spec, again.

 M  +25 -22    gwjobs.cpp  


--- branches/KDE/3.5/kdepim/kresources/groupwise/soap/gwjobs.cpp #663224:663225
@@ -394,29 +394,32 @@
               totalItems += count;
             }
             kdDebug() << "Folder " <<  (*(*it)->id).c_str() << ", containing " << \
                count << " items." << endl;
-            if ( *(fld->folderType) == Calendar ) {
-              kdDebug() << "Reading folder " <<  (*(*it)->id).c_str() << ", of type \
                Calendar, physically containing " << count << " items." << endl;
-              readCalendarFolder( *(*it)->id, itemCounts );
-              haveReadFolder = true;
-              *mCalendarFolder = *((*it)->id);
+            if ( fld->folderType )
+            {
+              if ( *(fld->folderType) == Calendar ) {
+                kdDebug() << "Reading folder " <<  (*(*it)->id).c_str() << ", of \
type Calendar, physically containing " << count << " items." << endl; +               \
readCalendarFolder( *(*it)->id, itemCounts ); +                haveReadFolder = true;
+                *mCalendarFolder = *((*it)->id);
+              }
+              else if ( *(fld->folderType) == Checklist ) {
+                kdDebug() << "Reading folder " <<  (*(*it)->id).c_str() << ", of \
type Checklist, physically containing " << count << " items." << endl; +              \
readCalendarFolder( *(*it)->id, itemCounts ); +                haveReadFolder = true;
+                *mChecklistFolder = *((*it)->id);
+              }
+  /*            else if ( fld->folderType == SentItems ) {
+                kdDebug() << "Reading folder " <<  (*(*it)->id).c_str() << ", of \
type SentItems, physically containing " << count << " items." << endl; +              \
readCalendarFolder( *(*it)->id, itemCounts ); +                haveReadFolder = true;
+                *mChecklistFolder = *((*it)->id);
+              }*/
+  /*            else if ( fld->folderType == Mailbox ) {
+                kdDebug() << "Reading folder " <<  (*(*it)->id).c_str() << ", of \
type Mailbox (not yet accepted items), containing " << count << " items." << endl; +  \
readCalendarFolder( *(*it)->id, count, itemCounts ); +                haveReadFolder \
= true; +              }*/
             }
-            else if ( *(fld->folderType) == Checklist ) {
-              kdDebug() << "Reading folder " <<  (*(*it)->id).c_str() << ", of type \
                Checklist, physically containing " << count << " items." << endl;
-              readCalendarFolder( *(*it)->id, itemCounts );
-              haveReadFolder = true;
-              *mChecklistFolder = *((*it)->id);
-            }
-/*            else if ( fld->folderType == SentItems ) {
-              kdDebug() << "Reading folder " <<  (*(*it)->id).c_str() << ", of type \
                SentItems, physically containing " << count << " items." << endl;
-              readCalendarFolder( *(*it)->id, itemCounts );
-              haveReadFolder = true;
-              *mChecklistFolder = *((*it)->id);
-            }*/
-/*            else if ( fld->folderType == Mailbox ) {
-              kdDebug() << "Reading folder " <<  (*(*it)->id).c_str() << ", of type \
                Mailbox (not yet accepted items), containing " << count << " items." \
                << endl;
-              readCalendarFolder( *(*it)->id, count, itemCounts );
-              haveReadFolder = true;
-            }*/
             if ( haveReadFolder )
             {
               kdDebug() << "Folder contained " << itemCounts.appointments << " \
appointments, " << itemCounts.notes << " notes, and " << itemCounts.tasks << " \
tasks." << endl;


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