[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepim (merge)
From:       Volker Krause <vkrause () kde ! org>
Date:       2009-12-29 23:15:37
Message-ID: 1262128537.444434.12808.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1067594 by vkrause:

SVN_MERGE

Merged revisions 1063472,1063476,1063479,1063609,1063885,1063892,1063930,1064066,10641 \
89,1064199,1064202,1064345,1064352,1064355,1064358-1064359,1064361,1064369,1064627,106 \
5265,1065345,1065461,1065916,1066076,1066168,1066176,1066179,1066236,1066243,1066350,1 \
066425-1066427,1066526,1066533,1066542,1066584,1066602,1066615,1066619,1066655,1066694,1066741,1066758,1066832,1066930 \
via svnmerge from  https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1063472 | tmcguire | 2009-12-18 17:20:42 +0100 (Fri, 18 Dec 2009) | 22 lines
  
  (adjusted the unit test since "0" was not a valid priority)
  SVN_MERGE
  Merged revisions 1063457 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1063457 | tmcguire | 2009-12-18 16:55:13 +0100 (Fri, 18 Dec 2009) | 13 lines
    
    SVN_MERGE
    Merged revisions 1063442 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1063442 | tmcguire | 2009-12-18 16:26:12 +0100 (Fri, 18 Dec 2009) | 5 lines
      
      Don't mess up priorities of tasks after a restart.
      The reason were incompatible priority ranges (Kolab goes from 1 to 5, KCal
      goes from 0 to 9).
      Now, we write x-kcal-priority to remeber the full range as well.
    ........
  ................
................
  r1063476 | tmcguire | 2009-12-18 17:39:48 +0100 (Fri, 18 Dec 2009) | 2 lines
  
  Fix priority logic and add test.
................
  r1063479 | tmcguire | 2009-12-18 17:44:35 +0100 (Fri, 18 Dec 2009) | 19 lines
  
  Note: Kolab proxy resource already fixed with r1063476.
  SVN_MERGE
  Merged revisions 1063478 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim
  
  ................
    r1063478 | tmcguire | 2009-12-18 17:42:49 +0100 (Fri, 18 Dec 2009) | 10 lines
    
    SVN_MERGE
    Merged revisions 1063477 via svnmerge from 
    svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1063477 | tmcguire | 2009-12-18 17:41:00 +0100 (Fri, 18 Dec 2009) | 2 lines
      
      Fix reverse logic
    ........
  ................
................
  r1063609 | djarvie | 2009-12-18 23:09:02 +0100 (Fri, 18 Dec 2009) | 2 lines
  
  tabs -> spaces
................
  r1063885 | krake | 2009-12-19 15:17:39 +0100 (Sat, 19 Dec 2009) | 7 lines
  
  Fixing MBox::readEntryHeaders()
  !line[0] == '\n' is never true, left hand side of equality comparison is either \
true or false, not '\n'  
  Adding unit test to check for that
  
  CCMAIL: b.broeksema@kdemail.net
................
  r1063892 | krake | 2009-12-19 15:39:19 +0100 (Sat, 19 Dec 2009) | 6 lines
  
  Fix reading of appended but unsaved data: asserts need to check offset against \
(file size + append buffer size)  
  Extended unit test to check for that
  
  CCMAIL: b.broeksema@kdemail.net
................
  r1063930 | winterz | 2009-12-19 16:44:17 +0100 (Sat, 19 Dec 2009) | 3 lines
  
  make the wizards subdirectory build optional.
  MERGE: 4.3
................
  r1064066 | mmrozowski | 2009-12-20 04:33:25 +0100 (Sun, 20 Dec 2009) | 1 line
  
  Define include dirs in one place.
................
  r1064189 | lueck | 2009-12-20 12:00:44 +0100 (Sun, 20 Dec 2009) | 1 line
  
  typo, rm duplicate period
................
  r1064199 | pino | 2009-12-20 12:21:40 +0100 (Sun, 20 Dec 2009) | 2 lines
  
  use QDir's function instead of getcwd/chdir
................
  r1064202 | krake | 2009-12-20 12:24:23 +0100 (Sun, 20 Dec 2009) | 6 lines
  
  Make libmbox build with -DQT_NO_CAST_FROM_ASCII
  
  - use QLatin1String() for literals
  - QString::fromLatin1() when converting a QByteArray for use with QRegExp
  - QString::fromLocal8Bit() when converting an encoded file name
................
  r1064345 | tmcguire | 2009-12-20 18:47:03 +0100 (Sun, 20 Dec 2009) | 11 lines
  
  Add lots of comment to the various smartQuote() methods, now a human can hopefully \
understand what  they do much more easier.
  
  Also, make the code nicer in places. Not only coding style, but also foreach, saner \
variable names,  and so on.
  
  While at it, fix a bug that smartQuote() would insert a superflous space at the \
beginning of a broken  line.
  
  Add unit tests for smartQuote().
................
  r1064352 | tmcguire | 2009-12-20 19:13:38 +0100 (Sun, 20 Dec 2009) | 2 lines
  
  Add a test for the from line stuff and simplifiy code.
................
  r1064355 | tmcguire | 2009-12-20 19:24:17 +0100 (Sun, 20 Dec 2009) | 1 line
  
  Move the remaining stringutiltests to messageviewer
................
  r1064358 | tmcguire | 2009-12-20 19:26:12 +0100 (Sun, 20 Dec 2009) | 1 line
  
  Revert unwnated parts of the commit.
................
  r1064359 | otrichet | 2009-12-20 19:29:22 +0100 (Sun, 20 Dec 2009) | 3 lines
  
  Fix the behaviour of the "cancel" button of the scoring rules editor when a rule is \
added through the manager  
  BUG: 101092
................
  r1064361 | tmcguire | 2009-12-20 19:31:52 +0100 (Sun, 20 Dec 2009) | 4 lines
  
  Copy over the changed functions from messageviewer/stringutils.
  
  Now the space in quoting bug is gone.
................
  r1064369 | ahartmetz | 2009-12-20 20:19:46 +0100 (Sun, 20 Dec 2009) | 1 line
  
  link with gold (undefined references to QApplication::...)
................
  r1064627 | scripty | 2009-12-21 11:17:46 +0100 (Mon, 21 Dec 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1065265 | otrichet | 2009-12-22 22:16:25 +0100 (Tue, 22 Dec 2009) | 6 lines
  
  Correctly set the path of the url of ArticleFetchJob
  
  Especially don't use QDir::separator() which is '\' on Windows.
  This does not introduce any regression on unix-like platform and should help fixing \
bug  #210602 "KNode/Windows doesn't show message-bodies"  
  BUG: 210602
................
  r1065345 | mlaurent | 2009-12-23 09:14:33 +0100 (Wed, 23 Dec 2009) | 2 lines
  
  Minor optimisation
................
  r1065461 | scripty | 2009-12-23 12:07:06 +0100 (Wed, 23 Dec 2009) | 1 line
  
  SVN_SILENT made messages (.desktop file)
................
  r1065916 | markuss | 2009-12-24 20:51:28 +0100 (Thu, 24 Dec 2009) | 1 line
  
  Fix missing icon
................
  r1066076 | krake | 2009-12-25 18:23:22 +0100 (Fri, 25 Dec 2009) | 2 lines
  
  Make it build with -DQT_NO_CAST_FROM_ASCII
................
  r1066168 | ahartmetz | 2009-12-26 10:01:12 +0100 (Sat, 26 Dec 2009) | 1 line
  
  link with gold
................
  r1066176 | tstaerk | 2009-12-26 10:47:15 +0100 (Sat, 26 Dec 2009) | 1 line
  
  starting a new ktimetracker that can be edited with qtcreator
................
  r1066179 | tstaerk | 2009-12-26 11:03:53 +0100 (Sat, 26 Dec 2009) | 1 line
  
  now have a mainwindow using mainwindow.ui
................
  r1066236 | tstaerk | 2009-12-26 14:08:50 +0100 (Sat, 26 Dec 2009) | 1 line
  
  Add a toolbar.
................
  r1066243 | tstaerk | 2009-12-26 14:20:33 +0100 (Sat, 26 Dec 2009) | 1 line
  
  karm -> ktimetracker
................
  r1066350 | tstaerk | 2009-12-26 21:30:07 +0100 (Sat, 26 Dec 2009) | 1 line
  
  karm->ktimetracker
................
  r1066425 | tstaerk | 2009-12-27 08:26:29 +0100 (Sun, 27 Dec 2009) | 1 line
  
  karm->ktimetracker
................
  r1066426 | tstaerk | 2009-12-27 08:30:59 +0100 (Sun, 27 Dec 2009) | 1 line
  
  karm->ktimetracker
................
  r1066427 | tstaerk | 2009-12-27 08:37:21 +0100 (Sun, 27 Dec 2009) | 1 line
  
  karm->ktimetracker
................
  r1066526 | tstaerk | 2009-12-27 11:16:00 +0100 (Sun, 27 Dec 2009) | 1 line
  
  karm -> ktimetracker
................
  r1066533 | tstaerk | 2009-12-27 11:26:33 +0100 (Sun, 27 Dec 2009) | 2 lines
  
  wiki.kde.org/ktimetracker -> userbase.kde.org/ktimetracker
................
  r1066542 | tstaerk | 2009-12-27 12:21:22 +0100 (Sun, 27 Dec 2009) | 1 line
  
  adding the toolbar to the .ui file as well
................
  r1066584 | tmcguire | 2009-12-27 15:06:31 +0100 (Sun, 27 Dec 2009) | 3 lines
  
  - Use the correct debug area
  - qDebug -> kDebug
................
  r1066602 | tmcguire | 2009-12-27 15:44:38 +0100 (Sun, 27 Dec 2009) | 3 lines
  
  Test running 100 verify jobs in parallel, to track down bug 208353.
  Everything works, so the bug is elsewhere.
................
  r1066615 | tmcguire | 2009-12-27 16:01:23 +0100 (Sun, 27 Dec 2009) | 2 lines
  
  Start a keylistjob after the verify job finishes. Still doesn't crash :(
................
  r1066619 | tmcguire | 2009-12-27 16:13:27 +0100 (Sun, 27 Dec 2009) | 3 lines
  
  Test starting keylist and verify jobs in random time interval.
  Still no crashes.
................
  r1066655 | tmcguire | 2009-12-27 17:28:41 +0100 (Sun, 27 Dec 2009) | 5 lines
  
  Finally, a unit test which actually crashes :)
  Randomly killing jobs seems to trigger the bug.
  
  CCBUG: 208353
................
  r1066694 | tstaerk | 2009-12-27 19:54:07 +0100 (Sun, 27 Dec 2009) | 1 line
  
  We now use rawEvents().
................
  r1066741 | adridg | 2009-12-27 21:12:24 +0100 (Sun, 27 Dec 2009) | 1 line
  
  Use explicit initialization to false instead of relying on default constructor for \
bools; also works around a Sun compiler issue that doesn't understand default \
                initializers for bitfields
................
  r1066758 | adridg | 2009-12-27 22:08:01 +0100 (Sun, 27 Dec 2009) | 1 line
  
  Need explicit surrounding namespace in Sun Studio; this could be \
KMime::Content::clear() instead, but that assumes more about the inheritance \
                hierarchy.
................
  r1066832 | tmcguire | 2009-12-28 03:04:56 +0100 (Mon, 28 Dec 2009) | 2 lines
  
  Possibly fix memory leak: addMenu() doesn't take ownership.
................
  r1066930 | cgiboudeaux | 2009-12-28 12:14:29 +0100 (Mon, 28 Dec 2009) | 1 line
  
  As announced on the buildsystem ML, Nepomuk, Soprano and S.D.O are finally required \
                by kdepim and kdepim-runtime.
................


 _M            . (directory)  
 M  +13 -19    CMakeLists.txt  
 M  +1 -0      blogilo/blogilo.desktop  
 M  +1 -1      blogilo/src/uploadmediadialog.cpp  
 M  +1 -0      doc/kontact-admin/kontact-admin.desktop   [TRAILING SPACE]
 M  +1 -0      examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop  
 M  +1 -1      kaddressbook/xxport/ldap/kcmldap.desktop  
 M  +2 -0      kalarm/akonadi/akonadi_serializer_kalarm.cpp  
 M  +10 -8     kalarm/akonadi/akonadi_serializer_kalarm.h  
 M  +14 -12    kalarm/akonadi/kalarmmimetypevisitor.h  
 M  +2 -0      kalarm/akonadi/kalarmresource.cpp  
 M  +3 -1      kalarm/akonadi/kalarmresource.h  
 M  +6 -6      kleopatra/libkleopatraclient/gui/certificaterequester.cpp  
 M  +113 -6    kleopatra/tests/test_verify.cpp  
 M  +2 -0      kmail/kmail.notifyrc  
 M  +1 -1      knode/knfolder.cpp  
 M  +4 -5      knode/nntpjobs.cpp  
 M  +1 -1      korganizer/plugins/printing/year/yearprint.desktop  
 M  +1 -1      kresources/blog/blog.desktop  
 M  +2 -2      ktimetracker/CMakeLists.txt  
 M  +9 -187    ktimetracker/Mainpage.dox  
 M  +3 -5      ktimetracker/README  
 D             ktimetracker/config-karm.h.cmake  
 A             ktimetracker/config-ktimetracker.h.cmake   \
trunk/KDE/kdepim/ktimetracker/config-ktimetracker.h.cmake#1066542  M  +2 -2      \
ktimetracker/csvexportdialog.h    M  +3 -3      ktimetracker/desktoptracker.h  
 M  +4 -4      ktimetracker/focusdetector.h  
 M  +4 -4      ktimetracker/idletimedetector.h  
 M  +3 -3      ktimetracker/mainwindow.h  
 D             ktimetracker/mainwindow.ui  
 A             ktimetracker/new (directory)   \
trunk/KDE/kdepim/ktimetracker/new#1066542  A             \
ktimetracker/new/CMakeLists.txt   \
trunk/KDE/kdepim/ktimetracker/new/CMakeLists.txt#1066542  A             \
ktimetracker/new/index.txt   trunk/KDE/kdepim/ktimetracker/new/index.txt#1066542  A   \
ktimetracker/new/main.cpp   trunk/KDE/kdepim/ktimetracker/new/main.cpp#1066542 \
[License: GPL (v2+)]  A             ktimetracker/new/mainwindow.cpp   \
trunk/KDE/kdepim/ktimetracker/new/mainwindow.cpp#1066542 [License: GPL (v2+)]  A      \
ktimetracker/new/mainwindow.h   \
trunk/KDE/kdepim/ktimetracker/new/mainwindow.h#1066542 [License: GPL (v2+)]  A        \
ktimetracker/new/mainwindow.ui   \
trunk/KDE/kdepim/ktimetracker/new/mainwindow.ui#1066542  M  +3 -3      \
ktimetracker/plannerparser.cpp    M  +3 -3      ktimetracker/plannerparser.h  
 M  +3 -4      ktimetracker/preferences.h  
 M  +1 -1      ktimetracker/task.cpp  
 M  +0 -6      ktimetracker/taskview.cpp  
 M  +3 -3      ktimetracker/taskview.h  
 M  +3 -4      ktimetracker/timekard.h  
 M  +0 -69     ktimetracker/timetrackerstorage.cpp  
 M  +9 -18     ktimetracker/timetrackerstorage.h  
 M  +4 -1      ktimetracker/timetrackerwidget.cpp  
 M  +1 -1      ktimetracker/tray.h  
 M  +3 -1      libkdepim/kscoring.cpp  
 M  +1 -1      libkleo/backends/chiasmus/chiasmusjob.cpp  
 M  +1 -1      libkleo/backends/qgpgme/qgpgmecryptoconfig.cpp  
 M  +3 -3      libkleo/backends/qgpgme/qgpgmedecryptverifyjob.cpp  
 M  +2 -2      libkleo/backends/qgpgme/qgpgmeprogresstokenmapper.cpp  
 M  +3 -3      libkleo/kleo/job.cpp  
 M  +1 -1      libkleo/kleo/keyfiltermanager.cpp  
 M  +1 -1      libkleo/tests/test_gnupgprocessbase.cpp  
 M  +6 -6      libkleo/tests/test_jobs.cpp  
 M  +1 -1      libkleo/tests/test_keygen.cpp  
 M  +2 -2      libkleo/tests/test_keylister.cpp  
 M  +3 -3      libkleo/tests/test_keyselectiondialog.cpp  
 M  +1 -1      libkleo/ui/dnattributeorderconfigwidget.cpp  
 M  +6 -6      libkleo/ui/keylistview.cpp  
 M  +11 -11    libkleo/ui/keyselectiondialog.cpp  
 M  +5 -5      libkleo/ui/messagebox.cpp  
 M  +6 -6      libkleo/ui/progressbar.cpp  
 M  +3 -3      messagelist/core/view.cpp  
 M  +206 -159  messageviewer/stringutil.cpp  
 M  +15 -6     messageviewer/stringutil.h  
 M  +162 -20   messageviewer/tests/stringutiltest.cpp  
 M  +2 -0      messageviewer/tests/stringutiltest.h  
 M  +1 -2      nepomuk_email_feeder/CMakeLists.txt  
 M  +9 -16     runtime/CMakeLists.txt  
 M  +1 -0      runtime/migration/kaddressbook/kaddressbookmigrator.desktop  
 M  +1 -0      runtime/resources/kolabproxy/kolabproxyresource.desktop  
 M  +91 -5     runtime/resources/kolabproxy/task.cpp  
 M  +12 -0     runtime/resources/kolabproxy/task.h  
 A             runtime/resources/kolabproxy/tests/task/prioritytest1.ics   \
trunk/KDE/kdepim/runtime/resources/kolabproxy/tests/task/prioritytest1.ics#1063930  A \
runtime/resources/kolabproxy/tests/task/prioritytest1.ics.mime   \
trunk/KDE/kdepim/runtime/resources/kolabproxy/tests/task/prioritytest1.ics.mime#1063930
  A             runtime/resources/kolabproxy/tests/task/prioritytest2.ics   \
trunk/KDE/kdepim/runtime/resources/kolabproxy/tests/task/prioritytest2.ics#1063930  A \
runtime/resources/kolabproxy/tests/task/prioritytest2.ics.mime   \
trunk/KDE/kdepim/runtime/resources/kolabproxy/tests/task/prioritytest2.ics.mime#1063930
  M  +1 -0      runtime/resources/kolabproxy/tests/task/simple.ics  
 M  +1 -1      runtime/resources/kolabproxy/tests/task/simple.ics.mime  
 M  +11 -11    runtime/resources/maildir/libmaildir/maildir.cpp  
 M  +1 -1      runtime/resources/maildir/libmaildir/tests/CMakeLists.txt  
 M  +32 -34    runtime/resources/maildir/libmaildir/tests/testmaildir.cpp  
 M  +91 -45    runtime/resources/mbox/libmbox/mbox.cpp  
 M  +4 -3      runtime/resources/mbox/libmbox/tests/CMakeLists.txt  
 M  +3 -3      runtime/resources/mbox/libmbox/tests/mboxbenchmark.cpp  
 M  +80 -13    runtime/resources/mbox/libmbox/tests/mboxtest.cpp  
 M  +1 -0      runtime/resources/mbox/libmbox/tests/mboxtest.h  
 M  +1 -0      runtime/resources/pop3/pop3resource.desktop  


http://websvn.kde.org/?view=rev&revision=1067594


[prev in list] [next in list] [prev in thread] [next in thread]