Skip to content
  • Volker Krause's avatar
    SVN_MERGE · 354b63df
    Volker Krause authored
    Merged revisions 1144824,1144830,1144880,1144897,1144912,1144963,1144967,1144979,1145016,1145067,1145108,1145120,1145160,1145198,1145244,1145339-1145341,1145344,1145378,1145380-1145381,1145482,1145591,1145641,1145697,1145703,1145904-1145905,1145940,1145951,1145977,1146096,1146102,1146105,1146142,1146167-1146168,1146175-1146178,1146184,1146190,1146199,1146203,1146207-1146208,1146217,1146230,1146261 via svnmerge from 
    svn+ssh://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
    
    ................
      r1144824 | djarvie | 2010-07-01 00:48:17 +0200 (Thu, 01 Jul 2010) | 3 lines
      
      First stab at converting KAlarm to use Akonadi.
      It doesn't work yet, so it still builds by default to use the resources framework.
    ................
      r1144830 | djarvie | 2010-07-01 01:12:13 +0200 (Thu, 01 Jul 2010) | 2 lines
      
      Remove #include for resources header
    ................
      r1144880 | scripty | 2010-07-01 08:53:35 +0200 (Thu, 01 Jul 2010) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ................
      r1144897 | cgiboudeaux | 2010-07-01 11:11:00 +0200 (Thu, 01 Jul 2010) | 1 line
      
      The daily soprano missing include.
    ................
      r1144912 | mutz | 2010-07-01 12:10:13 +0200 (Thu, 01 Jul 2010) | 9 lines
      
      kmail/configuredialog.cpp: fix dialog window stack reshuffling
      
      Opening the GnuPG Backend dialog pushed the settings dialog into the background,
      because the gnupg dialog was created with a null parent.
      
      Also fixed modal dialog allocation to not run into the usual crash-on-exit.
      
      MERGE: 4.5
    ................
      r1144963 | mutz | 2010-07-01 14:31:38 +0200 (Thu, 01 Jul 2010) | 1 line
      
      libkleopatraclient/core/command.cpp: be ever so slightly less mutex-congested
    ................
      r1144967 | mutz | 2010-07-01 14:33:37 +0200 (Thu, 01 Jul 2010) | 1 line
      
      libkleopatraclient: SelectCertificateCommand: compile with QT_NO_CAST_FROM_BYTEARRAY
    ................
      r1144979 | tmcguire | 2010-07-01 14:55:39 +0200 (Thu, 01 Jul 2010) | 11 lines
      
      SVN_SILENT:
      Blocked revisions 1144977 via svnmerge
      
      ........
        r1144977 | tmcguire | 2010-07-01 14:53:19 +0200 (Thu, 01 Jul 2010) | 4 lines
        
        Crossport r1144684 by yurchor from trunk to the enterprise35 branch:
        
        typo fix
      ........
    ................
      r1145016 | mutz | 2010-07-01 15:39:41 +0200 (Thu, 01 Jul 2010) | 4 lines
      
      libkleopatraclient: SelectCertificateCommand: remove unimplemented method
      
      MERGE: 4.5
    ................
      r1145067 | yurchor | 2010-07-01 18:56:00 +0200 (Thu, 01 Jul 2010) | 1 line
      
      typo fix
    ................
      r1145108 | ebrahim | 2010-07-01 21:47:33 +0200 (Thu, 01 Jul 2010) | 3 lines
      
      * Enabled text direction support in message composer of KDEPIM
      * Added a new Text Direction toolbar to KMail message composer
    ................
      r1145120 | winterz | 2010-07-01 22:25:49 +0200 (Thu, 01 Jul 2010) | 13 lines
      
      SVN_SILENT:
      Blocked revisions 1145003,1145005 via svnmerge
      
      ........
        r1145003 | tmcguire | 2010-07-01 09:11:36 -0400 (Thu, 01 Jul 2010) | 1 line
        
        Update Newslog.txt
      ........
        r1145005 | tmcguire | 2010-07-01 09:13:28 -0400 (Thu, 01 Jul 2010) | 1 line
        
        SVN_SILENT Update version numbers for today's release.
      ........
    ................
      r1145160 | ebrahim | 2010-07-02 02:47:31 +0200 (Fri, 02 Jul 2010) | 2 lines
      
      * Reverted commit 1145108 temporarily to avoid depending on recently-changed trunk kdelibs
    ................
      r1145198 | scripty | 2010-07-02 08:46:10 +0200 (Fri, 02 Jul 2010) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ................
      r1145244 | skelly | 2010-07-02 11:59:18 +0200 (Fri, 02 Jul 2010) | 1 line
      
      Handle removals where the last row has children.
    ................
      r1145339 | dfaure | 2010-07-02 17:48:33 +0200 (Fri, 02 Jul 2010) | 3 lines
      
      Don't throw 10 messages boxes at the user, when one is enough
       (e.g. "akonadi version too old", 10 times, due to the nested event loop in the kmessagebox)
    ................
      r1145340 | dfaure | 2010-07-02 17:49:20 +0200 (Fri, 02 Jul 2010) | 4 lines
      
      Cleanup pre-akonadi commented-out code: we don't need to abort mailchecks when closing the last window
       [which used to prevent the process from quitting, due to KIO jobs holding KGlobal::ref]
      now that mailchecks are done by akonadi's resources.
    ................
      r1145341 | dfaure | 2010-07-02 17:50:48 +0200 (Fri, 02 Jul 2010) | 4 lines
      
      Wrote a sample program for MessageViewer::Viewer, which can either display a fake mail or open one from a file.
      The goal was in fact to test if copy/pasting the headers was still inserting too many newlines, but it looks like
      this got fixed (compared to 4.4) by the use of webkit.
    ................
      r1145344 | dfaure | 2010-07-02 17:53:58 +0200 (Fri, 02 Jul 2010) | 2 lines
      
      Add a Cancel button to the first msgbox that pops up, so that one can abort the whole thing.
    ................
      r1145378 | momeny | 2010-07-02 20:19:34 +0200 (Fri, 02 Jul 2010) | 3 lines
      
      Using KStatusNotifierItem instead of old fashion KSystemTrayIcon
      
      P.S: Can/Should I commit this to 4.5 branch?
    ................
      r1145380 | momeny | 2010-07-02 20:24:41 +0200 (Fri, 02 Jul 2010) | 1 line
      
      BUG:241931 FIXED, From bug info: If you try to retrieve the categories for a blog that does not support retrieving them, blogilo starts a busy indicator which never stops.
    ................
      r1145381 | momeny | 2010-07-02 20:24:50 +0200 (Fri, 02 Jul 2010) | 1 line
      
      SVN_SILENT minor fix + version changed to 1.0.2
    ................
      r1145482 | scripty | 2010-07-03 08:56:50 +0200 (Sat, 03 Jul 2010) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ................
      r1145591 | winterz | 2010-07-03 15:19:35 +0200 (Sat, 03 Jul 2010) | 16 lines
      
      SVN_SILENT:
      Blocked revisions 1143877,1145278 via svnmerge
      
      ........
        r1143877 | smartins | 2010-06-28 20:01:35 -0400 (Mon, 28 Jun 2010) | 7 lines
        
        Don't segfault when composing a message if compiled with gcc >= 4.4.
        
        gcc bug? anyway the virtual isn't needed there, we already have:
        class MailComposerIface : virtual public DCOPObject.
      ........
        r1145278 | ludwigreiter | 2010-07-02 07:43:01 -0400 (Fri, 02 Jul 2010) | 1 line
        
        Update after test of newslog 2010-07-01
      ........
    ................
      r1145641 | rdieter | 2010-07-03 17:56:10 +0200 (Sat, 03 Jul 2010) | 2 lines
      
      fix desktop-file-validate errors
    ................
      r1145697 | dfaure | 2010-07-03 22:35:48 +0200 (Sat, 03 Jul 2010) | 3 lines
      
      Fix bug where the "Modify" button would be wrongly enabled or disabled, because the selection hasn't been updated yet at currentChanged() (mousePress) time.
      And anyway if the state of the modify button depends on the number of items in the selection, then better connect to selectionChanged().
    ................
      r1145703 | dfaure | 2010-07-03 22:52:22 +0200 (Sat, 03 Jul 2010) | 3 lines
      
      Fix crash on exit when an expiry job was still running. Not sure why this didn't happen in kde3 though...
      (~JobScheduler deletes task, and then -> ~ExpiryJob -> ~FolderJob -> JobScheduler::slotJobFinished, deletes task again)
    ................
      r1145904 | djarvie | 2010-07-04 16:51:48 +0200 (Sun, 04 Jul 2010) | 2 lines
      
      kdescendantsproxymodel is not in kdelibs
    ................
      r1145905 | lfranchi | 2010-07-04 16:52:42 +0200 (Sun, 04 Jul 2010) | 2 lines
      
      Add documentation to mementors and temp nodes
    ................
      r1145940 | cgiboudeaux | 2010-07-04 19:42:05 +0200 (Sun, 04 Jul 2010) | 1 line
      
      No need to complain if GrantleeConfig.cmake cannot be found.
    ................
      r1145951 | tmcguire | 2010-07-04 20:35:00 +0200 (Sun, 04 Jul 2010) | 1 line
      
      Enable interval check on startup.
    ................
      r1145977 | lfranchi | 2010-07-04 22:37:53 +0200 (Sun, 04 Jul 2010) | 2 lines
      
      move some crypto messagecomposertest stuff to messagecore/tests so we can re-use it in messageviewer objecttreeparser tests
    ................
      r1146096 | mutz | 2010-07-05 09:46:39 +0200 (Mon, 05 Jul 2010) | 14 lines
      
      libkleopateaclient: Support pre-selecting certificates in Gui::CertificateRequester
      
      KleopatraClient::Command:
      - clean up Assuan v1 vs. v1 mess with a typedef.
      - make it possible for Command subclasses to react to INQUIREies from the server.
      
      KleopatraClient::SelectCertificateCommand:
      - implement setSelectedCertificates()
      
      Kleo::SelectCertificateCommand:
      - Assuan-INQUIRE certificates to preselect
      
      MERGE: 4.5 (consider it a bugfix)
    ................
      r1146102 | mutz | 2010-07-05 10:29:15 +0200 (Mon, 05 Jul 2010) | 3 lines
      
      libkleopatraclient: add support for RECIPIENT and SENDER options to Command
      
      MERGE: none
    ................
      r1146105 | cgiboudeaux | 2010-07-05 10:40:35 +0200 (Mon, 05 Jul 2010) | 1 line
      
      SVN_SILENT ignore 'Resource is deprecated'
    ................
      r1146142 | tmcguire | 2010-07-05 12:16:43 +0200 (Mon, 05 Jul 2010) | 1 line
      
      Remove #ifdef'd code
    ................
      r1146167 | tmcguire | 2010-07-05 14:24:51 +0200 (Mon, 05 Jul 2010) | 1 line
      
      Callling exec() once is enough.
    ................
      r1146168 | tmcguire | 2010-07-05 14:24:57 +0200 (Mon, 05 Jul 2010) | 1 line
      
      Add FIXMEs
    ................
      r1146175 | tmcguire | 2010-07-05 14:47:51 +0200 (Mon, 05 Jul 2010) | 1 line
      
      Add some const
    ................
      r1146176 | tmcguire | 2010-07-05 14:47:53 +0200 (Mon, 05 Jul 2010) | 1 line
      
      Initalize variable
    ................
      r1146177 | tmcguire | 2010-07-05 14:47:55 +0200 (Mon, 05 Jul 2010) | 4 lines
      
      Remove singleshot timers, so that the composer can finish in one go.
      
      This makes autosaving not use the event loop, which is very dangerous.
      Add a test for that autosaving case.
    ................
      r1146178 | tmcguire | 2010-07-05 14:47:57 +0200 (Mon, 05 Jul 2010) | 1 line
      
      Add warning
    ................
      r1146184 | krake | 2010-07-05 15:08:41 +0200 (Mon, 05 Jul 2010) | 2 lines
      
      Make it build witt QT_NO_CAST_FROM_ASCII
    ................
      r1146190 | mlaurent | 2010-07-05 15:34:48 +0200 (Mon, 05 Jul 2010) | 3 lines
      
      Fix " Bug 243631 -  Akonadi migrator: does not read password stored in the config file"
      CCBUG: 243631
    ................
      r1146199 | otrichet | 2010-07-05 15:50:57 +0200 (Mon, 05 Jul 2010) | 1 line
      
      Change URL to http://userbase.kde.org/KNode
    ................
      r1146203 | tokoe | 2010-07-05 15:53:25 +0200 (Mon, 05 Jul 2010) | 2 lines
      
      link with gold
    ................
      r1146207 | tokoe | 2010-07-05 15:52:02 +0200 (Mon, 05 Jul 2010) | 2 lines
      
      link with gold *grumble*
    ................
      r1146208 | mlaurent | 2010-07-05 16:05:32 +0200 (Mon, 05 Jul 2010) | 2 lines
      
      not necessary to use a default value
    ................
      r1146217 | tmcguire | 2010-07-05 16:28:37 +0200 (Mon, 05 Jul 2010) | 1 line
      
      Undo folder creation which was done by mistake
    ................
      r1146230 | lfranchi | 2010-07-05 16:45:33 +0200 (Mon, 05 Jul 2010) | 2 lines
      
      Fix replying to messages with non-utf8 charsets.
    ................
      r1146261 | mlaurent | 2010-07-05 17:46:11 +0200 (Mon, 05 Jul 2010) | 2 lines
      
      Update menu action
    ................
    
    svn path=/branches/work/komo/kdepim/runtime/; revision=1146271
    354b63df