Hello community, here is the log from the commit of package kdepim3 checked in at Wed May 9 01:13:38 CEST 2007. -------- --- KDE/kdepim3/kdepim3.changes 2007-05-07 14:16:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdepim3/kdepim3.changes 2007-05-08 00:57:25.000000000 +0200 @@ -1,0 +2,5 @@ +Tue May 8 00:57:07 CEST 2007 - dmueller@suse.de + +- update 3_5_BRANCH.diff to pre-3.5.7 for testing + +------------------------------------------------------------------- Old: ---- disable-kitchensync.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim3.spec ++++++ --- /var/tmp/diff_new_pack.s20294/_old 2007-05-09 01:13:05.000000000 +0200 +++ /var/tmp/diff_new_pack.s20294/_new 2007-05-09 01:13:05.000000000 +0200 @@ -29,7 +29,7 @@ Group: System/GUI/KDE Summary: Personal Information Manager Software for KDE Version: 3.5.6 -Release: 29 +Release: 31 URL: http://www.kde.org/ Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) Requires: kdebase3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3` ) @@ -53,7 +53,6 @@ Patch23: kmail-avoid-crash-on-startup.diff Patch24: kmail_attachment_size.diff Patch25: kmail-crash.diff -Patch27: disable-kitchensync.diff Patch28: kmail_allow_tls_login_auth.diff #probably going into 3_5_branch soon Patch29: kmail_remember_dimap_deletions.diff @@ -188,6 +187,7 @@ %prep %setup -q -n kdepim-%{version} %patch0 -E +rm -rf ksync %patch1 %if %is_plus %else @@ -211,7 +211,6 @@ %patch23 %patch24 %patch25 -%patch27 %patch28 %patch29 . /etc/opt/kde3/common_options @@ -688,6 +687,8 @@ /opt/kde3/%_lib/kde3/plugins/designer/kpartsdesignerplugin.* %changelog +* Tue May 08 2007 - dmueller@suse.de +- update 3_5_BRANCH.diff to pre-3.5.7 for testing * Mon May 07 2007 - wstephenson@suse.de - Add stability patch for disconnected imap in KMail/Kontact, using explicit deletion list, fix #263312 ++++++ 3_5_BRANCH.diff ++++++ ++++ 310032 lines (skipped) ++++ between KDE/kdepim3/3_5_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdepim3/3_5_BRANCH.diff ++++++ kmail_remember_dimap_deletions.diff ++++++ --- /var/tmp/diff_new_pack.s20294/_old 2007-05-09 01:13:08.000000000 +0200 +++ /var/tmp/diff_new_pack.s20294/_new 2007-05-09 01:13:08.000000000 +0200 @@ -358,34 +358,6 @@ /** Create the necessary folders for a maildir folder. Usually you will want to use create() instead. ---- kmail/kmfoldermbox.cpp -+++ kmail/kmfoldermbox.cpp -@@ -256,24 +256,8 @@ - - - //----------------------------------------------------------------------------- --void KMFolderMbox::close(const char *owner, bool aForced) -+void KMFolderMbox::reallyDoClose(const char *owner) - { -- if (!aForced) -- assert(mOpenCount >= 0); -- -- if (mOpenCount <= 0 || !mStream) { mOpenCount = 0; return; } -- if (mOpenCount > 0) mOpenCount--; -- if (mOpenCount > 0 && !aForced) { assert(mStream); return; } -- --#if 0 // removed hack that prevented closing system folders (see kmail-devel discussion about mail expiring) -- if ( (folder() != kmkernel->inboxFolder()) -- && folder()->isSystemFolder() && !aForced ) -- { -- mOpenCount = 1; -- return; -- } --#endif -- - if (mAutoCreateIndex) - { - if (KMFolderIndex::IndexOk != indexStatus()) { --- kmail/kmfoldermbox.h +++ kmail/kmfoldermbox.h @@ -79,9 +79,8 @@ @@ -438,3 +410,31 @@ setCentralWidget(mKMMainWidget); setupStatusBar(); if (kmkernel->xmlGuiInstance()) +--- kmail/kmfoldermbox.cpp ++++ kmail/kmfoldermbox.cpp +@@ -256,24 +256,8 @@ int KMFolderMbox::create() + + + //----------------------------------------------------------------------------- +-void KMFolderMbox::close(const char *owner, bool aForced) ++void KMFolderMbox::reallyDoClose( const char *owner ) + { +- if (!aForced) +- assert(mOpenCount >= 0); +- +- if (mOpenCount <= 0 || !mStream) { mOpenCount = 0; return; } +- if (mOpenCount > 0) mOpenCount--; +- if (mOpenCount > 0 && !aForced) { assert(mStream); return; } +- +-#if 0 // removed hack that prevented closing system folders (see kmail-devel discussion about mail expiring) +- if ( (folder() != kmkernel->inboxFolder()) +- && folder()->isSystemFolder() && !aForced ) +- { +- mOpenCount = 1; +- return; +- } +-#endif +- + if (mAutoCreateIndex) + { + if (KMFolderIndex::IndexOk != indexStatus()) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org