# ChangeLog for kde-base/kdepim
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.299 2008/02/17 02:12:01 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.300 2008/02/18 23:46:31 ingmar Exp $
+
+ 18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+ -files/libkcal-3.5.2-fixes.diff, -files/kmail-3.5.5-dimap-mail-loss.patch,
+ -files/kmail-3.5.6-kde-bug-140660.patch,
+ -files/kmail-3.5.6-templates.patch,
+ -files/akregator-3.5.7-customcolors.diff, -files/kmail-utf8.diff,
+ -files/korganizer-3.5.5-desktop.patch, -files/kmail-3.5.7-filters.patch,
+ -files/libkcal-3.5.7-recurring_194371.patch, -kdepim-3.5.5-r2.ebuild,
+ -kdepim-3.5.5-r4.ebuild, -kdepim-3.5.6-r3.ebuild:
+ Clean old versions.
16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> -kdepim-3.5.5-r3.ebuild,
-kdepim-3.5.6-r1.ebuild, -kdepim-3.5.6-r2.ebuild, -kdepim-3.5.7.ebuild,
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX akregator-3.5.7-customcolors.diff 11558 RMD160 74ba8c86c208d605d51be53d39de2d58e6fc7c4f SHA1 321387cb813d0615a5760f5d5ed107b344a88e8a SHA256 32673cc1456233b3015832189ca6df7daea3bc8fead527bf3b9fedaae0c3cef1
-AUX kmail-3.5.5-dimap-mail-loss.patch 9870 RMD160 8abfe56734cc94917e4ffc94029414789692e8da SHA1 d8396dcda5d2ed6c5cb2fad66c1a2cb98a1a8752 SHA256 30992bb319dff9ef45c3b44873284346e7727f5982835d97af44030511e3a636
-AUX kmail-3.5.6-kde-bug-140660.patch 577 RMD160 ffc625a1561d5e2134cc4130887cbb7455e9d076 SHA1 e97ad7fdd1f521de3c59f722bdb2496ed533cc89 SHA256 f0c57fe9ab07ed0cbeffa1a83ede5f2defa99c8299265eb43f66c97a6daa7311
-AUX kmail-3.5.6-templates.patch 875 RMD160 7aabcdf2e7c68ae0d90709e332a0da4afc9a24f9 SHA1 596bfe6028db4d0f54d7f88d31f461a28c64a778 SHA256 096382a01c2e80db89b6b08a7f1959bf53b3e08f0c74b7d310b6672b630e8cbe
-AUX kmail-3.5.7-filters.patch 6793 RMD160 1a4f2331317c332c3779231302db1300ef010259 SHA1 70a44770ff214d814fd8b167ca47733294c22e97 SHA256 e41c85a1b103fe992f7359009e9b10e88a345a8ecd8d62e02e656731d1beb7a9
-AUX kmail-utf8.diff 588 RMD160 d0ea21d1d794ddd2ddf382ac47176a2db4471d98 SHA1 5fcdad4ab0473a9be8a18d56060b830651112460 SHA256 cc875741040d45c7a76eeae230e7bb6270970f2df7a41ed14b0854a601f68e72
-AUX korganizer-3.5.5-desktop.patch 7617 RMD160 7c9df08009a11bb1d4886c175754dbe99651b4ca SHA1 e2e57cae2a642adb495d4b7ab3102e34e99d6549 SHA256 e0cf3744a797f568bcbc4ae2fb9003a27fc13cf235cbd36be9212513354da82e
-AUX libkcal-3.5.2-fixes.diff 1620 RMD160 3e915689d11700ac717ff265c5bb47e07f62ccc1 SHA1 fe13df742aa515d89399f84f9f6cd3d999927856 SHA256 74f09abc0133576508e0617f51b574201789ef60080500effbe6fd9bb97dea5b
-AUX libkcal-3.5.7-recurring_194371.patch 9267 RMD160 0c73f8ee839e84a47adae5cff971ecbb51cd752f SHA1 ec29620f15816524b33d0ed731e3aaf77497fc0a SHA256 84602f4698cc0d7a0bb9b272d688e8a4a94bd4966f6bceb55dc081e14ef052f6
-DIST kdepim-3.5-patchset-02.tar.bz2 4208 RMD160 93e1e0c760278b233ff3d7096154168f6fbcf65a SHA1 7b4e565a7376a66fc49198c014c95bd445806b0b SHA256 8c91e5359e58710b5bc8e51b30058f41870a93bbda8b1a5fffc1af91a82128dd
-DIST kdepim-3.5-patchset-03.tar.bz2 121475 RMD160 e8aa4e812a3be3d4e13429d487e1e4d466e058b1 SHA1 2c924af34a5bb3562b17b861b63df59c0341298f SHA256 30d4e8d7ac4e11f1a8209bbcb5b39beb044998d4b0d3fa810743a017b38b904b
DIST kdepim-3.5-patchset-04.tar.bz2 133990 RMD160 9d9fd1e7b04512f1f28bba78d5eeadfc3e3280ba SHA1 ff535be3a60938382094642af18776a529620209 SHA256 8b1968a7bef8ab2efdb2d87e96943ce636775b76365bc1bc99e1e377f9abfc61
-DIST kdepim-3.5.5.tar.bz2 12908968 RMD160 5bdcf98909f450ce3839fa72a404571f6cde22f6 SHA1 612f34307c5fac9279c85a4efb1488db4b438f12 SHA256 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047
-DIST kdepim-3.5.6.tar.bz2 13643798 RMD160 85f64349d8eedb531895a3591f6fee07c68bf1eb SHA1 a84ad8dd9f84eb3f33070e07ed56f6d694db2cb4 SHA256 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55
DIST kdepim-3.5.8.tar.bz2 14107449 RMD160 bb34c7e88227a1ebdd8ff38ee41445f85969175e SHA1 8284db2d3d767228cfb2cad4bf8d5221848d64f2 SHA256 433f8541af0a05e0a7e15df5ecca8463a29b6574871b941a8312b04b2233fef1
-EBUILD kdepim-3.5.5-r2.ebuild 1394 RMD160 62e071086049d63642630e1875c515c58c80cc0b SHA1 57b9cc16f781438b8f2999ec83732b1acde3c3a9 SHA256 6465856eb5a96928ddf421792a03e94e7d921b7cfaf7ac0f1a60a9584b7c5530
-EBUILD kdepim-3.5.5-r4.ebuild 1446 RMD160 555db158a10b33fc0b6036a1e9e8ec4c1d784d30 SHA1 84ac3b4132aec25d3f6c270c99b38a2611be62c8 SHA256 359fd0f9bb6ec24b94d2ff9e7f96a1a18720b9ba309a918d18b37b09bfb41e4a
-EBUILD kdepim-3.5.6-r3.ebuild 2062 RMD160 a713c21787f0de9d1fa15a54a4a874cc8400a886 SHA1 925d16a2e470a90028812a05f90e036672c83ce6 SHA256 60b59e64d7b6ffdc443043389165cb89990d3c9d8e7348b2bcad01d58462c59c
EBUILD kdepim-3.5.8.ebuild 1587 RMD160 099e4d8555eebc2b00ca32cd84afbed922f54218 SHA1 10d22f525f909c96334be564ef2e1fb79c017355 SHA256 de1e022eef7d131467a2de62722692b40559306fc0f9c5fe2c05c3005a7c533f
-MISC ChangeLog 41081 RMD160 17897657f46a6eb59b23057c8b1d5f06b4ad15fd SHA1 29617700e07f91852a8e46247404b39a897beed1 SHA256 62f1bc808999ceaf477b9492cbbffc750ef539788cbd010da0349fefc8e7b064
+MISC ChangeLog 41581 RMD160 9413cdcd390dd978ac0a3291cd5cf1bef66fd0e0 SHA1 59d8638bae0163461410817dc5c393296b2713ab SHA256 ed9e450b0f4ee5411ab3dc264dc7fbed34104509b76eba406523a448cad1b6f9
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFHt5fXB18eXLOpYdkRAuP1AJ9A0Hyr19R6NjI44ylMxkGwJRblmgCgivDL
-Rhadi9Ezvhah+JxY2P9/6CQ=
-=I52T
+iD8DBQFHuhiiB18eXLOpYdkRAvRqAJ0fYmknfi+fefy4dV2rUxVxHQfvygCeMZ/0
+jm0h0YGOCfIlfv0qyWZihDM=
+=9JZN
-----END PGP SIGNATURE-----
+++ /dev/null
-Index: akregator.kcfg
-===================================================================
---- akregator/src/akregator.kcfg (revision 573936)
-+++ akregator/src/akregator.kcfg (working copy)
-@@ -40,6 +40,16 @@
- <entry key="Fixed Font" type="String" />
- <entry key="Serif Font" type="String" />
- <entry key="Sans Serif Font" type="String" />
-+ <entry key="UseCustomColors" type="Bool">
-+ <default>false</default>
-+ </entry>
-+ <entry key="ColorUnreadArticles" type="Color">
-+ <default>#0000FF</default>
-+ </entry>
-+ <entry key="ColorNewArticles" type="Color">
-+ <default>#FF0000</default>
-+ </entry>
-+
- </group>
- <group name="HTML Settings" >
- <entry key="Fonts" type="StringList" />
-Index: articlelistview.cpp
-===================================================================
---- akregator/src/articlelistview.cpp (revision 573936)
-+++ akregator/src/articlelistview.cpp (working copy)
-@@ -181,15 +181,20 @@
- QColorGroup cg2(cg);
-
- if (article().status() == Article::Unread)
-- cg2.setColor(QColorGroup::Text, Qt::blue);
-+ cg2.setColor(QColorGroup::Text, Settings::useCustomColors() ? Settings::colorUnreadArticles() : Qt::blue);
- else // New
-- cg2.setColor(QColorGroup::Text, Qt::red);
-+ cg2.setColor(QColorGroup::Text, Settings::useCustomColors() ? Settings::colorNewArticles() : Qt::red);
-
- KListViewItem::paintCell( p, cg2, column, width, align );
- }
-
- }
-
-+void ArticleListView::slotPaletteOrFontChanged()
-+{
-+ triggerUpdate();
-+}
-+
- void ArticleListView::ArticleItem::updateItem(const Article& article)
- {
- m_article = article;
-Index: articlelistview.h
-===================================================================
---- akregator/src/articlelistview.h (revision 573936)
-+++ akregator/src/articlelistview.h (working copy)
-@@ -80,6 +80,8 @@
- /** selects next unread article in list view, first unread article if no article was selected */
- void slotNextUnreadArticle();
-
-+ void slotPaletteOrFontChanged();
-+
- signals:
- void signalArticleChosen(const Article& article);
- void signalDoubleClicked(const Article&, const QPoint&, int);
-Index: settings_appearance.ui
-===================================================================
---- akregator/src/settings_appearance.ui (revision 573936)
-+++ akregator/src/settings_appearance.ui (working copy)
-@@ -10,20 +10,20 @@
- <x>0</x>
- <y>0</y>
- <width>418</width>
-- <height>377</height>
-+ <height>566</height>
- </rect>
- </property>
- <property name="caption">
- <string>General</string>
- </property>
-- <vbox>
-+ <grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
-- <widget class="QGroupBox">
-+ <widget class="QGroupBox" row="1" column="0">
- <property name="name">
- <cstring>groupBox3</cstring>
- </property>
-@@ -114,8 +114,25 @@
- </widget>
- </grid>
- </widget>
-- <widget class="QGroupBox">
-+ <spacer row="4" column="0">
- <property name="name">
-+ <cstring>spacer1</cstring>
-+ </property>
-+ <property name="orientation">
-+ <enum>Vertical</enum>
-+ </property>
-+ <property name="sizeType">
-+ <enum>Expanding</enum>
-+ </property>
-+ <property name="sizeHint">
-+ <size>
-+ <width>20</width>
-+ <height>41</height>
-+ </size>
-+ </property>
-+ </spacer>
-+ <widget class="QGroupBox" row="2" column="0">
-+ <property name="name">
- <cstring>FontsGroupBox</cstring>
- </property>
- <property name="title">
-@@ -179,7 +196,7 @@
- </widget>
- </grid>
- </widget>
-- <widget class="QCheckBox">
-+ <widget class="QCheckBox" row="3" column="0">
- <property name="name">
- <cstring>kcfg_UnderlineLinks</cstring>
- </property>
-@@ -187,24 +204,99 @@
- <string>&Underline links</string>
- </property>
- </widget>
-- <spacer>
-+ <widget class="QGroupBox" row="0" column="0">
- <property name="name">
-- <cstring>spacer1</cstring>
-+ <cstring>groupBox3_2</cstring>
- </property>
-- <property name="orientation">
-- <enum>Vertical</enum>
-+ <property name="title">
-+ <string>Article List Colors</string>
- </property>
-- <property name="sizeType">
-- <enum>Expanding</enum>
-- </property>
-- <property name="sizeHint">
-- <size>
-- <width>20</width>
-- <height>41</height>
-- </size>
-- </property>
-- </spacer>
-- </vbox>
-+ <grid>
-+ <property name="name">
-+ <cstring>unnamed</cstring>
-+ </property>
-+ <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
-+ <property name="name">
-+ <cstring>kcfg_UseCustomColors</cstring>
-+ </property>
-+ <property name="text">
-+ <string>Use custom colors</string>
-+ </property>
-+ </widget>
-+ <widget class="QLayoutWidget" row="1" column="0">
-+ <property name="name">
-+ <cstring>layout1</cstring>
-+ </property>
-+ <grid>
-+ <property name="name">
-+ <cstring>unnamed</cstring>
-+ </property>
-+ <widget class="QLabel" row="0" column="0">
-+ <property name="name">
-+ <cstring>lbl_unreadArticles</cstring>
-+ </property>
-+ <property name="enabled">
-+ <bool>false</bool>
-+ </property>
-+ <property name="text">
-+ <string>Unread articles</string>
-+ </property>
-+ </widget>
-+ <widget class="KColorButton" row="1" column="1">
-+ <property name="name">
-+ <cstring>kcfg_ColorNewArticles</cstring>
-+ </property>
-+ <property name="enabled">
-+ <bool>false</bool>
-+ </property>
-+ <property name="text">
-+ <string></string>
-+ </property>
-+ </widget>
-+ <widget class="KColorButton" row="0" column="1">
-+ <property name="name">
-+ <cstring>kcfg_ColorUnreadArticles</cstring>
-+ </property>
-+ <property name="enabled">
-+ <bool>false</bool>
-+ </property>
-+ <property name="text">
-+ <string></string>
-+ </property>
-+ </widget>
-+ <widget class="QLabel" row="1" column="0">
-+ <property name="name">
-+ <cstring>lbl_newArticles</cstring>
-+ </property>
-+ <property name="enabled">
-+ <bool>false</bool>
-+ </property>
-+ <property name="text">
-+ <string>New articles</string>
-+ </property>
-+ </widget>
-+ </grid>
-+ </widget>
-+ <spacer row="1" column="1">
-+ <property name="name">
-+ <cstring>spacer2</cstring>
-+ </property>
-+ <property name="orientation">
-+ <enum>Horizontal</enum>
-+ </property>
-+ <property name="sizeType">
-+ <enum>Expanding</enum>
-+ </property>
-+ <property name="sizeHint">
-+ <size>
-+ <width>110</width>
-+ <height>20</height>
-+ </size>
-+ </property>
-+ </spacer>
-+ </grid>
-+ </widget>
-+ </grid>
- </widget>
- <customwidgets>
- </customwidgets>
-@@ -233,18 +325,38 @@
- <receiver>kcfg_MinimumFontSize</receiver>
- <slot>setValue(int)</slot>
- </connection>
-+ <connection>
-+ <sender>kcfg_UseCustomColors</sender>
-+ <signal>toggled(bool)</signal>
-+ <receiver>kcfg_ColorUnreadArticles</receiver>
-+ <slot>setEnabled(bool)</slot>
-+ </connection>
-+ <connection>
-+ <sender>kcfg_UseCustomColors</sender>
-+ <signal>toggled(bool)</signal>
-+ <receiver>kcfg_ColorNewArticles</receiver>
-+ <slot>setEnabled(bool)</slot>
-+ </connection>
-+ <connection>
-+ <sender>kcfg_UseCustomColors</sender>
-+ <signal>toggled(bool)</signal>
-+ <receiver>lbl_unreadArticles</receiver>
-+ <slot>setEnabled(bool)</slot>
-+ </connection>
-+ <connection>
-+ <sender>kcfg_UseCustomColors</sender>
-+ <signal>toggled(bool)</signal>
-+ <receiver>lbl_newArticles</receiver>
-+ <slot>setEnabled(bool)</slot>
-+ </connection>
- </connections>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-- <includehint>knuminput.h</includehint>
-- <includehint>knuminput.h</includehint>
- <includehint>kfontcombo.h</includehint>
-- <includehint>klineedit.h</includehint>
- <includehint>kfontcombo.h</includehint>
-- <includehint>klineedit.h</includehint>
- <includehint>kfontcombo.h</includehint>
-- <includehint>klineedit.h</includehint>
- <includehint>kfontcombo.h</includehint>
-- <includehint>klineedit.h</includehint>
-+ <includehint>kcolorbutton.h</includehint>
-+ <includehint>kcolorbutton.h</includehint>
- </includehints>
- </UI>
-Index: akregator_view.cpp
-===================================================================
---- akregator/src/akregator_view.cpp (revision 577072)
-+++ akregator/src/akregator_view.cpp (working copy)
-@@ -297,6 +297,8 @@
- connect( m_articleList, SIGNAL(signalDoubleClicked(const Article&, const QPoint&, int)),
- this, SLOT( slotOpenArticleExternal(const Article&, const QPoint&, int)) );
-
-+ connect( m_part, SIGNAL(signalSettingsChanged()), m_articleList, SLOT(slotPaletteOrFontChanged()));
-+
- m_articleViewer = new ArticleViewer(m_articleSplitter, "article_viewer");
- m_articleViewer->setSafeMode(); // disable JS, Java, etc...
-
+++ /dev/null
-Index: kmail/kmfoldercachedimap.cpp
-===================================================================
---- kmail/kmfoldercachedimap.cpp (revision 597658)
-+++ kmail/kmfoldercachedimap.cpp (revision 597659)
-@@ -150,10 +151,22 @@
- mFolderRemoved( false ),
- /*mHoldSyncs( false ),*/ mRecurse( true ),
- mStatusChangedLocally( false ), mAnnotationFolderTypeChanged( false ),
-- mIncidencesForChanged( false ), mPersonalNamespacesCheckDone( true )
-+ mIncidencesForChanged( false ), mPersonalNamespacesCheckDone( true ),
-+ mFoundAnIMAPDigest( false )
- {
- setUidValidity("");
-- readUidCache();
-+ // if we fail to read a uid file but there is one, nuke it
-+ if ( readUidCache() == -1 ) {
-+ if ( QFile::exists( uidCacheLocation() ) ) {
-+ KMessageBox::error( 0,
-+ i18n( "The UID cache file for folder %1 could not be read. There "
-+ "could be a problem with file system permission, or it is corrupted."
-+ ).arg( folder->prettyURL() ) );
-+ // try to unlink it, in case it was corruped. If it couldn't be read
-+ // because of permissions, this will fail, which is fine
-+ unlink( QFile::encodeName( uidCacheLocation() ) );
-+ }
-+ }
-
- mProgress = 0;
- }
-@@ -306,7 +319,7 @@
- if( uidValidity().isEmpty() || uidValidity() == "INVALID" ) {
- // No info from the server yet, remove the file.
- if( QFile::exists( uidCacheLocation() ) )
-- unlink( QFile::encodeName( uidCacheLocation() ) );
-+ return unlink( QFile::encodeName( uidCacheLocation() ) );
- return 0;
- }
-
-@@ -317,17 +330,23 @@
- str << uidValidity() << endl;
- str << lastUid() << endl;
- uidcache.flush();
-- fsync( uidcache.handle() ); /* this is probably overkill */
-- uidcache.close();
-- return 0;
-- } else {
-- return errno; /* does QFile set errno? */
-+ if ( uidcache.status() == IO_Ok ) {
-+ fsync( uidcache.handle() ); /* this is probably overkill */
-+ uidcache.close();
-+ if ( uidcache.status() == IO_Ok )
-+ return 0;
-+ }
- }
-+ KMessageBox::error( 0,
-+ i18n( "The UID cache file for folder %1 could not be written. There "
-+ "could be a problem with file system permission." ).arg( folder()->prettyURL() ) );
-+
-+ return -1;
- }
-
- void KMFolderCachedImap::reloadUidMap()
- {
-- kdDebug(5006) << "Reloading Uid Map " << endl;
-+ //kdDebug(5006) << "Reloading Uid Map " << endl;
- uidMap.clear();
- open();
- for( int i = 0; i < count(); ++i ) {
-@@ -448,7 +467,8 @@
- {
- killTimer( uidWriteTimer );
- uidWriteTimer = -1;
-- writeUidCache();
-+ if ( writeUidCache() == -1 )
-+ unlink( QFile::encodeName( uidCacheLocation() ) );
- }
-
- ulong KMFolderCachedImap::lastUid()
-@@ -467,10 +487,22 @@
- QMap<ulong,int>::Iterator it = uidMap.find( uid );
- if( it != uidMap.end() ) {
- KMMsgBase *msg = getMsgBase( *it );
-+#ifdef MAIL_LOSS_DEBUGGING
-+ kdDebug(5006) << "UID " << uid << " is supposed to be in the map" << endl;
-+ kdDebug(5006) << "UID's index is to be " << *it << endl;
-+ kdDebug(5006) << "There is a message there? " << (msg != 0) << endl;
-+ if ( msg ) {
-+ kdDebug(5006) << "Its UID is: " << msg->UID() << endl;
-+ }
-+#endif
-+
- if( msg && msg->UID() == uid )
- return msg;
-+ kdDebug(5006) << "########## Didn't find uid: " << uid << "in cache athough it's supposed to be there!" << endl;
- } else {
-+#ifdef MAIL_LOSS_DEBUGGING
- kdDebug(5006) << "Didn't find uid: " << uid << "in cache!" << endl;
-+#endif
- }
- // Not found by now
- // if( mapReloaded )
-@@ -482,8 +514,10 @@
- if( it != uidMap.end() )
- // Since the uid map is just rebuilt, no need for the sanity check
- return getMsgBase( *it );
-+#ifdef MAIL_LOSS_DEBUGGING
- else
- kdDebug(5006) << "Reloaded, but stil didn't find uid: " << uid << endl;
-+#endif
- // Then it's not here
- return 0;
- }
-@@ -841,9 +875,14 @@
- to be deleted on the server has been deleted, adjust our local notion of the
- highes uid seen thus far. */
- slotUpdateLastUid();
-- if( mLastUid == 0 && uidWriteTimer == -1 )
-+ if( mLastUid == 0 && uidWriteTimer == -1 ) {
- // This is probably a new and empty folder. Write the UID cache
-- writeUidCache();
-+ if ( writeUidCache() == -1 ) {
-+ resetSyncState();
-+ emit folderComplete( this, false );
-+ return;
-+ }
-+ }
- }
- }
-
-@@ -1209,9 +1248,10 @@
- void KMFolderCachedImap::slotImapStatusChanged(KMFolder* folder, const QString&, bool cont)
- {
- if ( mSyncState == SYNC_STATE_INITIAL ){
-- kdDebug(5006) << "IMAP status changed but reset " << endl;
-+ //kdDebug(5006) << "IMAP status changed but reset " << endl;
- return; // we were reset
- }
-+ //kdDebug(5006) << "IMAP status changed for folder: " << folder->prettyURL() << endl;
- if ( folder->storage() == this ) {
- --mStatusFlagsJobs;
- if ( mStatusFlagsJobs == 0 || !cont ) // done or aborting
-@@ -1220,6 +1260,7 @@
- if ( mStatusFlagsJobs == 0 && cont ) {
- mProgress += 5;
- serverSyncInternal();
-+ //kdDebug(5006) << "Proceeding with mailcheck." << endl;
- }
- }
- }
-@@ -1288,15 +1329,24 @@
- // them one by one because the index list can get resized under
- // us. So use msg pointers instead
-
-+ QStringList uids;
- QMap<ulong,int>::const_iterator it = uidMap.constBegin();
- for( ; it != uidMap.end(); it++ ) {
- ulong uid ( it.key() );
-- if( uid!=0 && !uidsOnServer.find( uid ) )
-+ if( uid!=0 && !uidsOnServer.find( uid ) ) {
-+ uids << QString::number( uid );
- msgsForDeletion.append( getMsg( *it ) );
-+ }
- }
-
- if( !msgsForDeletion.isEmpty() ) {
-- removeMsg( msgsForDeletion );
-+#ifdef MAIL_LOSS_DEBUGGING
-+ if ( KMessageBox::warningYesNo(
-+ 0, i18n( "<qt><p>Mails on the server in folder <b>%1</b> were deleted. "
-+ "Do you want to delete them locally?<br>UIDs: %2</p></qt>" )
-+ .arg( folder()->prettyURL() ).arg( uids.join(",") ) ) == KMessageBox::Yes )
-+#endif
-+ removeMsg( msgsForDeletion );
- }
-
- /* Delete messages from the server that we dont have anymore */
-@@ -1370,6 +1420,8 @@
- uidsForDeletionOnServer.clear();
- mMsgsForDownload.clear();
- mUidsForDownload.clear();
-+ // listing is only considered successful if saw a syntactically correct imapdigest
-+ mFoundAnIMAPDigest = false;
-
- CachedImapJob* job = new CachedImapJob( FolderJob::tListMessages, this );
- connect( job, SIGNAL( result(KMail::FolderJob *) ),
-@@ -1415,6 +1467,7 @@
- setReadOnly( access == "Read only" );
- }
- (*it).cdata.remove(0, pos);
-+ mFoundAnIMAPDigest = true;
- }
- pos = (*it).cdata.find("\r\n--IMAPDIGEST", 1);
- // Start with something largish when rebuilding the cache
-@@ -1432,7 +1485,7 @@
- if( uid != 0 ) {
- if ( uidsOnServer.count() == uidsOnServer.size() ) {
- uidsOnServer.resize( KMail::nextPrime( uidsOnServer.size() * 2 ) );
-- kdDebug( 5006 ) << "Resizing to: " << uidsOnServer.size() << endl;
-+ //kdDebug( 5006 ) << "Resizing to: " << uidsOnServer.size() << endl;
- }
- uidsOnServer.insert( uid, &v );
- }
-@@ -1451,7 +1504,9 @@
- KMMsgBase *existingMessage = findByUID(uid);
- if( !existingMessage ) {
- if ( mUserRights <= 0 || ( mUserRights & KMail::ACLJobs::Delete ) ) {
-- // kdDebug(5006) << "message with uid " << uid << " is gone from local cache. Must be deleted on server!!!" << endl;
-+#ifdef MAIL_LOSS_DEBUGGING
-+ kdDebug(5006) << "message with uid " << uid << " is gone from local cache. Must be deleted on server!!!" << endl;
-+#endif
- uidsForDeletionOnServer << uid;
- } else {
- redownload = true;
-@@ -1490,6 +1545,13 @@
- void KMFolderCachedImap::getMessagesResult( KMail::FolderJob *job, bool lastSet )
- {
- mProgress += 10;
-+ if ( !job->error() && !mFoundAnIMAPDigest ) {
-+ kdWarning(5006) << "######## Folderlisting did not complete, but there was no error! "
-+ "Aborting sync of folder: " << folder()->prettyURL() << endl;
-+#ifdef MAIL_LOSS_DEBUGGING
-+ kmkernel->emergencyExit( i18n("Folder listing failed in interesting ways." ) );
-+#endif
-+ }
- if( job->error() ) { // error listing messages but the user chose to continue
- mContentState = imapNoInformation;
- mSyncState = SYNC_STATE_HANDLE_INBOX; // be sure not to continue in this folder
-@@ -1741,7 +1803,7 @@
- KMFolderNode *node;
- bool root = ( this == mAccount->rootFolder() );
- if ( root && !mAccount->hasInbox() ) {
-- kdDebug(5006) << "check INBOX" << endl;
-+ //kdDebug(5006) << "check INBOX" << endl;
- // create the INBOX
- for (node = folder()->child()->first(); node; node = folder()->child()->next())
- if (!node->isDir() && node->name() == "INBOX") break;
-@@ -2216,7 +2278,7 @@
- void
- KMFolderCachedImap::slotAnnotationChanged( const QString& entry, const QString& attribute, const QString& value )
- {
-- kdDebug(5006) << k_funcinfo << entry << " " << attribute << " " << value << endl;
-+ //kdDebug(5006) << k_funcinfo << entry << " " << attribute << " " << value << endl;
- if ( entry == KOLAB_FOLDERTYPE )
- mAnnotationFolderTypeChanged = false;
- else if ( entry == KOLAB_INCIDENCESFOR ) {
-Index: kmail/kmfoldercachedimap.h
-===================================================================
---- kmail/kmfoldercachedimap.h (revision 597658)
-+++ kmail/kmfoldercachedimap.h (revision 597659)
-@@ -445,6 +445,11 @@
- mLastUid. See above for details. */
- ulong mTentativeHighestUid;
-
-+ /** Used to determine whether listing messages yielded a sensible result.
-+ * Only then is the deletion o messages (which relies on succesful
-+ * listing) attempted, during the sync. */
-+ bool mFoundAnIMAPDigest;
-+
- int mUserRights;
- ACLList mACLList;
-
+++ /dev/null
-Index: kmfolder.cpp
-===================================================================
---- kdepim-3.5.6/kmail/kmfolder.cpp (revision 627528)
-+++ kdepim-3.5.6/kmail/kmfolder.cpp (working copy)
-@@ -426,12 +426,12 @@ int KMFolder::moveMsg(QPtrList<KMMessage
-
- int KMFolder::find( const KMMsgBase* msg ) const
- {
-- return mStorage->find( msg );
-+ return mStorage ? mStorage->find( msg ) : 0;
- }
-
- int KMFolder::find( const KMMessage* msg ) const
- {
-- return mStorage->find( msg );
-+ return mStorage ? mStorage->find( msg ) : 0;
- }
-
- int KMFolder::count( bool cache ) const
+++ /dev/null
---- branches/KDE/3.5/kdepim/kmail/kmfolder.cpp 2006/10/28 17:04:18 599816
-+++ branches/KDE/3.5/kdepim/kmail/kmfolder.cpp 2007/01/27 00:32:53 627548
-@@ -631,11 +631,13 @@
- mWhoField = "From";
- if ( this == kmkernel->outboxFolder() ||
- this == kmkernel->sentFolder() ||
-- this == kmkernel->draftsFolder() )
-+ this == kmkernel->draftsFolder() ||
-+ this == kmkernel->templatesFolder() )
- mWhoField = "To";
-- } else if ( identity.drafts() == idString()
-- || identity.fcc() == idString() )
-- // drafts or sent of the identity
-+ } else if ( identity.drafts() == idString() ||
-+ identity.templates() == idString() ||
-+ identity.fcc() == idString() )
-+ // drafts, templates or sent of the identity
- mWhoField = "To";
- else
- mWhoField = "From";
+++ /dev/null
-diff -Naur kmail-3.5.7.orig/kmail/folderstorage.cpp kmail-3.5.7/kmail/folderstorage.cpp
---- kmail-3.5.7.orig/kmail/folderstorage.cpp 2007-05-14 09:54:39.000000000 +0200
-+++ kmail-3.5.7/kmail/folderstorage.cpp 2007-07-09 23:01:26.000000000 +0200
-@@ -84,8 +84,6 @@
-
- mHasChildren = HasNoChildren;
- mContentsType = KMail::ContentsTypeMail;
--
-- connect(this, SIGNAL(closed(KMFolder*)), mFolder, SIGNAL(closed()));
- }
-
- //-----------------------------------------------------------------------------
-@@ -629,7 +627,7 @@
- QString oldLoc, oldIndexLoc, oldIdsLoc, newLoc, newIndexLoc, newIdsLoc;
- QString oldSubDirLoc, newSubDirLoc;
- QString oldName;
-- int rc=0;
-+ int rc=0, openCount=mOpenCount;
- KMFolderDir *oldParent;
-
- assert(!newName.isEmpty());
-@@ -699,6 +697,11 @@
- }
- }
-
-+ if (openCount > 0)
-+ {
-+ open("rename");
-+ mOpenCount = openCount;
-+ }
- writeConfig();
-
- // delete the old entry as we get two entries with the same ID otherwise
-@@ -708,7 +711,6 @@
- emit locationChanged( oldLoc, newLoc );
- emit nameChanged();
- kmkernel->folderMgr()->contentsChanged();
-- emit closed(folder()); // let the ticket owners regain
- return rc;
- }
-
-@@ -736,7 +738,6 @@
- KConfig* config = KMKernel::config();
- config->deleteGroup( "Folder-" + folder()->idString() );
-
-- emit closed(folder());
- emit removed(folder(), (rc ? false : true));
- }
-
-@@ -744,6 +745,8 @@
- //-----------------------------------------------------------------------------
- int FolderStorage::expunge()
- {
-+ int openCount = mOpenCount;
-+
- assert(!folder()->name().isEmpty());
-
- clearIndex( true, mExportsSernums ); // delete and remove from dict, if needed
-@@ -761,6 +764,12 @@
- mDirty = false;
- needsCompact = false; //we're cleared and truncated no need to compact
-
-+ if (openCount > 0)
-+ {
-+ open("expunge");
-+ mOpenCount = openCount;
-+ }
-+
- mUnreadMsgs = 0;
- mTotalMsgs = 0;
- emit numUnreadMsgsChanged( folder() );
-diff -Naur kmail-3.5.7.orig/kmail/folderstorage.h kmail-3.5.7/kmail/folderstorage.h
---- kmail-3.5.7.orig/kmail/folderstorage.h 2007-05-14 09:54:39.000000000 +0200
-+++ kmail-3.5.7/kmail/folderstorage.h 2007-07-09 23:01:26.000000000 +0200
-@@ -418,9 +418,6 @@
- emmitted first. */
- void expunged( KMFolder* );
-
-- /** Emitted when the folder was closed and ticket owners have to reopen */
-- void closed( KMFolder* );
--
- /** Emitted when the serial numbers of this folder were invalidated. */
- void invalidated( KMFolder * );
-
-diff -Naur kmail-3.5.7.orig/kmail/kmfolder.cpp kmail-3.5.7/kmail/kmfolder.cpp
---- kmail-3.5.7.orig/kmail/kmfolder.cpp 2007-05-14 09:54:39.000000000 +0200
-+++ kmail-3.5.7/kmail/kmfolder.cpp 2007-07-09 23:01:26.000000000 +0200
-@@ -476,7 +476,6 @@
-
- void KMFolder::close( const char *owner, bool force )
- {
-- // do not emit closed() in here - as this would regain too early
- mStorage->close( owner, force );
- }
-
-diff -Naur kmail-3.5.7.orig/kmail/kmfolder.h kmail-3.5.7/kmail/kmfolder.h
---- kmail-3.5.7.orig/kmail/kmfolder.h 2007-05-14 09:54:39.000000000 +0200
-+++ kmail-3.5.7/kmail/kmfolder.h 2007-07-09 23:01:26.000000000 +0200
-@@ -537,10 +537,6 @@
- folder changed. */
- void changed();
-
-- /** Emitted when the folder is closed for real - ticket holders should
-- * discard any messages */
-- void closed();
--
- /** Emitted when the contents of a folder have been cleared
- (new search in a search folder, for example) */
- void cleared();
-diff -Naur kmail-3.5.7.orig/kmail/kmfoldermbox.cpp kmail-3.5.7/kmail/kmfoldermbox.cpp
---- kmail-3.5.7.orig/kmail/kmfoldermbox.cpp 2007-05-14 09:54:39.000000000 +0200
-+++ kmail-3.5.7/kmail/kmfoldermbox.cpp 2007-07-09 23:01:26.000000000 +0200
-@@ -264,7 +264,7 @@
- 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 )
-@@ -1246,11 +1246,17 @@
- {
- // This is called only when the user explicitely requests compaction,
- // so we don't check needsCompact.
-+ int openCount = mOpenCount;
-
- KMail::MboxCompactionJob* job = new KMail::MboxCompactionJob( folder(), true /*immediate*/ );
- int rc = job->executeNow( silent );
- // Note that job autodeletes itself.
-
-+ if (openCount > 0)
-+ {
-+ open("mboxcompact");
-+ mOpenCount = openCount;
-+ }
- // If this is the current folder, the changed signal will ultimately call
- // KMHeaders::setFolderInfoStatus which will override the message, so save/restore it
- QString statusMsg = BroadcastStatus::instance()->statusMsg();
-diff -Naur kmail-3.5.7.orig/kmail/kmheaders.cpp kmail-3.5.7/kmail/kmheaders.cpp
---- kmail-3.5.7.orig/kmail/kmheaders.cpp 2007-05-14 09:54:39.000000000 +0200
-+++ kmail-3.5.7/kmail/kmheaders.cpp 2007-07-09 23:01:26.000000000 +0200
-@@ -673,8 +673,6 @@
- this, SLOT(folderCleared()));
- disconnect(mFolder, SIGNAL(expunged( KMFolder* )),
- this, SLOT(folderCleared()));
-- disconnect(mFolder, SIGNAL(closed()),
-- this, SLOT(folderClosed()));
- disconnect( mFolder, SIGNAL( statusMsg( const QString& ) ),
- BroadcastStatus::instance(), SLOT( setStatusMsg( const QString& ) ) );
- disconnect(mFolder, SIGNAL(viewConfigChanged()), this, SLOT(reset()));
-@@ -708,8 +706,6 @@
- this, SLOT(folderCleared()));
- connect(mFolder, SIGNAL(expunged( KMFolder* )),
- this, SLOT(folderCleared()));
-- connect(mFolder, SIGNAL(closed()),
-- this, SLOT(folderClosed()));
- connect(mFolder, SIGNAL(statusMsg(const QString&)),
- BroadcastStatus::instance(), SLOT( setStatusMsg( const QString& ) ) );
- connect(mFolder, SIGNAL(numUnreadMsgsChanged(KMFolder*)),
-@@ -2565,13 +2561,6 @@
- emit selected(0);
- }
-
--
--void KMHeaders::folderClosed()
--{
-- mFolder->open( "kmheaders" );
-- folderCleared();
--}
--
- bool KMHeaders::writeSortOrder()
- {
- QString sortFile = KMAIL_SORT_FILE(mFolder);
-diff -Naur kmail-3.5.7.orig/kmail/kmheaders.h kmail-3.5.7/kmail/kmheaders.h
---- kmail-3.5.7.orig/kmail/kmheaders.h 2007-05-14 09:54:39.000000000 +0200
-+++ kmail-3.5.7/kmail/kmheaders.h 2007-07-09 23:01:26.000000000 +0200
-@@ -221,8 +221,6 @@
- void msgChanged();
- /** For when the folder has been cleared */
- void folderCleared();
-- /** For when the folder has been cleared */
-- void folderClosed();
- /** For when the message with the given message id has been added to a folder */
- void msgAdded(int);
- /** For when the message with the given id has been removed for a folder */
+++ /dev/null
-Index: kmaccount.cpp
-===================================================================
---- kmail/kmaccount.cpp (revision 656120)
-+++ kmail/kmaccount.cpp (working copy)
-@@ -399,7 +399,9 @@ QString KMAccount::encryptStr(const QStr
- {
- QString result;
- for (uint i = 0; i < aStr.length(); i++)
-- result += (aStr[i].unicode() < 0x20) ? aStr[i] :
-+ /* yes, no typo. can't encode ' ' or '!' because
-+ they're the unicode BOM. stupid scrambling. stupid. */
-+ result += (aStr[i].unicode() <= 0x21 ) ? aStr[i] :
- QChar(0x1001F - aStr[i].unicode());
- return result;
- }
+++ /dev/null
-Index: Makefile.am
-===================================================================
---- korganizer/Makefile.am (revision 593026)
-+++ korganizer/Makefile.am (working copy)
-@@ -171,7 +171,7 @@ messages: rc.cpp
- $(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/korganizer.pot
- rm -f tips.cpp
-
--xdg_apps_DATA = korganizer.desktop
-+xdg_apps_DATA = korganizer.desktop korganizer-import.desktop
-
- kde_kcfg_DATA = korganizer.kcfg
-
-Index: korganizer.desktop
-===================================================================
---- korganizer/korganizer.desktop (revision 593026)
-+++ korganizer/korganizer.desktop (working copy)
-@@ -1,6 +1,5 @@
- [Desktop Entry]
- Encoding=UTF-8
--MimeType=text/calendar;text/x-vcalendar;
- Comment=Calendar and Scheduling Program
- Comment[af]=Kalender en Skedulering Program
- Comment[ar]=برنامج الجدولة والتقويم
-@@ -61,7 +60,7 @@ Comment[xh]=Ikhalenda no Dweliso lwenkqu
- Comment[zh_CN]=日历和日程安排程序
- Comment[zh_TW]=行事曆與排程軟體
- Comment[zu]=Ikhalenda kanye Neprogramu Yokugcina isikhathi
--Exec=korganizer --import %u
-+Exec=korganizer
- Icon=korganizer
- Path=
- DocPath=korganizer/index.html
-Index: korganizer-import.desktop
-===================================================================
---- korganizer/korganizer-import.desktop (revision 0)
-+++ korganizer/korganizer-import.desktop (revision 0)
-@@ -0,0 +1,138 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+MimeType=text/calendar;text/x-vcalendar;
-+Comment=Calendar and Scheduling Program
-+Comment[af]=Kalender en Skedulering Program
-+Comment[ar]=برنامج الجدولة والتقويم
-+Comment[bg]=Програма за календар и разписание
-+Comment[bs]=Kalendar i rokovnik
-+Comment[ca]=Un programa de calendari i planificació
-+Comment[cs]=Kalendářový a plánovací program
-+Comment[cy]=Rhaglen Galendr a Drefnlennu
-+Comment[da]=Kalender- og planlægningsprogram
-+Comment[de]=Ein Kalender und Zeitplaner
-+Comment[el]=Πρόγραμμα ημερολογίου και προγραμματισμού
-+Comment[eo]=Kalendara kaj plana programo
-+Comment[es]=Calendario y planificador
-+Comment[et]=Kalendri ja ajakava haldamise rakendus
-+Comment[eu]=Egutegi eta antolaketa progrmaa
-+Comment[fa]=تقویم و برنامۀ زمانبندی
-+Comment[fi]=Kalenteri ja ajanhallintaohjelma
-+Comment[fr]=Calendrier et agenda personnel
-+Comment[gl]=Programa de Calendario e Axenda
-+Comment[he]=תוכניות לוח שנה ותזמון משימות
-+Comment[hi]=कैलेन्डर तथा समय-सारणी प्रोग्राम
-+Comment[hr]=Kalendar i rokovnik
-+Comment[hu]=Határidőnapló és eseményszervező
-+Comment[is]=Dagbók og skipulag
-+Comment[it]=Programma di calendario e di agenda
-+Comment[ja]=カレンダーとスケジュール管理プログラム
-+Comment[km]=កម្មវិធីប្រតិទិន និង កាលវិភាគ
-+Comment[lt]=Kalendoriaus ir planavimo programa
-+Comment[lv]=Kalendāra un Plānošanas Programma
-+Comment[mk]=Календар и роковник
-+Comment[ms]=Kalendar dan Program Penjadualan
-+Comment[mt]=Programm b' kalendarju w skeda
-+Comment[nb]=Et kalender- og tidsplanleggingsprogram
-+Comment[nds]=Kalenner un Tietplaner
-+Comment[nl]=Agenda- en afsprakenprogramma
-+Comment[nn]=Kalender- og planleggingsprogram
-+Comment[nso]=Lenaneo la Peakanyo ya Tshupamabaka
-+Comment[pl]=Kalendarz i terminarz
-+Comment[pt]=Calendário e Programa de Escalonamento
-+Comment[pt_BR]=Programa de Calendário e Agenda
-+Comment[ro]=Program de planificare şi calendar
-+Comment[ru]=Календарь и личное расписание
-+Comment[se]=Kaleandar- ja plánenprográmma
-+Comment[sk]=Kalendár a plánovací program
-+Comment[sl]=Program za koledar in razporejanje
-+Comment[sr]=Календарски и планерски програм
-+Comment[sr@Latn]=Kalendarski i planerski program
-+Comment[sv]=Kalender- och schemaläggningsprogram
-+Comment[ta]=நாள்காட்டி மற்றும் திட்ட நிரல்
-+Comment[tg]=Тақвимот ва ҷадвали шахсӣ
-+Comment[th]=โปรแกรมจัดการปฏิทินและตารางการนัดหมาย
-+Comment[tr]=Takvim ve Zamanlama Programı
-+Comment[uk]=Програма календаря та розкладу
-+Comment[uz]=Календар ва режалаштириш дастури
-+Comment[ven]=Khalenda na mbekanyamushumo ya u shedula
-+Comment[vi]=Chương trình lịch và kế hoạch
-+Comment[xh]=Ikhalenda no Dweliso lwenkqubo Yokucwangcisa
-+Comment[zh_CN]=日历和日程安排程序
-+Comment[zh_TW]=行事曆與排程軟體
-+Comment[zu]=Ikhalenda kanye Neprogramu Yokugcina isikhathi
-+Exec=korganizer --import %u
-+Icon=korganizer
-+Path=
-+DocPath=korganizer/index.html
-+Type=Application
-+Terminal=false
-+Name=KOrganizer
-+Name[af]=Korganizer
-+Name[ar]=منظم كيدي
-+Name[be]=K Арганізатар
-+Name[cy]=KTrefnydd
-+Name[eo]=Organizilo
-+Name[hi]=के-आर्गेनाइज़र
-+Name[lv]=KOrganaizers
-+Name[mk]=Организатор
-+Name[nso]=KMokopanyi
-+Name[pl]=Organizator
-+Name[sv]=Korganizer
-+Name[ta]=கேஅமைப்பாளர்
-+Name[ven]=Mulugisi wa K
-+Name[zh_TW]=KOrganizer 行事曆
-+GenericName=Personal Organizer
-+GenericName[be]=Пэрсанальны арганізатар
-+GenericName[bg]=Организатор
-+GenericName[bs]=Lični organizer
-+GenericName[ca]=Organitzador personal
-+GenericName[cs]=Osobní organizér
-+GenericName[cy]=Trefnydd Personol
-+GenericName[da]=Personlig organisering
-+GenericName[de]=Persönliche Daten organisieren
-+GenericName[el]=Προσωπικός οργανωτής
-+GenericName[en_GB]=Personal Organiser
-+GenericName[es]=Organizador personal
-+GenericName[et]=Personaalne ajaarvestus
-+GenericName[eu]=Antolatzaile pertsonala
-+GenericName[fa]=سازماندهندۀ شخصی
-+GenericName[fi]=Henkilökohtainen ajanhallintaohjelma
-+GenericName[fr]=Organiseur personnel
-+GenericName[gl]=Organizador Persoal
-+GenericName[he]=מנהל זמן אישי
-+GenericName[hi]=निजी प्रबंधक
-+GenericName[hu]=Határidőnapló
-+GenericName[is]=Persónuleg skipulagsbók
-+GenericName[it]=Organizzatore personale
-+GenericName[ja]=個人向けスケジュール管理
-+GenericName[km]=កម្មវិធីរៀបចំផ្ទាល់ខ្លួន
-+GenericName[lt]=Asmeninės informacijos tvarkyklė
-+GenericName[ms]=Penyusun Peribadi
-+GenericName[nb]=Personlig planlegger
-+GenericName[nds]=Persöönlich Mötenkalenner
-+GenericName[nl]=Persoonlijke organizer
-+GenericName[nn]=Personleg organiserar
-+GenericName[pl]=Osobisty organizator
-+GenericName[pt]=Organizador Pessoal
-+GenericName[pt_BR]=Organizador Pessoal
-+GenericName[ro]=Organizator personal
-+GenericName[ru]=Персональный органайзер
-+GenericName[sk]=Osobný plánovač
-+GenericName[sl]=Osebni organizator
-+GenericName[sr]=Лични планер
-+GenericName[sr@Latn]=Lični planer
-+GenericName[sv]=Filofax
-+GenericName[ta]=தனிப்பயன் அமைப்பாளர்
-+GenericName[tg]=Органайзери инфиродӣ
-+GenericName[tr]=Kişisel Bilgi Yöneticisi
-+GenericName[uk]=Персональний тижневик
-+GenericName[uz]=Шахсий органайзер
-+GenericName[zh_CN]=个人日程安排
-+GenericName[zh_TW]=個人行程組織軟體
-+ServiceTypes=Browser/View,DCOP/Organizer
-+X-KDE-Library=libkorganizerpart
-+X-KDE-StartupNotify=true
-+X-DCOP-ServiceType=Unique
-+X-DCOP-ServiceName=korganizer
-+Hidden=true
+++ /dev/null
---- kdepim/libkcal/libical/src/libical/icalarray.c 2005/07/26 18:54:59 438982
-+++ kdepim/libkcal/libical/src/libical/icalarray.c 2006/05/06 09:14:35 537923
-@@ -149,10 +149,10 @@
- new_space_allocated * array->element_size);
- */
- new_data = malloc(new_space_allocated * array->element_size);
-- memcpy(new_data,array->data,array->element_size*array->space_allocated);
-- free(array->data);
-
- if (new_data) {
-+ memcpy(new_data,array->data,array->element_size*array->space_allocated);
-+ free(array->data);
- array->data = new_data;
- array->space_allocated = new_space_allocated;
- } else {
---- kdepim/libkcal/libical/src/libical/icalcomponent.c 2005/09/18 12:37:01 461680
-+++ kdepim/libkcal/libical/src/libical/icalcomponent.c 2006/05/06 09:14:35 537923
-@@ -848,8 +848,8 @@
-
- /** Now test against the EXRULEs **/
- for (exrule = icalcomponent_get_first_property(comp,ICAL_EXRULE_PROPERTY);
-- exdate != NULL;
-- exdate = icalcomponent_get_next_property(comp,ICAL_EXRULE_PROPERTY)) {
-+ exrule != NULL;
-+ exrule = icalcomponent_get_next_property(comp,ICAL_EXRULE_PROPERTY)) {
-
- struct icalrecurrencetype recur = icalproperty_get_exrule(exrule);
- icalrecur_iterator *exrule_itr = icalrecur_iterator_new(recur, *dtstart);
---- kdepim/libkcal/libical/src/libical/icaltypes.c 2005/07/26 18:54:59 438982
-+++ kdepim/libkcal/libical/src/libical/icaltypes.c 2006/05/06 09:14:35 537923
-@@ -77,7 +77,7 @@
-
-
- struct icaltriggertype tr, null_tr;
-- icalerrorstate es;
-+ icalerrorstate es = ICAL_ERROR_UNKNOWN;
- icalerrorenum e;
-
- tr.time= icaltime_null_time();
+++ /dev/null
---- branches/KDE/3.5/kdepim/libkcal/calendarlocal.cpp 2007/10/01 17:04:23 719674
-+++ branches/KDE/3.5/kdepim/libkcal/calendarlocal.cpp 2007/10/01 17:04:57 719675
-@@ -401,62 +401,75 @@
- bool inclusive )
- {
- Event::List eventList;
-+ QDate yesterStart = start.addDays(-1);
-
- // Get non-recurring events
- EventDictIterator it( mEvents );
- for( ; it.current(); ++it ) {
- Event *event = *it;
-- if ( event->doesRecur() ) {
-- QDate rStart = event->dtStart().date();
-- bool found = false;
-- if ( inclusive ) {
-- if ( rStart >= start && rStart <= end ) {
-- // Start date of event is in range. Now check for end date.
-- // if duration is negative, event recurs forever, so do not include it.
-- if ( event->recurrence()->duration() == 0 ) { // End date set
-- QDate rEnd = event->recurrence()->endDate();
-- if ( rEnd >= start && rEnd <= end ) { // End date within range
-- found = true;
-- }
-- } else if ( event->recurrence()->duration() > 0 ) { // Duration set
-- // TODO: Calculate end date from duration. Should be done in Event
-- // For now exclude all events with a duration.
-+
-+ QDate rStart = event->dtStart().date();
-+ if (end < rStart) {
-+ kdDebug(5800) << "Skipping event starting after TOI" << endl;
-+ continue;
-+ }
-+ if ( inclusive && rStart < start) {
-+ kdDebug(5800) << "Skipping event starting before TOI while inclusive" << endl;
-+ continue;
-+ }
-+
-+ if ( ! event->doesRecur() ) { // non-recurring events
-+ QDate rEnd = event->dtEnd().date();
-+ if (rEnd < start) {
-+ kdDebug(5800) << "Skipping event ending before TOI" << endl;
-+ continue;
-+ }
-+ if ( inclusive && end < rEnd ) {
-+ kdDebug(5800) << "Skipping event ending after TOI while inclusive" << endl;
-+ continue;
-+ }
-+ } else { // recurring events
-+ switch ( event->recurrence()->duration() ) {
-+ case -1: // infinite
-+ if ( inclusive ) {
-+ kdDebug(5800) << "Skipping infinite event because inclusive" << endl;
-+ continue;
- }
-- }
-- } else {
-- if ( rStart <= end ) { // Start date not after range
-- if ( rStart >= start ) { // Start date within range
-- found = true;
-- } else if ( event->recurrence()->duration() == -1 ) { // Recurs forever
-- found = true;
-- } else if ( event->recurrence()->duration() == 0 ) { // End date set
-- QDate rEnd = event->recurrence()->endDate();
-- if ( rEnd >= start && rEnd <= end ) { // End date within range
-- found = true;
-- }
-- } else { // Duration set
-- // TODO: Calculate end date from duration. Should be done in Event
-- // For now include all events with a duration.
-- found = true;
-+ break;
-+ case 0: // end date given
-+ default: // count given
-+ QDate rEnd = event->recurrence()->endDate();
-+ if ( ! rEnd.isValid() ) {
-+ kdDebug(5800) << "Skipping recurring event without occurences" << endl;
-+ continue;
- }
-- }
-- }
-+ if ( rEnd < start ) {
-+ kdDebug(5800) << "Skipping recurring event ending before TOI" << endl;
-+ continue;
-+ }
-+ if ( inclusive && end < rEnd ) {
-+ kdDebug(5800) << "Skipping recurring event ending after TOI while inclusive" << endl;
-+ continue;
-+ }
-+ /* FIXME: too much conversion between QDate and QDateTime makes this useless:
-+ * freebusy(end=QDateTime(day, "00:00:00")) ->
-+ * rawEvents(end=QDate(day)) ->
-+ * durationTo(QDateTime(day, "23:59:59"))
-+ * so events repeating at the end day match and are included.
-+ */
-+#if 0
-+ int durationBeforeStart = event->recurrence()->durationTo(yesterStart);
-+ int durationUntilEnd = event->recurrence()->durationTo(end);
-+ if (durationBeforeStart == durationUntilEnd) {
-+ kdDebug(5800) << "Skipping recurring event without occurences in TOI" << endl;
-+ continue;
-+ }
-+#endif
-+ break;
-+ } // switch(duration)
-+ } // if(doesRecur)
-
-- if ( found ) eventList.append( event );
-- } else {
-- QDate s = event->dtStart().date();
-- QDate e = event->dtEnd().date();
--
-- if ( inclusive ) {
-- if ( s >= start && e <= end ) {
-- eventList.append( event );
-- }
-- } else {
-- if ( s <= end && e >= start ) {
-- eventList.append( event );
-- }
-- }
-- }
-+ eventList.append( event );
- }
-
- return eventList;
---- branches/KDE/3.5/kdepim/libkcal/recurrencerule.cpp 2007/10/01 17:04:23 719674
-+++ branches/KDE/3.5/kdepim/libkcal/recurrencerule.cpp 2007/10/01 17:04:57 719675
-@@ -558,28 +558,22 @@
- setDirty();
- }
-
--
- QDateTime RecurrenceRule::endDt( bool *result ) const
- {
- if ( result ) *result = false;
- if ( mPeriod == rNone ) return QDateTime();
-- if ( mDuration < 0 ) {
-- if ( result ) result = false;
-- return QDateTime();
-- } else if ( mDuration == 0 ) {
-+ if ( mDuration < 0 ) return QDateTime();
-+ if ( mDuration == 0 ) {
-+ if ( result ) *result = true;
- return mDateEnd;
-- } else {
-- // N occurrences. Check if we have a full cache. If so, return the cached end date.
-- if ( ! mCached ) {
-- // If not enough occurrences can be found (i.e. inconsistent constraints)
-- if ( !buildCache() ) {
-- if ( result ) result = false;
-- return QDateTime();
-- }
-- }
-- return mCachedDateEnd;
- }
-- return QDateTime();
-+ // N occurrences. Check if we have a full cache. If so, return the cached end date.
-+ if ( ! mCached ) {
-+ // If not enough occurrences can be found (i.e. inconsistent constraints)
-+ if ( !buildCache() ) return QDateTime();
-+ }
-+ if ( result ) *result = true;
-+ return mCachedDateEnd;
- }
-
- void RecurrenceRule::setEndDt( const QDateTime &dateTime )
---- branches/KDE/3.5/kdepim/libkcal/tests/Makefile.am 2007/10/01 17:04:23 719674
-+++ branches/KDE/3.5/kdepim/libkcal/tests/Makefile.am 2007/10/01 17:04:57 719675
-@@ -4,6 +4,7 @@
- check_PROGRAMS = testtostring \
- testincidence \
- testcalendar \
-+ fbrecurring \
- readandwrite \
- testresource \
- testfields \
-@@ -28,6 +29,10 @@
- testtostring_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- testtostring_LDADD = ../libkcal.la
-
-+fbrecurring_SOURCES = fbrecurring.cpp
-+fbrecurring_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+fbrecurring_LDADD = ../libkcal.la
-+
- readandwrite_SOURCES = readandwrite.cpp
- readandwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH)
- readandwrite_LDADD = ../libkcal.la
-@@ -78,10 +83,10 @@
- perl $(srcdir)/runtestcase.pl readandwrite "ical" $$i; \
- done; \
- for i in `find $(srcdir)/data/vCalendar/ -name "*.ics"`; do \
-- perl $(srcdir)/runtestcase.pl testvcalexport "vcal" $$i; \
-+ perl $(srcdir)/runtestcase.pl testvcalexport "vcal" $$i; \
- done;
- for i in `find $(srcdir)/data/vCalendar/ -name "*.vcs"`; do \
-- perl $(srcdir)/runtestcase.pl readandwrite "ical" $$i; \
-+ perl $(srcdir)/runtestcase.pl readandwrite "ical" $$i; \
- done;
- [ ! -e FAILED ]
-
---- branches/KDE/3.5/kdepim/libkcal/tests.orig/fbrecurring.cpp 2007-08-31 20:52:15.220373203 +0200
-+++ branches/KDE/3.5/kdepim/libkcal/tests/fbrecurring.cpp 2007-10-04 19:53:52.000000000 +0200
-@@ -0,0 +1,52 @@
-+
-+#include "icalformat.h"
-+#include "event.h"
-+#include "calendarlocal.h"
-+
-+#include <libkcal/freebusy.h>
-+#include <iostream>
-+
-+using namespace KCal;
-+using namespace std;
-+
-+int main()
-+{
-+ ICalFormat f;
-+
-+ CalendarLocal cal( QString::fromLatin1("UTC") );
-+
-+ Event *event1 = new Event;
-+ event1->setSummary("A");
-+ event1->setDtStart( QDateTime(QDate(2006,1,1), QTime(12,0,0)) );
-+ //event1->setDuration(60*60);
-+ event1->setDtEnd( QDateTime(QDate(2006,1,1), QTime(13,0,0)) );
-+ event1->setFloats(FALSE);
-+ event1->recurrence()->setDaily( 1 );
-+ //event1->recurrence()->setDuration( 2 );
-+ event1->recurrence()->setEndDateTime( QDateTime(QDate(2006,1,3), QTime(13,0,0)) );
-+ cout << f.toICalString(event1).latin1() << endl;
-+ cal.addEvent(event1);
-+
-+ Event *event2 = new Event;
-+ event2->setSummary("B");
-+ event2->setDtStart( QDateTime(QDate(2006,1,1), QTime(13,0,0)) );
-+ //event2->setDuration(60*60);
-+ event2->setDtEnd( QDateTime(QDate(2006,1,1), QTime(14,0,0)) );
-+ event2->setFloats(FALSE);
-+ event2->recurrence()->setDaily( 1 );
-+ //event2->recurrence()->setDuration( 3 );
-+ event2->recurrence()->setEndDateTime( QDateTime(QDate(2006,1,4), QTime(13,0,0)) );
-+ cout << f.toICalString(event2).latin1() << endl;
-+ cal.addEvent(event2);
-+
-+ Calendar *c = &cal;
-+
-+ QDateTime start = QDateTime(QDate(2006,1,2), QTime(0,0,0));
-+ QDateTime end = QDateTime(QDate(2006,1,3), QTime(0,0,0));
-+
-+ FreeBusy *freebusy = new FreeBusy( c, start, end );
-+ QString result = f.createScheduleMessage( freebusy, Scheduler::Publish );
-+ cout << result.latin1() << endl;
-+
-+ return 0;
-+}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.5-r2.ebuild,v 1.13 2007/02/03 15:57:13 eroyf Exp $
-
-inherit kde-dist
-
-SRC_URI="${SRC_URI}
- mirror://gentoo/kdepim-3.5-patchset-02.tar.bz2"
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="crypt gnokii pda"
-
-# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
-DEPEND="~kde-base/kdebase-${PV}
- >=dev-libs/cyrus-sasl-2
- pda? ( app-pda/pilot-link dev-libs/libmal )
- gnokii? ( app-mobilephone/gnokii )
- crypt? ( >=app-crypt/gpgme-1.1.2-r1
- || ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 ) )
- x11-libs/libXScrnSaver"
-
-RDEPEND="${DEPEND}
- crypt? ( app-crypt/pinentry )"
-
-DEPEND="${DEPEND}
- x11-proto/scrnsaverproto"
-
-PATCHES="${FILESDIR}/korganizer-${PV}-desktop.patch
- ${FILESDIR}/kmail-${PV}-dimap-mail-loss.patch"
-
-src_unpack() {
- kde_src_unpack
- # Call Qt 3 designer
- sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" "${S}"/libkdepim/kcmdesignerfields.cpp || die "sed failed"
-}
-
-src_compile() {
- local myconf="--with-sasl $(use_with gnokii)"
- use crypt && myconf="${myconf} --with-gpg=/usr/bin/gpg"
-
- use pda || DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
-
- kde_src_compile
-}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.5-r4.ebuild,v 1.8 2007/05/21 03:21:17 josejx Exp $
-
-inherit kde-dist
-
-SRC_URI="${SRC_URI}
- mirror://gentoo/kdepim-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
-
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="crypt gnokii pda"
-
-# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
-DEPEND="~kde-base/kdebase-${PV}
- >=dev-libs/cyrus-sasl-2
- pda? ( app-pda/pilot-link dev-libs/libmal )
- gnokii? ( app-mobilephone/gnokii )
- crypt? ( >=app-crypt/gpgme-1.1.2-r1
- || ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 ) )
- x11-libs/libXScrnSaver"
-
-RDEPEND="${DEPEND}
- crypt? ( app-crypt/pinentry )"
-
-DEPEND="${DEPEND}
- x11-proto/scrnsaverproto"
-
-PATCHES="${FILESDIR}/kmail-utf8.diff"
-
-src_unpack() {
- kde_src_unpack
- # Call Qt 3 designer
- sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" "${S}"/libkdepim/kcmdesignerfields.cpp || die "sed failed"
-
- sed -e "s:SUBDIRS = libical versit tests:SUBDIRS = libical versit:" -i libkcal/Makefile.am || die "sed failed"
-}
-
-src_compile() {
- local myconf="--with-sasl $(use_with gnokii)"
- use crypt && myconf="${myconf} --with-gpg=/usr/bin/gpg"
-
- use pda || DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
-
- kde_src_compile
-}
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.6-r3.ebuild,v 1.3 2007/07/28 15:18:26 philantrop Exp $
-
-inherit kde-dist
-
-SRC_URI="${SRC_URI}
- mirror://gentoo/kdepim-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="KDE PIM (Personal Information Management) applications: KOrganizer, KMail, KNode,..."
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt gnokii"
-
-# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
-DEPEND="~kde-base/kdebase-${PV}
- >=dev-libs/cyrus-sasl-2
- gnokii? ( app-mobilephone/gnokii )
- crypt? ( >=app-crypt/gpgme-1.1.2-r1
- || ( >=app-crypt/gnupg-2.0.1-r1 <app-crypt/gnupg-1.9 ) )
- x11-libs/libXScrnSaver"
-# Requires pilot-link-0.12.0
-# pda? ( >=app-pda/pilot-link-0.12.0 dev-libs/libmal )
-
-RDEPEND="${DEPEND}
- crypt? ( app-crypt/pinentry )"
-
-DEPEND="${DEPEND}
- x11-proto/scrnsaverproto"
-
-PATCHES="${FILESDIR}/kmail-utf8.diff"
-
-src_unpack() {
- kde_src_unpack
- # Call Qt 3 designer
- sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" "${S}"/libkdepim/kcmdesignerfields.cpp || die "sed failed"
-
- # disabling tests, see bug #164038 and bug #164097
- sed -e "s:SUBDIRS = libical versit tests:SUBDIRS = libical versit:" \
- -i libkcal/Makefile.am || die "sed failed" || die "sed failed"
- sed -e "s:SUBDIRS = . plugins test:SUBDIRS = . plugins:" \
- -i kitchensync/libkonnector2/Makefile.am || die "sed failed"
- sed -e "s:SUBDIRS = . tests test:SUBDIRS = .:" \
- -i kitchensync/libksync/Makefile.am || die "sed failed"
-}
-
-src_compile() {
- local myconf="--with-sasl $(use_with gnokii)"
- use crypt && myconf="${myconf} --with-gpg=/usr/bin/gpg"
-
- # use pda || DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
- DO_NOT_COMPILE="${DO_NOT_COMPILE} kpilot"
-
- kde_src_compile
-}
-
-pkg_postinst() {
- kde_pkg_postinst
-
- elog "If you're using x11-misc/basket, please re-emerge it now to avoid crashes with Kontact."
- elog "cf. https://bugs.gentoo.org/show_bug.cgi?id=174872 for details."
-}
projects / gentoo.git / commitdiff