Skip to content
  • Frank Osterfeld's avatar
    Merged revisions... · c2deeedc
    Frank Osterfeld authored
    Merged revisions 1002906,1003000,1003008,1003073,1003078,1003095,1003401,1003403,1003422,1003549,1003551-1003552,1003586,1003654-1003656,1004110,1004132-1004134,1004147,1004221,1004234,1004618,1004641-1004643,1004645,1004647-1004648,1004650,1004652,1004655,1004760,1005167-1005168,1005170,1005199,1005301,1005309,1005747-1005748,1005750,1005755-1005756,1005872 via svnmerge from 
    svn+ssh://osterfeld@svn.kde.org/home/kde/trunk/KDE/kdepimlibs
    
    ................
      r1002906 | scripty | 2009-07-27 11:32:22 +0200 (Mon, 27 Jul 2009) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ................
      r1003000 | vkrause | 2009-07-27 15:35:15 +0200 (Mon, 27 Jul 2009) | 2 lines
      
      Handle the collection move change notification.
    ................
      r1003008 | vkrause | 2009-07-27 15:55:27 +0200 (Mon, 27 Jul 2009) | 3 lines
      
      Map collection move signals to the old observer interface like we
      already do it for items.
    ................
      r1003073 | skelly | 2009-07-27 17:57:22 +0200 (Mon, 27 Jul 2009) | 1 line
      
      Fix matching a little bit. Make ModelTest not segfault.
    ................
      r1003078 | vkrause | 2009-07-27 18:21:07 +0200 (Mon, 27 Jul 2009) | 3 lines
      
      Add CollectionFetchScope to group the increasing amount of collection
      retrieval options, like we did already for items.
    ................
      r1003095 | tokoe | 2009-07-27 18:44:50 +0200 (Mon, 27 Jul 2009) | 2 lines
      
      fix apidocs
    ................
      r1003401 | vkrause | 2009-07-28 09:52:44 +0200 (Tue, 28 Jul 2009) | 2 lines
      
      Port to CollectionFetchScope.
    ................
      r1003403 | vkrause | 2009-07-28 10:12:14 +0200 (Tue, 28 Jul 2009) | 2 lines
      
      missed a few
    ................
      r1003422 | skelly | 2009-07-28 10:42:06 +0200 (Tue, 28 Jul 2009) | 1 line
      
      Fix logical error causing items and collections to be filtered when they should not be.
    ................
      r1003549 | vkrause | 2009-07-28 12:24:38 +0200 (Tue, 28 Jul 2009) | 8 lines
      
      Add Entity parent/setParent methods and use them instead of the
      now deprecated and less powerful ones in Collection.
      
      This is the first step towards supporting hierarchical remote
      identifiers as we discussed during the Osnabrueck 7 meeting a few
      month ago, which will especially allow efficient handling of
      collection moves.
    ................
      r1003551 | skelly | 2009-07-28 12:28:59 +0200 (Tue, 28 Jul 2009) | 3 lines
      
      Don't call collections items.
      
      SVN_SILENT
    ................
      r1003552 | skelly | 2009-07-28 12:29:02 +0200 (Tue, 28 Jul 2009) | 1 line
      
      Add some warnings as silent failures when we get stale notifications from Monitor.
    ................
      r1003586 | skelly | 2009-07-28 14:21:52 +0200 (Tue, 28 Jul 2009) | 1 line
      
      In the CollectionTree model, show a little [+] sign on collections only if they have child collections.
    ................
      r1003654 | skelly | 2009-07-28 16:43:17 +0200 (Tue, 28 Jul 2009) | 1 line
      
      Only the first column may contain child indexes.
    ................
      r1003655 | skelly | 2009-07-28 16:43:40 +0200 (Tue, 28 Jul 2009) | 1 line
      
      Improve the canFetchMore/fetchMore behaviour. Only try to fetch into unpopulated collections.
    ................
      r1003656 | skelly | 2009-07-28 16:44:13 +0200 (Tue, 28 Jul 2009) | 1 line
      
      Don't hide bugs: Use an assert instead of an if (...).
    ................
      r1004110 | scripty | 2009-07-29 13:38:15 +0200 (Wed, 29 Jul 2009) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ................
      r1004132 | ervin | 2009-07-29 14:12:39 +0200 (Wed, 29 Jul 2009) | 2 lines
      
      Provide a const version for sessionInternal().
    ................
      r1004133 | ervin | 2009-07-29 14:13:17 +0200 (Wed, 29 Jul 2009) | 2 lines
      
      Allow to find back the session() a job is running against.
    ................
      r1004134 | ervin | 2009-07-29 14:14:24 +0200 (Wed, 29 Jul 2009) | 5 lines
      
      Introduce a new IdleJob for the IDLE command.
      
      Note that the API of this one is not set in stone yet and might change
      before 4.4 is out.
    ................
      r1004147 | ervin | 2009-07-29 14:36:37 +0200 (Wed, 29 Jul 2009) | 2 lines
      
      Add missing headers.
    ................
      r1004221 | vkrause | 2009-07-29 18:07:41 +0200 (Wed, 29 Jul 2009) | 2 lines
      
      fix infinite recursion
    ................
      r1004234 | vkrause | 2009-07-29 19:00:39 +0200 (Wed, 29 Jul 2009) | 14 lines
      
      More or less complete rewrite of CollectionSync:
      - can in theory handle hierarchical RIDs, untested due to lack of
        support for that in most other areas
      - much more efficient processing of collections that initially have no
        local parent node
      - streaming support
      - processes incremental changes in the right order which should fix the
        sync fails after config change bug of the single file resources
      - prepared to make use of batch jobs for collection creation/deletion
        which should fix the performance issues with the NNTP resource
      
      There is still more to do, but this seems to work at least as good as
      the old one.
    ................
      r1004618 | vkrause | 2009-07-30 17:57:25 +0200 (Thu, 30 Jul 2009) | 7 lines
      
      Add some more safety checks and use streaming for the local collection
      listing.
      
      Unittests for hierarchical RIDs still fail though (but at least don't
      crash anymore), which is mostly due to collections without proper
      ancestor chains provided by the tests.
    ................
      r1004641 | tmcguire | 2009-07-30 18:53:56 +0200 (Thu, 30 Jul 2009) | 152 lines
      
      Block blocks, cyclic merges.
      SVN_SILENT
      SVN_MERGE
      --
      Blocked revisions 1000910,1000916,1000919,1000921 via svnmerge
      
      ................
        r1000910 | tmcguire | 2009-07-22 11:56:32 +0200 (Wed, 22 Jul 2009) | 84 lines
        
        Block cylic merges, Akonadi, release stuff, ...
        SVN_SILENT
        SVN_MERGE
        Blocked revisions 996892,997046,997619,998213,998248-998250,1000499 via svnmerge
        
        ................
          r996892 | ervin | 2009-07-15 08:52:49 +0200 (Wed, 15 Jul 2009) | 8 lines
          
          Make sure that the timer for pending updates is stopped *before* the job
          calls emitResult(). Otherwise we might get updates emitted after
          result() is emitted which is wrong (job are expected to emit result()
          last then die).
          
          Backport from trunk revision 996891.
        ................
          r997046 | scripty | 2009-07-15 11:24:27 +0200 (Wed, 15 Jul 2009) | 1 line
          
          SVN_SILENT made messages (.desktop file)
        ................
          r997619 | scripty | 2009-07-16 09:51:57 +0200 (Thu, 16 Jul 2009) | 1 line
          
          SVN_SILENT made messages (.desktop file)
        ................
          r998213 | scripty | 2009-07-17 10:19:49 +0200 (Fri, 17 Jul 2009) | 1 line
          
          SVN_SILENT made messages (.desktop file)
        ................
          r998248 | tmcguire | 2009-07-17 11:34:25 +0200 (Fri, 17 Jul 2009) | 20 lines
          
          Backport r997762 by vkrause from trunk to the 4.3 branch:
          
          MERGE: 4.3
          
          Merged revisions 996408,996460 via svnmerge from 
          https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs
          
          ........
            r996408 | vkrause | 2009-07-14 12:09:15 +0200 (Tue, 14 Jul 2009) | 3 lines
            
            fix quoting of the session name, the akonadiconsole uses spaces in
            there...
          ........
            r996460 | vkrause | 2009-07-14 15:08:09 +0200 (Tue, 14 Jul 2009) | 3 lines
            
            If a job is deleted it's no longer running obviously. Fixes randomly
            hanging sessions.
          ........
        ................
          r998249 | tmcguire | 2009-07-17 11:36:18 +0200 (Fri, 17 Jul 2009) | 15 lines
          
          Backport r997765 by vkrause from trunk to the 4.3 branch:
          
          MERGE: 4.3
          
          Merged revisions 997745 via svnmerge from 
          https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs
          
          ........
            r997745 | sebsauer | 2009-07-16 14:48:44 +0200 (Thu, 16 Jul 2009) | 4 lines
            
            Finally found the reason for all the dangling items in korganizer;
            In the copy-ctor we did not take over the collectionId what means that items lost the information in what collection they are once they got copied.
          ........
        ................
          r998250 | tmcguire | 2009-07-17 11:37:35 +0200 (Fri, 17 Jul 2009) | 14 lines
          
          Backport r997769 by vkrause from trunk to the 4.3 branch:
          
          MERGE: 4.3
          
          Merged revisions 997764 via svnmerge from 
          https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs
          
          ........
            r997764 | sebsauer | 2009-07-16 15:10:15 +0200 (Thu, 16 Jul 2009) | 1 line
            
            r997745 followup; better place :)
          ........
        ................
          r1000499 | mueller | 2009-07-21 15:16:53 +0200 (Tue, 21 Jul 2009) | 2 lines
          
          KDE 4.3 RC3
        ................
      ................
        r1000916 | tmcguire | 2009-07-22 12:22:55 +0200 (Wed, 22 Jul 2009) | 15 lines
        
        Looks like this is already merged.
        SVN_SILENT
        SVN_MERGE
        --
        
        Recorded merge of revisions 997490 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
        
        ........
          r997490 | cgiboudeaux | 2009-07-15 23:35:38 +0200 (Wed, 15 Jul 2009) | 4 lines
          
          Backport r997489 from trunk to 4.3 :
          As discussed on the buildsystem ML, revert r982001. KDEPIMLIBS_DATA_DIR/cmake/modules will be prepended.
        ........
      ................
        r1000919 | tmcguire | 2009-07-22 12:29:48 +0200 (Wed, 22 Jul 2009) | 22 lines
        
        SVN_MERGE
        Merged revisions 998251 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
        
        ................
          r998251 | tmcguire | 2009-07-17 11:38:33 +0200 (Fri, 17 Jul 2009) | 15 lines
          
          Backport r997761 by vkrause from trunk to the 4.3 branch:
          
          MERGE: 4.3
          
          Merged revisions 996927 via svnmerge from 
          https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs
          
          ........
            r996927 | vkrause | 2009-07-15 10:01:27 +0200 (Wed, 15 Jul 2009) | 3 lines
            
            Protect against users not caring about our internal assumptions.
            Fixes creation of broken MIME structures for Kolab objects after changes.
          ........
        ................
      ................
        r1000921 | tmcguire | 2009-07-22 12:32:35 +0200 (Wed, 22 Jul 2009) | 15 lines
        
        SVN_MERGE
        Merged revisions 1000615 via svnmerge from 
        svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
        
        ........
          r1000615 | winterz | 2009-07-21 19:24:51 +0200 (Tue, 21 Jul 2009) | 8 lines
          
          Backport r1000613 by winterz from trunk to the 4.3 branch:
          
          make sure to init the mRecurrence member when making a copy.
          probable fix for crash reported in
          CCBUG: 201013
          MERGE: 4.3,e4
        ........
      ................
    ................
      r1004642 | tmcguire | 2009-07-30 18:56:01 +0200 (Thu, 30 Jul 2009) | 9 lines
      
      Merged revisions 1003652 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
      
      ........
        r1003652 | mutz | 2009-07-28 16:39:43 +0200 (Tue, 28 Jul 2009) | 1 line
        
        Fix misleading warning
      ........
    ................
      r1004643 | tmcguire | 2009-07-30 18:57:39 +0200 (Thu, 30 Jul 2009) | 14 lines
      
      SVN_MERGE
      Merged revisions 1004200,1004627 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
      
      ........
        r1004200 | mutz | 2009-07-29 17:17:02 +0200 (Wed, 29 Jul 2009) | 1 line
        
        Key::mergeWith(): Merge (parts of gpgme_sub_key_t's, too, so we don't lose the is_cardkey state
      ........
        r1004627 | tmcguire | 2009-07-30 18:19:28 +0200 (Thu, 30 Jul 2009) | 1 line
        
        Compile with older gpgme versions
      ........
    ................
      r1004645 | tmcguire | 2009-07-30 18:59:43 +0200 (Thu, 30 Jul 2009) | 20 lines
      
      SVN_MERGE
      Merged revisions 1001119 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
      
      ................
        r1001119 | winterz | 2009-07-22 18:05:16 +0200 (Wed, 22 Jul 2009) | 12 lines
        
        Merged revisions 1001092 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1001092 | winterz | 2009-07-22 11:50:55 -0400 (Wed, 22 Jul 2009) | 5 lines
          
          more crash guards
          kolab/issue3769
          
          MERGE: e4,trunk,4.3
        ........
      ................
    ................
      r1004647 | tmcguire | 2009-07-30 19:00:49 +0200 (Thu, 30 Jul 2009) | 28 lines
      
      SVN_MERGE
      Merged revisions 1001354 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
      
      ................
        r1001354 | winterz | 2009-07-23 01:47:36 +0200 (Thu, 23 Jul 2009) | 20 lines
        
        Merged revisions 1001350 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1001350 | winterz | 2009-07-22 19:34:04 -0400 (Wed, 22 Jul 2009) | 14 lines
          
          A better fix for dealing with invalid attendee status strings in Kolab.
          If the status is not one of the 5 valid strings, then make the internal
          setting Attendee::None.
          
          Once the internal setting Attendee::None is written back to the server, it will
          become needs-action.
          
          In no case is an invalid status string written back to the server.
          
          hopefully fixes kolab/issue3766
          MERGE: e4,trunk
          DO_NOT_BACKPORT: 4.3 (new i18n string)
        ........
      ................
    ................
      r1004648 | tmcguire | 2009-07-30 19:07:39 +0200 (Thu, 30 Jul 2009) | 17 lines
      
      Merged revisions 1003683 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
      
      ................
        r1003683 | winterz | 2009-07-28 18:12:34 +0200 (Tue, 28 Jul 2009) | 10 lines
        
        Merged revisions 1003678 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1003678 | winterz | 2009-07-28 11:56:08 -0400 (Tue, 28 Jul 2009) | 3 lines
          
          don't remove linebreaks from the comments in invitations.
          kolab/issue3719
        ........
      ................
    ................
      r1004650 | tmcguire | 2009-07-30 19:22:42 +0200 (Thu, 30 Jul 2009) | 80 lines
      
      SVN_MERGE
      Merged revisions 1001591 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
      
      ................
        r1001591 | winterz | 2009-07-23 19:57:09 +0200 (Thu, 23 Jul 2009) | 72 lines
        
        Merged revisions 1001496 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1001496 | vkrause | 2009-07-23 09:05:16 -0400 (Thu, 23 Jul 2009) | 66 lines
          
          Merge the following stuff from the ancient proko2 branch. Should fix
          various issues with invitations if you have access to a calendar of
          aanother person that is also invited.
          
          Kolab issue 3724
          
          ------------------------------------------------------------------------
          r519272 | tilladam | 2006-03-16 19:35:12 +0100 (Thu, 16 Mar 2006) | 2 lines
          
          Change the buttons to "Store" and "Throw away" as requested.
          
          ------------------------------------------------------------------------
          r513844 | tilladam | 2006-02-26 18:59:04 +0100 (Sun, 26 Feb 2006) | 2 lines
          
          Make sure the transaction is cleaned up also in the error case.
          
          ------------------------------------------------------------------------
          r513842 | tilladam | 2006-02-26 18:53:37 +0100 (Sun, 26 Feb 2006) | 4 lines
          
          In case an update or cancel message is processed for an incidence that
          cannot be found, inform the user, instead of blindly adding a new
          version of the incidence. (proko2 issue 1128)
          
          ------------------------------------------------------------------------
          r365868 | dfaure | 2004-11-24 18:19:08 +0100 (Wed, 24 Nov 2004) | 2 lines
          
          Can't update readonly events.
          
          ------------------------------------------------------------------------
          r365849 | dfaure | 2004-11-24 17:12:01 +0100 (Wed, 24 Nov 2004) | 4 lines
          
          Looking at the status is too unreliable since we have several versions of the event
          and libical gets confused - the whole point of this code is to do the equivalent
          with some more logic.
          
          ------------------------------------------------------------------------
          r365838 | dfaure | 2004-11-24 16:17:15 +0100 (Wed, 24 Nov 2004) | 2 lines
          
          Reworked logic to actually fix issue526
          
          ------------------------------------------------------------------------
          r365807 | dfaure | 2004-11-24 14:26:14 +0100 (Wed, 24 Nov 2004) | 2 lines
          
          More debug output (to get more info out of michel)
          
          ------------------------------------------------------------------------
          r365223 | dfaure | 2004-11-22 21:24:57 +0100 (Mon, 22 Nov 2004) | 3 lines
          
          Tentative fix for https://intevation.de/roundup/kolab/issue526 as discussed with Till.
          The server died so full testing isn't possible tonight though.
          
          ------------------------------------------------------------------------
          r365196 | tilladam | 2004-11-22 20:22:17 +0100 (Mon, 22 Nov 2004) | 4 lines
          
          Add an additional const QString &attendee parameter to acceptTransaction
          and acceptRequests so that we can compare which of the attendees in the
          event is the one we are supposed to act upon.
          
          ------------------------------------------------------------------------
          r364294 | tilladam | 2004-11-19 18:03:43 +0100 (Fri, 19 Nov 2004) | 4 lines
          
          Add unknown attendees which did not appear in the original event as
          voluntary/optional attendees. This happens when people reply that were
          invited as part of a server side distribution list. Patch by Bo.
        ........
      ................
    ................
      r1004652 | tmcguire | 2009-07-30 19:24:01 +0200 (Thu, 30 Jul 2009) | 16 lines
      
      Merged revisions 1001919 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
      
      ................
        r1001919 | winterz | 2009-07-24 15:46:33 +0200 (Fri, 24 Jul 2009) | 9 lines
        
        Merged revisions 1001802 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1001802 | tmcguire | 2009-07-24 05:57:44 -0400 (Fri, 24 Jul 2009) | 2 lines
          
          Refer to the correct button in the dialog.
        ........
      ................
    ................
      r1004655 | tmcguire | 2009-07-30 19:25:29 +0200 (Thu, 30 Jul 2009) | 21 lines
      
      SVN_MERGE
      Merged revisions 1004162 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
      
      ................
        r1004162 | winterz | 2009-07-29 15:19:09 +0200 (Wed, 29 Jul 2009) | 13 lines
        
        Merged revisions 1004159 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1004159 | winterz | 2009-07-29 09:11:27 -0400 (Wed, 29 Jul 2009) | 6 lines
          
          Allow an attendee to decline an new invitation without getting the error
          message that the event couldn't be found in their calendar.
          kolab/issue3780
          
          MERGE: e4,trunk,4.3.1
        ........
      ................
    ................
      r1004760 | cgiboudeaux | 2009-07-30 22:06:01 +0200 (Thu, 30 Jul 2009) | 1 line
      
      Add the headers for collectionfetchscope.h and idlejob.h
    ................
      r1005167 | winterz | 2009-07-31 15:31:39 +0200 (Fri, 31 Jul 2009) | 4 lines
      
      merge SVN revision 1004364 by winterz from e4
      
      more beautification of the rsvp
    ................
      r1005168 | winterz | 2009-07-31 15:33:03 +0200 (Fri, 31 Jul 2009) | 4 lines
      
      merge SVN revision 1004367 by winterz from e4
      
      handle rsvp notices better.
    ................
      r1005170 | winterz | 2009-07-31 15:34:11 +0200 (Fri, 31 Jul 2009) | 6 lines
      
      merge SVN revision 1004605 by winterz from e4
      
      possible fix for kolab/issue3724 and kolab/issue3780, whereby multiple     
      persons having write access to a folder can confuse things for other       
      users accessing that folder.
    ................
      r1005199 | tmcguire | 2009-07-31 16:19:04 +0200 (Fri, 31 Jul 2009) | 46 lines
      
      All merged by Allen already.
      SVN_SILENT
      Recorded merge of revisions 1004364,1004367,1004605 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
      
      ................
        r1004364 | winterz | 2009-07-30 00:41:03 +0200 (Thu, 30 Jul 2009) | 10 lines
        
        Merged revisions 1004190 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1004190 | winterz | 2009-07-29 10:31:58 -0400 (Wed, 29 Jul 2009) | 3 lines
          
          more beautification of the rsvp
          MERGE: e4,trunk,4.3.1
        ........
      ................
        r1004367 | winterz | 2009-07-30 00:46:33 +0200 (Thu, 30 Jul 2009) | 10 lines
        
        Merged revisions 1004175 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1004175 | winterz | 2009-07-29 10:09:30 -0400 (Wed, 29 Jul 2009) | 3 lines
          
          handle rsvp notices better.
          MERGE: e4,trunk,4.3.1
        ........
      ................
        r1004605 | winterz | 2009-07-30 17:30:42 +0200 (Thu, 30 Jul 2009) | 13 lines
        
        Merged revisions 1004601 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1004601 | winterz | 2009-07-30 11:22:57 -0400 (Thu, 30 Jul 2009) | 6 lines
          
          possible fix for kolab/issue3724 and kolab/issue3780, whereby multiple
          persons having write access to a folder can confuse things for other
          users accessing that folder.
          
          MERGE: e4,trunk,4.3.1
        ........
      ................
    ................
      r1005301 | stefanek | 2009-07-31 20:58:37 +0200 (Fri, 31 Jul 2009) | 3 lines
      
      Sync the PreprocessorBase class to the new server changes.
    ................
      r1005309 | cgiboudeaux | 2009-07-31 21:07:56 +0200 (Fri, 31 Jul 2009) | 1 line
      
      Kdepimlibs trunk requires akonadi 1.2.60 and kdelibs 4.3.62
    ................
      r1005747 | winterz | 2009-08-02 01:50:41 +0200 (Sun, 02 Aug 2009) | 3 lines
      
      minor coding style fixes
      SVN_SILENT:
    ................
      r1005748 | winterz | 2009-08-02 01:52:30 +0200 (Sun, 02 Aug 2009) | 3 lines
      
      minor coding style fixes
      SVN_SILENT:
    ................
      r1005750 | winterz | 2009-08-02 01:54:10 +0200 (Sun, 02 Aug 2009) | 3 lines
      
      minor coding style fixes
      SVN_SILENT:
    ................
      r1005755 | winterz | 2009-08-02 02:08:25 +0200 (Sun, 02 Aug 2009) | 2 lines
      
      const ref a Q_FOREACH iterator
    ................
      r1005756 | winterz | 2009-08-02 02:14:00 +0200 (Sun, 02 Aug 2009) | 3 lines
      
      spelling fixes
      SVN_SILENT:
    ................
      r1005872 | mkoller | 2009-08-02 14:41:38 +0200 (Sun, 02 Aug 2009) | 5 lines
      
      BUG: 201900
      
      Allow ( ) inside URLs.
      Also add a unit test.
    ................
    
    svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1005999
    c2deeedc