HomePhorge

svnmerge had quite some trouble with this one, I hope it doesn't break too…
84cdaa6f5599Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

svnmerge had quite some trouble with this one, I hope it doesn't break too much...

Merged revisions 986696,986708-986717,986719-986724,986726,986728,986730,986732,986734-986737,987521,987528,987530,987607,987609,988159,988164,988434,988523-988524,988542-988543,988546,988558,989281,994282-994283,994693 via svnmerge from
https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs

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

r986696 | tmcguire | 2009-06-25 00:07:00 +0200 (Thu, 25 Jun 2009) | 16 lines

Merged revisions 977460 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r977460 | cberzan | 2009-06-04 12:29:44 +0200 (Thu, 04 Jun 2009) | 10 lines
  
  Initial commit of a more flexible mailtransport, including support for Akonadi resource-based transports.
  
  Changes include:
  * separate config widgets for each transport type (smtp, sendmail, akonadi)
  * a nice KAssistantDialog for adding transports
  * support for renaming transports in the management widget
  
  A lot is still TODO, and this will eventually need an API review.
........

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

r986708 | tmcguire | 2009-06-25 00:24:18 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 977463 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r977463 | cberzan | 2009-06-04 12:36:35 +0200 (Thu, 04 Jun 2009) | 2 lines
  
  Akonadi::TransportResource class for resources implementing sending.
........

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

r986709 | tmcguire | 2009-06-25 00:24:54 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 977512 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r977512 | cberzan | 2009-06-04 15:53:15 +0200 (Thu, 04 Jun 2009) | 3 lines
  
  Move outboxinterface, maildispatcheragent, mailtransport_dummy_interface from playground/pim to the SOC branch.  They don't compile against trunk anymore.
........

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

r986710 | tmcguire | 2009-06-25 00:25:30 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 977556 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r977556 | cberzan | 2009-06-04 18:29:10 +0200 (Thu, 04 Jun 2009) | 2 lines
  
  SVN_SILENT fix build of outboxinterface now that it is in kdepimlibs
........

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

r986711 | tmcguire | 2009-06-25 00:26:09 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 977793 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r977793 | cberzan | 2009-06-05 15:42:24 +0200 (Fri, 05 Jun 2009) | 2 lines
  
  TransportTypeInfo class to avoid having to switch( type ) in a bunch of places.
........

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

r986712 | tmcguire | 2009-06-25 00:26:44 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 978246 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r978246 | tmcguire | 2009-06-06 17:04:25 +0200 (Sat, 06 Jun 2009) | 2 lines
  
  Fix build, we can not use camelcase headers in kdepimlibs itself.
........

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

r986713 | tmcguire | 2009-06-25 00:27:22 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 978247 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r978247 | tmcguire | 2009-06-06 17:13:03 +0200 (Sat, 06 Jun 2009) | 1 line
  
  Compile
........

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

r986714 | tmcguire | 2009-06-25 00:27:59 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 978849 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r978849 | cberzan | 2009-06-08 12:56:59 +0200 (Mon, 08 Jun 2009) | 2 lines
  
  Disconnect foldersReady() in doStart() to prevent the job being started a second time.
........

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

r986715 | tmcguire | 2009-06-25 00:28:33 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 979159 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r979159 | cberzan | 2009-06-09 08:07:21 +0200 (Tue, 09 Jun 2009) | 2 lines
  
  less verbose SVN_SILENT
........

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

r986716 | tmcguire | 2009-06-25 00:29:08 +0200 (Thu, 25 Jun 2009) | 10 lines

Merged revisions 979765 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r979765 | cberzan | 2009-06-10 16:14:57 +0200 (Wed, 10 Jun 2009) | 3 lines
  
  * Add a D-Bus interface for the MDA (for now it only has an abort() method).
  * Add a DispatcherInterface class that connects to the MDA and provides methods like abort(), and will eventually provide info about progress.
........

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

r986717 | tmcguire | 2009-06-25 00:29:46 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 980068 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r980068 | cberzan | 2009-06-11 06:00:55 +0200 (Thu, 11 Jun 2009) | 2 lines
  
  SentCollectionAttribute -> SentBehaviourAttribute, with added support for deleting the message after it was sent (useful for e.g. imap)
........

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

r986719 | tmcguire | 2009-06-25 00:30:59 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 980075 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r980075 | cberzan | 2009-06-11 07:05:57 +0200 (Thu, 11 Jun 2009) | 2 lines
  
  Use AgentInstance::abort().  This makes the separate MDA D-Bus interface unnecessary, and I disabled it.  Everything is done via AgentInstance.
........

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

r986720 | tmcguire | 2009-06-25 00:31:46 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 980375 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r980375 | cberzan | 2009-06-11 18:36:57 +0200 (Thu, 11 Jun 2009) | 2 lines
  
  add DispatcherInterface::dispatcherInstance method to give apps direct access to the mda instance
........

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

r986721 | tmcguire | 2009-06-25 00:32:30 +0200 (Thu, 25 Jun 2009) | 11 lines

Merged revisions 982558 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r982558 | cberzan | 2009-06-16 10:04:48 +0200 (Tue, 16 Jun 2009) | 4 lines
  
  FilterActionJob -- a job that takes a bunch of items, filters them according to some rules, and then applies an action to the items accepted by the filter.  The filter rules and action to perform are provided by a class derived from FilterAction, and can be almost anything.
  
  This is used in OutboxInterface to mass-modify items in the outbox.
........

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

r986722 | tmcguire | 2009-06-25 00:33:16 +0200 (Thu, 25 Jun 2009) | 16 lines

Merged revisions 982560 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r982560 | cberzan | 2009-06-16 10:09:31 +0200 (Tue, 16 Jun 2009) | 9 lines
  
  DispatcherInterface:
  * remove redundant functions. Let clients call dispatcherInstance() and do what they will with the AgentInstance they get.
  * implement dispatchManually ("send queued") and retryDispatching
  
  Tests: added small programs that:
  * use SendQueuedAction on the outbox (equivalent to DispatcherInterface::self()->dispatchManually())
  * use ClearError on the outbox (equivalent to DispatcherInterface::self()->retryDispatching())
  * tell the MDA to abort
........

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

r986723 | tmcguire | 2009-06-25 00:33:59 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 982585 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r982585 | cberzan | 2009-06-16 12:20:49 +0200 (Tue, 16 Jun 2009) | 2 lines
  
  support for sending on due date in the little "queuer" app
........

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

r986724 | tmcguire | 2009-06-25 00:34:40 +0200 (Thu, 25 Jun 2009) | 13 lines

Merged revisions 985088 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r985088 | cberzan | 2009-06-22 07:42:52 +0200 (Mon, 22 Jun 2009) | 6 lines
  
  compile with -DQT_NO_CAST_FROM_ASCII
  
  (resourcesynchronizationjob.{h,cpp} copied from playground/pim/akonaditest/resourcetester/)
  
  MERGE: trunk
........

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

r986726 | tmcguire | 2009-06-25 00:37:25 +0200 (Thu, 25 Jun 2009) | 10 lines

Merged revisions 985089 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r985089 | cberzan | 2009-06-22 07:46:25 +0200 (Mon, 22 Jun 2009) | 3 lines
  
  * move out localfolders and related tests (to kdepimlibs/akonadi/kmime).
  * remove svn:externals for resourcetester
........

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

r986728 | tmcguire | 2009-06-25 00:38:10 +0200 (Thu, 25 Jun 2009) | 10 lines

Merged revisions 985090 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r985090 | cberzan | 2009-06-22 07:47:59 +0200 (Mon, 22 Jun 2009) | 3 lines
  
  * move in localfolders and related tests (from kdepimlibs/outboxinterface)
  * for now, copy resourcesynchronizationjob.{h,cpp} from playground/pim/akonaditest/resourcetester
........

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

r986730 | tmcguire | 2009-06-25 00:39:05 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 985142 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r985142 | cberzan | 2009-06-22 11:13:12 +0200 (Mon, 22 Jun 2009) | 2 lines
  
  Add inbox, drafts, trash, templates, as well as tentative support for custom folders.  The collection names (as well as the names of the folders in the maildir) are hardcoded to English -- i18n will be handled with EntityDisplayAttributes.
........

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

r986732 | tmcguire | 2009-06-25 00:39:44 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 985158 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r985158 | cberzan | 2009-06-22 11:45:53 +0200 (Mon, 22 Jun 2009) | 2 lines
  
  pretty icons for the local folders
........

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

r986734 | tmcguire | 2009-06-25 00:40:35 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 985583 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r985583 | cberzan | 2009-06-23 09:50:55 +0200 (Tue, 23 Jun 2009) | 2 lines
  
  clean up; api docs
........

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

r986735 | tmcguire | 2009-06-25 00:41:14 +0200 (Thu, 25 Jun 2009) | 14 lines

Merged revisions 986102 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r986102 | cberzan | 2009-06-24 10:26:31 +0200 (Wed, 24 Jun 2009) | 7 lines
  
  * Make LocalFolders react correctly to removal of custom (non-default) folders.  It is not necessary to re-fetch the entire folder structure in this case. (plus test)
  * Make the local folders un-deletable via Collection::Rights.
  * Add LocalFolders::root().
  * Remove LocalFolders::customFolders() -> not needed until I see a good use case for this.
  * Extract the folder structure fetching/rebuilding logic into a LocalFoldersBuildJob.  Makes things a bit clearer.
  * Api docs.
........

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

r986736 | tmcguire | 2009-06-25 00:41:53 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 986107 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r986107 | cberzan | 2009-06-24 10:29:44 +0200 (Wed, 24 Jun 2009) | 2 lines
  
  api docs
........

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

r986737 | tmcguire | 2009-06-25 00:42:28 +0200 (Thu, 25 Jun 2009) | 9 lines

Merged revisions 986144 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/soc/kdepimlibs

........
  r986144 | cberzan | 2009-06-24 12:20:45 +0200 (Wed, 24 Jun 2009) | 2 lines
  
  API docs for TransportResource.  Also added a design note for reviewers to ponder.
........

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

r987521 | cberzan | 2009-06-26 11:18:01 +0200 (Fri, 26 Jun 2009) | 7 lines

Re-design handling of send-enabled Akonadi resources in MailTransport.
* TransportManager now queries all agent types and selects those that support sending email.
* TransportType class for each Transport, because for Akonadi types we now need to keep track of the AgentType as well.
* Config of Akonadi-based transports now simply calls AgentInstance::configure().
* Deprecate TransportConfigDialog, since it doesn't work for Akonadi transports.  Use TransportManager::configureTransport() instead.
* Remove the add transport assistant, replace it with a simple dialog.

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

r987528 | cberzan | 2009-06-26 11:40:02 +0200 (Fri, 26 Jun 2009) | 2 lines

watch for appearing and disappearing akonadi agent types with transport capability

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

r987530 | cberzan | 2009-06-26 11:45:00 +0200 (Fri, 26 Jun 2009) | 2 lines

if the resource handling a certain transport died, show "Unknown" instead of an empty string. SVN_SILENT

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

r987607 | cberzan | 2009-06-26 15:25:48 +0200 (Fri, 26 Jun 2009) | 2 lines

need to register the attributes here too... until we find a better solution SVN_SILENT

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

r987609 | cberzan | 2009-06-26 15:26:45 +0200 (Fri, 26 Jun 2009) | 2 lines

do not let jobs delete the manager's transports

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

r988159 | cberzan | 2009-06-27 14:43:35 +0200 (Sat, 27 Jun 2009) | 2 lines

Bye bye TransportResource.  Will be using an observer-like class ResourceBase::Transport from now on.

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

r988164 | cberzan | 2009-06-27 14:51:54 +0200 (Sat, 27 Jun 2009) | 6 lines

* don't forget to delete Private of AddTransportDialog
* add TransportType::operator=
* adjust AkonadiJob to use ResourceBase::Transport
* add a note about AkonadiJob needing more thought
* lots of api docs and CamelCase headers

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

r988434 | cberzan | 2009-06-28 09:29:46 +0200 (Sun, 28 Jun 2009) | 3 lines

Automatically register the attributes upon library load.
A ninja trick from Alexandrescu's book :)

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

r988523 | cberzan | 2009-06-28 10:16:26 +0200 (Sun, 28 Jun 2009) | 3 lines

* d-pointers for the attributes
* serialization test

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

r988524 | cberzan | 2009-06-28 10:19:08 +0200 (Sun, 28 Jun 2009) | 2 lines

obey coding style; minor i18n fixes. SVN_SILENT

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

r988542 | cberzan | 2009-06-28 12:36:10 +0200 (Sun, 28 Jun 2009) | 2 lines

move out AddressAttribute (to akonadi/kmime)

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

r988543 | cberzan | 2009-06-28 12:36:35 +0200 (Sun, 28 Jun 2009) | 2 lines

move in AddressAttribute (from outboxinterface)

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

r988546 | cberzan | 2009-06-28 12:41:59 +0200 (Sun, 28 Jun 2009) | 8 lines

Make AkonadiJob work in two ways:
* if it is given an item with an AddressAttribute, just send it.
  (this is handy when apps already have the item created.)
* if it is given data and addresses, construct an item, give it an AddressAttribute, and then send it.
  (this makes AkonadiJob work like other TransportJobs.)
  Problem: where to create this item?  (so this doesn't work yet.)

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

r988558 | cberzan | 2009-06-28 13:17:07 +0200 (Sun, 28 Jun 2009) | 3 lines

fix build for non-transport-enabled resources.
hopefully I didn't break anything else before going on vacation (-;

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

r989281 | tilladam | 2009-06-29 22:49:30 +0200 (Mon, 29 Jun 2009) | 1 line

Fix the build on OSX.

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

r994282 | cberzan | 2009-07-10 16:03:50 +0200 (Fri, 10 Jul 2009) | 3 lines

Move ResourceBase::Transport to a new class TransportResourceBase.
All the D-Bus stuff is in a private QObject-derived class in TransportResourceBase.  (a very neat trick suggested by the PIM hackers at Akademy ;)

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

r994283 | cberzan | 2009-07-10 16:05:08 +0200 (Fri, 10 Jul 2009) | 2 lines

SVN_SILENT CamelCase include for TransportResourceBase

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

r994693 | cberzan | 2009-07-11 10:16:50 +0200 (Sat, 11 Jul 2009) | 5 lines

* Move OutboxInterface into MailTransport.  This was done because (1) they are related and (2) a circular dependency would be needed to make resource-based transport jobs work.
* Mark everything related to transport jobs in MT deprecated.  The stuff is meant to be used by the MDA only, and will be moved to the MDA in KDE5.
* Fix bug where transports created by TransportManager::createTransportJob() would not be aware of their passwords.
* Rename AkonadiJob to ResourceSendJob to avoid confusion.  This class is just a wrapper around MessageQueueJob, and it is the MDA who actually forwards the item to the resource responsible for sending it.  (see DESIGN file)

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

svn path=/trunk/KDE/kdepimlibs/; revision=1010056

Event Timeline

Merged Changes