HomePhorge
Diffusion kdepimlibs 226e70f28580

SVN_MERGE
226e70f28580Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

SVN_MERGE

Merged revisions 1000372-1000373,1000375-1000376,1000382,1000388,1000427,1000433,1000442,1000444,1000457-1000458,1000468,1000477,1000530-1000532,1000551,1000590,1000613,1000900,1000903,1000912,1000914-1000915,1001052,1001660,1001771,1001773,1001809,1001852-1001854,1001865,1001878,1001881,1001894,1001945,1001954,1002322,1002658,1002740 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

................

r1000372 | skelly | 2009-07-21 10:45:54 +0200 (Tue, 21 Jul 2009) | 3 lines

Move EntityTreeModel into kdepimlibs.

................

r1000373 | skelly | 2009-07-21 10:46:41 +0200 (Tue, 21 Jul 2009) | 1 line

Add EntityTreeModel to the build system.

................

r1000375 | skelly | 2009-07-21 10:49:51 +0200 (Tue, 21 Jul 2009) | 1 line

Add a DescendantsProxyModel for Akonadi apps to use.

................

r1000376 | skelly | 2009-07-21 10:49:54 +0200 (Tue, 21 Jul 2009) | 1 line

Use QLatin1String instead of const char *

................

r1000382 | skelly | 2009-07-21 10:57:03 +0200 (Tue, 21 Jul 2009) | 1 line

Use correct export.

................

r1000388 | skelly | 2009-07-21 11:12:05 +0200 (Tue, 21 Jul 2009) | 1 line

Add a SelectionProxyModel for use with Akonadi apps.

................

r1000427 | tokoe | 2009-07-21 11:57:03 +0200 (Tue, 21 Jul 2009) | 2 lines

coding style cleanup + apidocs

................

r1000433 | skelly | 2009-07-21 12:13:09 +0200 (Tue, 21 Jul 2009) | 3 lines

Add some methods for forwarding mimetype drag and drop stuff.

This should probably be in QAPM. Will look into it later.

................

r1000442 | skelly | 2009-07-21 12:24:10 +0200 (Tue, 21 Jul 2009) | 2 lines

Move more proxies from kdepim into kdepimlibs.

................

r1000444 | skelly | 2009-07-21 12:36:59 +0200 (Tue, 21 Jul 2009) | 1 line

Various build fixes. Use akonadi_export instead of akonadi_next_export etc.

................

r1000457 | tokoe | 2009-07-21 13:28:35 +0200 (Tue, 21 Jul 2009) | 2 lines

coding style cleanups + apidocs

................

r1000458 | ervin | 2009-07-21 13:31:40 +0200 (Tue, 21 Jul 2009) | 3 lines

FavoriteCollectionsModel is now in kdepimlibs so let's simplify the code
a bit.

................

r1000468 | tokoe | 2009-07-21 13:56:03 +0200 (Tue, 21 Jul 2009) | 2 lines

coding style cleanup + warning--

................

r1000477 | vkrause | 2009-07-21 14:21:40 +0200 (Tue, 21 Jul 2009) | 2 lines

Actually show the collection size here, instead of the "0 bytes" dummy text.

................

r1000530 | skelly | 2009-07-21 16:23:16 +0200 (Tue, 21 Jul 2009) | 1 line

Rename the variable for the list taken from the new collections hash.

................

r1000531 | skelly | 2009-07-21 16:23:26 +0200 (Tue, 21 Jul 2009) | 1 line

Don't filter by default if the mimechecker is not checking any mimetypes.

................

r1000532 | vkrause | 2009-07-21 16:27:48 +0200 (Tue, 21 Jul 2009) | 4 lines

Add the ETM state saver. It can save and restore the selection,
expansion and scrollbar state of any ETM based tree view, automatically 
dealing with the asynchronous model loading etc.

................

r1000551 | tokoe | 2009-07-21 16:56:05 +0200 (Tue, 21 Jul 2009) | 2 lines

Add apidocs

................

r1000590 | cgiboudeaux | 2009-07-21 17:59:47 +0200 (Tue, 21 Jul 2009) | 1 line

Add the headers for selectionproxymodel.h and descendantsproxymodel.h

................

r1000613 | winterz | 2009-07-21 19:15:39 +0200 (Tue, 21 Jul 2009) | 5 lines

make sure to init the mRecurrence member when making a copy.
probable fix for crash reported in
BUG: 201013
MERGE: 4.3,e4

................

r1000900 | tmcguire | 2009-07-22 11:46:46 +0200 (Wed, 22 Jul 2009) | 193 lines

Block cyclic merges, blocks
SVN_MERGE
SVN_SILENT
Blocked revisions 997257,997261-997262,997264,997266,997268,997272,997274,997499,997542 via svnmerge

................
  r997257 | tmcguire | 2009-07-15 18:50:59 +0200 (Wed, 15 Jul 2009) | 57 lines
  
  Block cyclic merges, release stuff, Akonadi stuff
  SVN_SILENT
  --
  Blocked revisions 986240,986619,986622,988088,990741,991920,993024,993290 via svnmerge
  
  ................
    r986240 | mueller | 2009-06-24 14:20:11 +0200 (Wed, 24 Jun 2009) | 2 lines
    
    bump version numbers/requires
  ................
    r986619 | tmcguire | 2009-06-24 21:59:37 +0200 (Wed, 24 Jun 2009) | 12 lines
    
    Backport r986228 by tmcguire from trunk to the 4.3 branch:
    
    Merged revisions 983772 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
    
    ........
      r983772 | mutz | 2009-06-19 08:55:30 +0200 (Fri, 19 Jun 2009) | 1 line
      
      gpgme++: Add initializeLibrary() function, calling enforced-required gpgme_check-version
    ........
  ................
    r986622 | tmcguire | 2009-06-24 22:03:00 +0200 (Wed, 24 Jun 2009) | 12 lines
    
    Backport r986230 by tmcguire from trunk to the 4.3 branch:
    
    Merged revisions 983776 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
    
    ........
      r983776 | mutz | 2009-06-19 09:15:54 +0200 (Fri, 19 Jun 2009) | 1 line
      
      ++export macros
    ........
  ................
    r988088 | scripty | 2009-06-27 10:58:20 +0200 (Sat, 27 Jun 2009) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ................
    r990741 | scripty | 2009-07-03 09:43:36 +0200 (Fri, 03 Jul 2009) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ................
    r991920 | dfaure | 2009-07-06 02:01:23 +0200 (Mon, 06 Jul 2009) | 2 lines
    
    Fix crash on exit in kres_migrator
  ................
    r993024 | mueller | 2009-07-08 10:36:31 +0200 (Wed, 08 Jul 2009) | 1 line
    
    4.3 RC 2
  ................
    r993290 | ervin | 2009-07-08 14:05:18 +0200 (Wed, 08 Jul 2009) | 2 lines
    
    Backporting UID handling fix from trunk revision 993288.
  ................
................
  r997261 | tmcguire | 2009-07-15 18:58:38 +0200 (Wed, 15 Jul 2009) | 12 lines
  
  Merged revisions 990023 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
  
  ........
    r990023 | winterz | 2009-07-01 15:24:56 +0200 (Wed, 01 Jul 2009) | 5 lines
    
    backport SVN commit 990021 by winterz:
    
    Avod generating recurrent events until everything crashes.
    Inspired by a patch from Alvaro, Thanks!
  ........
................
  r997262 | tmcguire | 2009-07-15 19:05:49 +0200 (Wed, 15 Jul 2009) | 11 lines
  
  Merged revisions 990532 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
  
  ........
    r990532 | winterz | 2009-07-02 17:36:31 +0200 (Thu, 02 Jul 2009) | 4 lines
    
    backport SVN commit 990226 by winterz:
    
    simplify nonKDECustomProperty() and removeNonKDECustomProperty()
  ........
................
  r997264 | tmcguire | 2009-07-15 19:08:55 +0200 (Wed, 15 Jul 2009) | 12 lines
  
  Merged revisions 990575 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
  
  ........
    r990575 | winterz | 2009-07-02 20:57:00 +0200 (Thu, 02 Jul 2009) | 5 lines
    
    backport SVN revision 990569
    
    Fix writing an exrule instead of an rrule in writeIncidence().
    From a patch by Alvaro. Thanks!
  ........
................
  r997266 | tmcguire | 2009-07-15 19:13:19 +0200 (Wed, 15 Jul 2009) | 14 lines
  
  Merged revisions 990631 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
  
  ........
    r990631 | winterz | 2009-07-02 22:58:32 +0200 (Thu, 02 Jul 2009) | 8 lines
    
    backport SVN commit 990626 by winterz:
    
    handle the case where there is no VERSION property.
    Based on Alvaro's patch.
    
    (extra, unnecessary i18n strings removed)
  ........
................
  r997268 | tmcguire | 2009-07-15 19:16:40 +0200 (Wed, 15 Jul 2009) | 12 lines
  
  Merged revisions 990684 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
  
  ........
    r990684 | winterz | 2009-07-03 02:25:23 +0200 (Fri, 03 Jul 2009) | 5 lines
    
    backport SVN commit 990682 by winterz:
    
    Add crash guards when passing pointers to strcmp() and atoi().
    Patch from Alvaro.
  ........
................
  r997272 | tmcguire | 2009-07-15 19:24:29 +0200 (Wed, 15 Jul 2009) | 17 lines
  
  (merged into kdepim e4)
  SVN_SILENT
  --
  Recorded merge of revisions 991932 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
  
  ........
    r991932 | cgiboudeaux | 2009-07-06 02:40:17 +0200 (Mon, 06 Jul 2009) | 7 lines
    
    backport r991931 from trunk to 4.3:
    Add holidays for India.
    Original patch by Kharthik. Thanks.
    Only the fixed dates will be available for now.
    Some special dates depend on the moon or change every year.
    CCBUG: 199079 
  ........
................
  r997274 | tmcguire | 2009-07-15 19:29:55 +0200 (Wed, 15 Jul 2009) | 11 lines
  
  Merged revisions 996755 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
  
  ........
    r996755 | winterz | 2009-07-14 22:40:26 +0200 (Tue, 14 Jul 2009) | 4 lines
    
    backport SVN commit 996754 by winterz:
    
    Fix kmail crashes on opening a mail containing a (foreign) canceled meeting request
  ........
................
  r997499 | tmcguire | 2009-07-15 23:54:22 +0200 (Wed, 15 Jul 2009) | 11 lines
  
  Crossport r990792 by winterz from trunk to the enterprise4 branch:
  
  Write only 1 CATEGORIES property per component, according to RFC.
  multiple values are comma-separated.
  
  We continue to support reading multiple CATEGORIES property per component, for back compat.
  
  MERGE: e4
  CCBUG: 171576
