Skip to content
Commit 765964d4 authored by Volker Krause's avatar Volker Krause
Browse files

SVN_MERGE

Merged revisions 1055214,1055231,1056139,1056141 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/branches/work/akonadi-ports/kdepimlibs

........
  r1055214 | sebsauer | 2009-11-27 16:40:32 +0100 (Fri, 27 Nov 2009) | 1 line
  
  and don't silent eat the error and freeze korganizer but let us know what went wrong and allow to continue working with the consumer process.
........
  r1055231 | sebsauer | 2009-11-27 17:35:09 +0100 (Fri, 27 Nov 2009) | 1 line
  
  don't ignore dbus errors too. here I got an empty defaultId, the resource was not configured and there was no error ondication. Beside empty id's someone can also change the id to be an invalid dbus name like e.g. 'myid.'. So, prevent that too.
........
  r1056139 | sebsauer | 2009-11-29 14:36:08 +0100 (Sun, 29 Nov 2009) | 1 line
  
  no return for void
........
  r1056141 | sebsauer | 2009-11-29 14:38:55 +0100 (Sun, 29 Nov 2009) | 1 line
  
  at least print a warning if something failed
........

svn path=/trunk/KDE/kdepimlibs/; revision=1056439
parent 39ff0619
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment