Skip to content
  • Volker Krause's avatar
    SVN_MERGE · 8fd21ce2
    Volker Krause authored
    Merged revisions 1135074,1135089,1135094-1135095,1135101,1135103,1135112-1135113,1135121,1135211-1135212,1135215,1135218 via svnmerge from 
    https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
    
    ........
      r1135074 | smartins | 2010-06-06 12:23:50 +0200 (Sun, 06 Jun 2010) | 6 lines
      
      The parent is already inside the list.
      
      Also, fix the hang, the list size changed so the index never reached the end.
      
      BUG: 233875
    ........
      r1135089 | mlaurent | 2010-06-06 13:23:19 +0200 (Sun, 06 Jun 2010) | 2 lines
      
      Fix save password in wallet
    ........
      r1135094 | mlaurent | 2010-06-06 13:54:50 +0200 (Sun, 06 Jun 2010) | 6 lines
      
      Fix ask manual password when wallet is open but password is not stored
      in wallet. When we use kmail-migration, authentification failed and
      doesn't ask manual authentification in this case
      => imap account can't migrate.
      Now It's ok for my account imap
    ........
      r1135095 | mlaurent | 2010-06-06 13:57:41 +0200 (Sun, 06 Jun 2010) | 3 lines
      
      why "const &auto" ?
      use directly variable
    ........
      r1135101 | krake | 2010-06-06 14:23:10 +0200 (Sun, 06 Jun 2010) | 2 lines
      
      Desktop-entry list fields need to be terminated with semicolons according to spec (without kbuildsycoca4 generates a warning at runtime)
    ........
      r1135103 | krake | 2010-06-06 14:26:59 +0200 (Sun, 06 Jun 2010) | 3 lines
      
      ICAL resource no longer supports AutosaveInterval.
      This generated a warning at runtime when firstrun tries to configure the resource
    ........
      r1135112 | krake | 2010-06-06 15:15:06 +0200 (Sun, 06 Jun 2010) | 4 lines
      
      Make the Akonadi resource configuration KCM show up in system settings.
      It was in there before but got removed because it also contained Akonadi server config.
      This has now been moved to a separate KCM so the one for resources can be readded
    ........
      r1135113 | krake | 2010-06-06 15:17:01 +0200 (Sun, 06 Jun 2010) | 2 lines
      
      Add the comments from the original KCM.
    ........
      r1135121 | mlaurent | 2010-06-06 15:52:53 +0200 (Sun, 06 Jun 2010) | 2 lines
      
      Remove trash entry
    ........
      r1135211 | mlaurent | 2010-06-06 22:05:27 +0200 (Sun, 06 Jun 2010) | 4 lines
      
      not necessary to have 2 functions connected to same signal
      Create an unique function which will call theses two functions.
      and be sure that config is saved
    ........
      r1135212 | mlaurent | 2010-06-06 22:07:29 +0200 (Sun, 06 Jun 2010) | 2 lines
      
      Minor fix
    ........
      r1135215 | mlaurent | 2010-06-06 22:20:48 +0200 (Sun, 06 Jun 2010) | 3 lines
      
      Remove some entry not necessary
      and add todo
    ........
      r1135218 | mlaurent | 2010-06-06 22:48:46 +0200 (Sun, 06 Jun 2010) | 2 lines
      
      Add missing i18n
    ........
    
    svn path=/branches/work/komo/kdepim/runtime/; revision=1135423
    8fd21ce2