................
  r997542 | tmcguire | 2009-07-16 01:19:33 +0200 (Thu, 16 Jul 2009) | 10 lines
  
  Merged revisions 997101 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs
  
  ........
    r997101 | mlaurent | 2009-07-15 12:58:12 +0200 (Wed, 15 Jul 2009) | 3 lines
    
    Fix kolab issue3645
    Fix end of line on windows (don't use unix end-of-line)
  ........
................

................

r1000903 | tmcguire | 2009-07-22 11:51:14 +0200 (Wed, 22 Jul 2009) | 13 lines

SVN_MERGE
Merged revisions 999727 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs

........
  r999727 | winterz | 2009-07-20 14:21:25 +0200 (Mon, 20 Jul 2009) | 5 lines
  
  allow a semicolon as an address separator.
  fixes kolab/issue3634
  
  MERGE: trunk,4.3
........

................

r1000912 | ervin | 2009-07-22 12:04:21 +0200 (Wed, 22 Jul 2009) | 4 lines

Make the favorite selection and the collection selection synchronized.
Had to introduce some assumption on how the different model relates and
that is enforced using asserts in the setters.

................

r1000914 | ervin | 2009-07-22 12:19:11 +0200 (Wed, 22 Jul 2009) | 2 lines

Some fine tuning on the action enabled state.

................

r1000915 | ervin | 2009-07-22 12:19:51 +0200 (Wed, 22 Jul 2009) | 3 lines

Don't empty the collection selection when the favorite selection gets
empty.

................

r1001052 | tokoe | 2009-07-22 16:41:24 +0200 (Wed, 22 Jul 2009) | 2 lines

Do not crash if no favoriteSelectionModel is set

................

r1001660 | toma | 2009-07-23 23:45:47 +0200 (Thu, 23 Jul 2009) | 2 lines

I'm no longer maintaining KImap/KPimIdentities or Mailtransport. There are other people much more knowledgable about those. Basically this is just reflection of reality.

................

r1001771 | vkrause | 2009-07-24 10:25:57 +0200 (Fri, 24 Jul 2009) | 3 lines

Use a much more compact storage format, given we want to use this once for
every folder eventually.

................

r1001773 | stefanek | 2009-07-24 10:28:20 +0200 (Fri, 24 Jul 2009) | 3 lines

Initial support for preprocessor agents.

................

r1001809 | cgiboudeaux | 2009-07-24 12:25:30 +0200 (Fri, 24 Jul 2009) | 1 line

Add the header for preprocessorbase.h

................

r1001852 | skelly | 2009-07-24 13:25:23 +0200 (Fri, 24 Jul 2009) | 3 lines

Add a way for subclasses to tell proxies how many columns they have for a given headerSet.

This is needed for porting Akonadiconsole to ETM, but not used for now until better tested.

................

r1001853 | skelly | 2009-07-24 13:25:38 +0200 (Fri, 24 Jul 2009) | 1 line

Now that CollectionFetchJob filters by mimeType, we don't need to do the same thing, and can make filling the model far smarter.

................

r1001854 | skelly | 2009-07-24 13:25:45 +0200 (Fri, 24 Jul 2009) | 1 line

Return an invalid index for invalid rows, columns.

................

r1001865 | tokoe | 2009-07-24 13:43:21 +0200 (Fri, 24 Jul 2009) | 2 lines

coding style + apidocs cleanup

................

r1001878 | tokoe | 2009-07-24 14:13:40 +0200 (Fri, 24 Jul 2009) | 2 lines

Use global debug area in CMakeLists.txt

................

r1001881 | tokoe | 2009-07-24 14:19:08 +0200 (Fri, 24 Jul 2009) | 3 lines

Renamed processingTerminated to terminateProcessing
and some coding style cleanups

................

r1001894 | skelly | 2009-07-24 15:01:23 +0200 (Fri, 24 Jul 2009) | 3 lines

Rename getNumColumns to getColumncount.

KDevelop rocks. It even renamed the virtual method in the AkonadiBrowserModel automatically.

................

r1001945 | tmcguire | 2009-07-24 17:23:04 +0200 (Fri, 24 Jul 2009) | 13 lines

Fix KMail always sending mails as base64, even though they could have been sent as 7bit.
This was bad because spamassassin gives needlessly base64-encoded text a score of over 2.

The problem is that the mail representation in mimelib and kmime has LF only, no CR.
The LF->CRLF conversion happens in the kio_smtp slave.

Because of that, checking that the number of LF should be the same as the number of CRLF did
not work, since we only have LFs.

Not sure if this workaround is ok.

CCMAIL: exit3219@gmail.com

................

r1001954 | tmcguire | 2009-07-24 17:46:26 +0200 (Fri, 24 Jul 2009) | 2 lines

Same fix as in r1001945, but this time for EightBitText.

................

r1002322 | tmcguire | 2009-07-25 19:05:46 +0200 (Sat, 25 Jul 2009) | 5 lines

Be more robust against invalid encoded strings that have a stray '?' in them
Glad we have unit tests here, otherwise I would have introduced many regressions here.

CCBUG: 201017

................

r1002658 | smartins | 2009-07-26 19:57:07 +0200 (Sun, 26 Jul 2009) | 8 lines

When merging ics files, only ask which resource to use once, and not one time for each incidence.

Review: http://reviewboard.kde.org/r/994/
MERGE: e4
BUG: 199234

................

r1002740 | winterz | 2009-07-26 23:38:13 +0200 (Sun, 26 Jul 2009) | 6 lines

Re-enable the mRelatedTo and mRelations attributes properly, per the longstanding TODO.
This probably fixes some crashes we've had with copying and filtering to-dos.

I'm not comfortable backporting or merging this yet, even though I've tested it
pretty well.  let's live with it a couple days first.

................

svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1002885

Details

Provenance
Volker Krause <vkrause@kde.org>Authored on
Parents
rKPL5778028a8123: SVN_SILENT typo
rKPLd9234eb411b5: Re-enable the mRelatedTo and mRelations attributes properly, per the…
rKPL047449a37bf9: Initial support for preprocessor agents.
Branches
Unknown
Tags
Unknown

Event Timeline

Volker Krause <vkrause@kde.org> committed rKPL226e70f28580: SVN_MERGE (authored by Volker Krause <vkrause@kde.org>).Jul 27 2009, 10:47 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Changes (61)

PathSize
akonadi/
includes/
Akonadi/
kcal/
kmime/
tests/
kpimutils/

rKPL226e70f28580

View Options

MAINTAINERS

Loading...
View Options

akonadi/CMakeLists.txt

Loading...
View Options

akonadi/agentbase.cpp

Loading...
View Options

akonadi/collectionfetchjob.cpp

Loading...
View Options

akonadi/collectiongeneralpropertiespage.cpp

Loading...
View Options

akonadi/collectionmodel_p.cpp

Loading...
View Options

akonadi/collectionstatisticsjob.cpp

Loading...
View Options

akonadi/collectionsync.cpp

Loading...
View Options

akonadi/control.cpp

Loading...
View Options

akonadi/descendantsproxymodel.cpp

Loading...
View Options

akonadi/descendantsproxymodel.h

Loading...
View Options

akonadi/entityfilterproxymodel.cpp

Loading...
View Options

akonadi/entityfilterproxymodel.h

Loading...
View Options

akonadi/entitytreemodel.cpp

Loading...
View Options

akonadi/entitytreemodel.h

Loading...
View Options

akonadi/entitytreemodel_p.cpp

Loading...
View Options

akonadi/entitytreemodel_p.h

Loading...
View Options

akonadi/entitytreeviewstatesaver.cpp

Loading...
View Options

akonadi/entitytreeviewstatesaver.h

Loading...
View Options

akonadi/favoritecollectionsmodel.cpp

Loading...
View Options

akonadi/favoritecollectionsmodel.h

Loading...
View Options

akonadi/itemcreatejob.cpp

Loading...
View Options

akonadi/itemfetchjob.cpp

Loading...
View Options

akonadi/itemfetchjob.h

Loading...
View Options

akonadi/itemmodel.cpp

Loading...
View Options

akonadi/itemmodifyjob.cpp

Loading...
View Options

akonadi/itemserializer.cpp

Loading...
View Options

akonadi/itemsync.cpp

Loading...
View Options

akonadi/job.cpp

Loading...
View Options

akonadi/monitor_p.cpp

Loading...
View Options

akonadi/preprocessorbase.cpp

Loading...
View Options

akonadi/preprocessorbase.h

Loading...
View Options

akonadi/protocolhelper.cpp

Loading...
View Options

akonadi/resourcebase.cpp

Loading...
View Options

akonadi/selectionproxymodel.cpp

Loading...
View Options

akonadi/selectionproxymodel.h

Loading...
View Options

akonadi/servermanager.cpp

Loading...
View Options

akonadi/session.cpp

Loading...
View Options

akonadi/standardactionmanager.cpp

Loading...
View Options

akonadi/standardactionmanager.h

Loading...
View Options

akonadi/statisticsproxymodel.cpp

Loading...
View Options

akonadi/statisticsproxymodel.h

Loading...
View Options

akonadi/statisticstooltipproxymodel.cpp

Loading...
View Options

akonadi/statisticstooltipproxymodel.h

Loading...
View Options

includes/Akonadi/DescendantsProxyModel

Loading...
View Options

includes/Akonadi/PreprocessorBase

Loading...
View Options

includes/Akonadi/SelectionProxyModel

Loading...
View Options

kcal/calendar.cpp

Loading...
View Options

kcal/calendar.h

Loading...
View Options

kcal/calendarresources.cpp

Loading...
View Options

kcal/calendarresources.h

Loading...
View Options

kcal/icalformat_p.cpp

Loading...
View Options

kcal/incidence.cpp

Loading...
View Options

kmime/kmime_charfreq.cpp

Loading...
View Options

kmime/kmime_header_parsing.cpp

Loading...
View Options

kmime/kmime_warning.h

Loading...
View Options

kmime/tests/headertest.cpp

Loading...
View Options

kmime/tests/headertest.h

Loading...
View Options

kmime/tests/kmime_charfreq_test.cpp

Loading...
View Options

kmime/tests/rfc2047test.cpp

Loading...
View Options

kpimutils/email.cpp

Loading...