Merged revisions 1138275,1138278,1138288,1138290-1138291,1138305,1138312-1138314,1138325,1138337-1138338,1138356,1138363,1138365-1138366,1138369,1138371,1138375-1138378,1138380,1138382,1138385,1138390,1138394,1138397,1138402,1138404,1138559,1138566,1138568-1138570,1138572,1138581,1138587,1138597-1138598,1138611-1138612,1138616-1138617,1138623,1138631-1138632 via svnmerge from 
svn+ssh://skelly@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1138275 | link | 2010-06-15 16:28:52 +0200 (Tue, 15 Jun 2010) | 4 lines
  
  warning "unused variable ‘job’" --> looks like a connect() is missing. Please verify.
  
  CCMAIL: amantia@kde.org
  CCMAIL: kde-pim@kde.org
................
  r1138278 | link | 2010-06-15 16:49:33 +0200 (Tue, 15 Jun 2010) | 1 line
  
  warnings--
................
  r1138288 | skelly | 2010-06-15 17:38:57 +0200 (Tue, 15 Jun 2010) | 1 line
  
  Fix the patches.
................
  r1138290 | mlaurent | 2010-06-15 17:46:27 +0200 (Tue, 15 Jun 2010) | 2 lines
  
  Fix potential crash
................
  r1138291 | smartins | 2010-06-15 18:07:25 +0200 (Tue, 15 Jun 2010) | 2 lines
  
  Don't crash if the item was deleted while being changed.
................
  r1138305 | smartins | 2010-06-15 18:46:53 +0200 (Tue, 15 Jun 2010) | 11 lines
  
  SVN_SILENT:
  Blocked revisions 1138304 via svnmerge
  
  ........
    r1138304 | smartins | 2010-06-15 16:43:53 +0000 (Tue, 15 Jun 2010) | 4 lines
    
    korg part must be loaded, otherwise when starting kontact on summary view it won't display our stuff.
    
    Fixes kolab/issue4032
  ........
................
  r1138312 | skelly | 2010-06-15 19:02:07 +0200 (Tue, 15 Jun 2010) | 3 lines
  
  Make it possible to rename both books and pages.
  
  The strings "Rename page" and "Page title" already exist in the application.
................
  r1138313 | skelly | 2010-06-15 19:02:10 +0200 (Tue, 15 Jun 2010) | 1 line
  
  Make it possible to copy links for both books and pages.
................
  r1138314 | skelly | 2010-06-15 19:02:11 +0200 (Tue, 15 Jun 2010) | 1 line
  
  Set both the name and displayAttribute of collections when editing them.
................
  r1138325 | mlaurent | 2010-06-15 19:56:15 +0200 (Tue, 15 Jun 2010) | 2 lines
  
  Try to reimplement mail notification
................
  r1138337 | winterz | 2010-06-15 20:12:36 +0200 (Tue, 15 Jun 2010) | 16 lines
  
  SVN_SILENT:
  Blocked revisions 1138292,1138332 via svnmerge
  
  ........
    r1138292 | winterz | 2010-06-15 12:13:43 -0400 (Tue, 15 Jun 2010) | 4 lines
    
    avoid a possible crash in saveSettings by ensuring that the splitters
    sizes have the correct number of entries.
    MERGE: none
  ........
    r1138332 | winterz | 2010-06-15 14:03:17 -0400 (Tue, 15 Jun 2010) | 3 lines
    
    better fixing for the splitter save/restore to avoid crashes.
    MERGE: none
  ........
................
  r1138338 | winterz | 2010-06-15 20:13:30 +0200 (Tue, 15 Jun 2010) | 17 lines
  
  SVN_SILENT:
  Blocked revisions 1138304,1138316 via svnmerge
  
  ........
    r1138304 | smartins | 2010-06-15 12:43:53 -0400 (Tue, 15 Jun 2010) | 4 lines
    
    korg part must be loaded, otherwise when starting kontact on summary view it won't display our stuff.
    
    Fixes kolab/issue4032
  ........
    r1138316 | smartins | 2010-06-15 13:06:15 -0400 (Tue, 15 Jun 2010) | 4 lines
    
    SVN_SILENT:
    
    wether -> whether
  ........
................
  r1138356 | smartins | 2010-06-15 22:17:54 +0200 (Tue, 15 Jun 2010) | 2 lines
  
  include kcalprefs.h in incidencechanger.cpp explicitly and remove it from calendarAdaptor's header file.
................
  r1138363 | smartins | 2010-06-15 22:43:07 +0200 (Tue, 15 Jun 2010) | 6 lines
  
  KResources--
  
  Port todo summary widget to akonadi.
  
  MERGE: none
................
  r1138365 | smartins | 2010-06-15 22:46:55 +0200 (Tue, 15 Jun 2010) | 2 lines
  
  Use another session name.
................
  r1138366 | smartins | 2010-06-15 22:49:22 +0200 (Tue, 15 Jun 2010) | 4 lines
  
  SVN_SILENT:
  
  Remove TODO comment.
................
  r1138369 | smartins | 2010-06-15 22:58:14 +0200 (Tue, 15 Jun 2010) | 2 lines
  
  Fix signal/slot so popup appears.
................
  r1138371 | golnazn | 2010-06-15 23:00:10 +0200 (Tue, 15 Jun 2010) | 1 line
  
  BUG: 226560 Remove trailing slashes from the blog url, before attaching "xmlrpc.php" at the end of it.
