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

List:       kde-commits
Subject:    tags/kdepim/enterprise35.0.20100226.1096264/kdepim/korganizer
From:       Allen Winter <winter () kde ! org>
Date:       2010-03-01 0:45:26
Message-ID: 1267404326.724451.1904.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1097364 by winterz:

merge 
r1097362 | winterz | 2010-02-28 19:37:05 -0500 (Sun, 28 Feb 2010) | 5 lines

attempt to fix Kolab tasks not showing up in side-by-side agenda view.



 M  +4 -2      koagendaview.cpp  


--- tags/kdepim/enterprise35.0.20100226.1096264/kdepim/korganizer/koagendaview.cpp #1097363:1097364
@@ -1639,8 +1639,10 @@
   if ( resourceCalendar() && incidence->type() == "Todo" ) {
     QString subRes = resourceCalendar()->subresourceIdentifier( incidence );
     if ( resourceCalendar()->subresourceType( subRes ) == "todo" ) {
-      QString calmatch = "/.INBOX.directory/" + i18n( "Calendar" );
-      if ( subResourceCalendar().contains( calmatch ) ) {
+      QString calmatch = "/.INBOX.directory/Calendar";
+      QString i18nmatch = "/.INBOX.directory/" + i18n( "Calendar" );
+      if ( subResourceCalendar().contains( calmatch ) ||
+           subResourceCalendar().contains( i18nmatch ) ) {
         return true;
       }
     }
[prev in list] [next in list] [prev in thread] [next in thread]