................
  r1138375 | smartins | 2010-06-15 23:13:21 +0200 (Tue, 15 Jun 2010) | 2 lines
  
  Add some default parameters.
................
  r1138376 | smartins | 2010-06-15 23:14:54 +0200 (Tue, 15 Jun 2010) | 4 lines
  
  Don't call korganizer.deleteIncidence() through DBUS, we don't need korganizer now.
  
  We have akonadi.
................
  r1138377 | smartins | 2010-06-15 23:18:44 +0200 (Tue, 15 Jun 2010) | 4 lines
  
  SVN_SILENT:
  
  constify
................
  r1138378 | smartins | 2010-06-15 23:22:20 +0200 (Tue, 15 Jun 2010) | 2 lines
  
  Don't delete items twice.
................
  r1138380 | smartins | 2010-06-15 23:26:51 +0200 (Tue, 15 Jun 2010) | 2 lines
  
  Add //TODO:
................
  r1138382 | smartins | 2010-06-15 23:34:47 +0200 (Tue, 15 Jun 2010) | 2 lines
  
  Remove duplicated line
................
  r1138385 | smartins | 2010-06-15 23:43:18 +0200 (Tue, 15 Jun 2010) | 5 lines
  
  Re-order includes.
  
  First kdepim/akonadi then kdepimlibs/akonadi
................
  r1138390 | smartins | 2010-06-16 00:02:19 +0200 (Wed, 16 Jun 2010) | 4 lines
  
  Port the upcoming events widget to akonadi.
  
  KResources--
................
  r1138394 | smartins | 2010-06-16 00:08:49 +0200 (Wed, 16 Jun 2010) | 4 lines
  
  Don't call korganizer.deleteIncidence() through DBUS... we don't need the korganizer interface now.
  
  We have akonadi.
................
  r1138397 | smartins | 2010-06-16 00:21:39 +0200 (Wed, 16 Jun 2010) | 4 lines
  
  Removed unused/deprecated calendarLoaded()/calendarSaved signals
  
  MERGE: none
................
  r1138402 | djarvie | 2010-06-16 01:13:13 +0200 (Wed, 16 Jun 2010) | 4 lines
  
  Rename KCalEvent::Status -> KACalEvent::Type
  Rename KCalEvent::Statuses -> KACalEvent::Types
  Rename KCalEvent -> KACalEvent
................
  r1138404 | smartins | 2010-06-16 01:40:59 +0200 (Wed, 16 Jun 2010) | 4 lines
  
  Don't crash because a collection doesn't have EntityDisplayAttribute set.
  
  Like the birthday resource.
................
  r1138559 | mlaurent | 2010-06-16 10:37:02 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  Clean mail
................
  r1138566 | smartins | 2010-06-16 11:07:26 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  Don't allow to set a collection default if it doesn't have rights to create items.
................
  r1138568 | mlaurent | 2010-06-16 11:13:31 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  Minor fix
................
  r1138569 | smartins | 2010-06-16 11:15:09 +0200 (Wed, 16 Jun 2010) | 3 lines
  
  Someone removed the create item right, so the collection stops being the default calendar until
  user gives it proper rights.
................
  r1138570 | smartins | 2010-06-16 11:19:49 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  Don't add Incidence in a collection without create item rights.
................
  r1138572 | smartins | 2010-06-16 11:28:47 +0200 (Wed, 16 Jun 2010) | 4 lines
  
  s/TodoSummaryWidget/ApptSummaryWidget
  
  and remove const& from Akonadi::Item::Id, it's just qint64
................
  r1138581 | mlaurent | 2010-06-16 11:54:54 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  use setDynamicSortFilter
................
  r1138587 | mlaurent | 2010-06-16 12:04:22 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  Minor optimization
................
  r1138597 | smartins | 2010-06-16 12:18:51 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  Don't delete or change without proper rights.
................
  r1138598 | smartins | 2010-06-16 12:12:36 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  Added FIXME.
................
  r1138611 | smartins | 2010-06-16 12:45:21 +0200 (Wed, 16 Jun 2010) | 4 lines
  
  Anniversary icon wasn't being displayed because code assumed Anniversary as a sub-case if birthday.
  
  At least in trunk, incidences either have ANNIVERSARY or BIRTHDAY custom property, not both.
................
  r1138612 | smartins | 2010-06-16 12:49:03 +0200 (Wed, 16 Jun 2010) | 4 lines
  
  SVN_SILENT:
  
  Copy commit r1138611 to calendarviews.
................
  r1138616 | mlaurent | 2010-06-16 13:04:37 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  Allow to manual sorting
................
  r1138617 | mlaurent | 2010-06-16 13:06:28 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  use setDynamicSortFilter
................
  r1138623 | smartins | 2010-06-16 13:19:30 +0200 (Wed, 16 Jun 2010) | 5 lines
  
  Create the item modify job so the incidence is actually modified.
  
  Mark to-do completed now works.
................
  r1138631 | smartins | 2010-06-16 13:29:51 +0200 (Wed, 16 Jun 2010) | 6 lines
  
  Editing items now works.
  
  We must pass the item id, not the incidence uid anymore.
  
  MERGE: none
................
  r1138632 | smartins | 2010-06-16 13:42:09 +0200 (Wed, 16 Jun 2010) | 2 lines
  
  Rename uid to itemId, so it's clear it's not incidence->uid() that we want here.
................

svn path=/branches/work/komo/kdepim/runtime/; revision=1138635