packages (DEVEL): kde4-kdepim/kde4-kdepim-branch.diff, kde4-kdepim/kde4-kde...
arekm
arekm at pld-linux.org
Wed Feb 10 09:47:06 CET 2010
Author: arekm Date: Wed Feb 10 08:47:06 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- rel 2; readd branch diff
---- Files affected:
packages/kde4-kdepim:
kde4-kdepim-branch.diff (1.14 -> 1.14.2.1) , kde4-kdepim.spec (1.116.2.24 -> 1.116.2.25)
---- Diffs:
================================================================
Index: packages/kde4-kdepim/kde4-kdepim-branch.diff
diff -u packages/kde4-kdepim/kde4-kdepim-branch.diff:1.14 packages/kde4-kdepim/kde4-kdepim-branch.diff:1.14.2.1
--- packages/kde4-kdepim/kde4-kdepim-branch.diff:1.14 Sun Sep 13 21:30:01 2009
+++ packages/kde4-kdepim/kde4-kdepim-branch.diff Wed Feb 10 09:47:00 2010
@@ -1,1344 +1,1021 @@
-Index: akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop
+Index: akregator/src/selectioncontroller.cpp
===================================================================
---- akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ akregator/plugins/mk4storage/akregator_mk4storage_plugin.desktop (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -18,7 +18,7 @@
- Name[fr]=Stockage avec Metakit
- Name[fy]=Metakit-opslachefterein
- Name[ga]=Inneall stórála Metakit
--Name[gl]=Manexador do almacenador Metakit
-+Name[gl]=Infraestrutura do almacenador Metakit
- Name[hu]=Metakit tároló
- Name[is]=Metakit geymslu bakendi
- Name[it]=Backend archiviazione metakit
-Index: akregator/configuration/akregator_config_browser.desktop
-===================================================================
---- akregator/configuration/akregator_config_browser.desktop (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ akregator/configuration/akregator_config_browser.desktop (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -56,7 +56,7 @@
- Comment[es]=Configurar el componente navegador interno
- Comment[et]=Sisemise sirvimiskomponendi seadistamine
- Comment[fr]=Configurer le navigateur web interne
--Comment[gl]=Configurar o componente navegador interno
-+Comment[gl]=Configurar o compoñente do navegador interno
- Comment[hu]=A belső böngészőkomponens beállítása
- Comment[it]=Configura il componente interno di navigazione internet
- Comment[ja]=内部ブラウザコンポーネントの設定
-Index: libkleo/libkleopatrarc.desktop
-===================================================================
---- libkleo/libkleopatrarc.desktop (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ libkleo/libkleopatrarc.desktop (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -185,7 +185,7 @@
- Name[fi]=Luotettu juurivarmenne
- Name[fr]=Certificat racine de confiance
- Name[fy]=Fertroude haadsertifikaat
--Name[gl]=Certificado raiz autentificado
-+Name[gl]=Certificado raíz autenticado
- Name[hu]=Megbízható gyökértanúsítvány
- Name[is]=Treyst rótarskilríki
- Name[it]=Certificato radice affidabile
-@@ -243,7 +243,7 @@
- Name[fi]=Ei-luotettu juurivarmenne
- Name[fr]=Certificat racine non fiable
- Name[fy]=Net fertroude haadsertifikaat
--Name[gl]=Certificado raiz non autentificado
-+Name[gl]=Certificado raíz non autenticado
- Name[hu]=Nem megbízható gyökértanúsítvány
- Name[is]=Ekki traust rótarskilríki
- Name[it]=Certificato radice non affidabile
-Index: kresources/slox/kcal_slox.desktop
-===================================================================
---- kresources/slox/kcal_slox.desktop (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ kresources/slox/kcal_slox.desktop (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -38,7 +38,7 @@
- Name[pa]=SUSE LINUX Openexchange ਸਰਵਰ
- Name[pl]=Serwer SUSE LINUX Openexchange
- Name[pt]=Servidor SUSE LINUX Openexchange
--Name[pt_BR]=Servidor OpenExchange do SUSE Linux (SLOX)
-+Name[pt_BR]=Servidor Openexchange do SUSE Linux (SLOX)
- Name[ru]=Сервер SUSE LINUX Openexchange
- Name[sl]=Strežnik SUSE LINUX Openexchange
- Name[sv]=SUSE Linux Openexchange-server
-Index: kresources/slox/kabc_slox.desktop
-===================================================================
---- kresources/slox/kabc_slox.desktop (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ kresources/slox/kabc_slox.desktop (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -38,7 +38,7 @@
- Name[pa]=SUSE LINUX Openexchange ਸਰਵਰ
- Name[pl]=Serwer SUSE LINUX Openexchange
- Name[pt]=Servidor SUSE LINUX Openexchange
--Name[pt_BR]=Servidor OpenExchange do SUSE Linux (SLOX)
-+Name[pt_BR]=Servidor Openexchange do SUSE Linux (SLOX)
- Name[ru]=Сервер SUSE LINUX Openexchange
- Name[sl]=Strežnik SUSE LINUX Openexchange
- Name[sv]=SUSE Linux Openexchange-server
-Index: kmail/kmail.antispamrc
-===================================================================
---- kmail/kmail.antispamrc (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ kmail/kmail.antispamrc (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -56,13 +56,13 @@
- Version=1
- Priority=30
- VisibleName=Annoyance-Filter
--Executable=$HOME/.annoyance-filter/annoyance-filter --version
-+Executable=PATH=$HOME/.annoyance-filter:${PATH} annoyance-filter --version
- URL=http://www.fourmilab.ch/annoyance-filter
- PipeFilterName=Annoyance-Filter Check
--PipeCmdDetect=$HOME/.annoyance-filter/annoyance-filter --fread $HOME/.annoyance-filter/FastDict.bin --phrasemin 1 --phrasemax 2 --transcript - --test -
-+PipeCmdDetect=PATH=$HOME/.annoyance-filter:${PATH} annoyance-filter --fread $HOME/.annoyance-filter/FastDict.bin --phrasemin 1 --phrasemax 2 --transcript - --test -
- PipeCmdNoSpam=
--ExecCmdSpam=$HOME/.annoyance-filter/annoyance-filter --read $HOME/.annoyance-filter/Dict.bin --phrasemin 1 --phrasemax 2 --junk - --prune --write $HOME/.annoyance-filter/Dict.bin --fwrite $HOME/.annoyance-filter/FastDict.bin
--ExecCmdHam=$HOME/.annoyance-filter/annoyance-filter --read $HOME/.annoyance-filter/Dict.bin --phrasemin 1 --phrasemax 2 --mail - --prune --write $HOME/.annoyance-filter/Dict.bin --fwrite $HOME/.annoyance-filter/FastDict.bin
-+ExecCmdSpam=PATH=$HOME/.annoyance-filter:${PATH} annoyance-filter --read $HOME/.annoyance-filter/Dict.bin --phrasemin 1 --phrasemax 2 --junk - --prune --write $HOME/.annoyance-filter/Dict.bin --fwrite $HOME/.annoyance-filter/FastDict.bin
-+ExecCmdHam=PATH=$HOME/.annoyance-filter:${PATH} annoyance-filter --read $HOME/.annoyance-filter/Dict.bin --phrasemin 1 --phrasemax 2 --mail - --prune --write $HOME/.annoyance-filter/Dict.bin --fwrite $HOME/.annoyance-filter/FastDict.bin
- DetectionHeader=X-Annoyance-Filter-Classification
- DetectionPattern=Junk
- DetectionPattern2=
-Index: kmail/kmailicalifaceimpl.cpp
-===================================================================
---- kmail/kmailicalifaceimpl.cpp (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ kmail/kmailicalifaceimpl.cpp (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -1712,6 +1712,21 @@
- }
- }
+--- akregator/src/selectioncontroller.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1088121)
++++ akregator/src/selectioncontroller.cpp (.../branches/KDE/4.4/kdepim) (wersja 1088121)
+@@ -143,11 +143,15 @@
-+// Builds a folder list from the dimap and the local folder list.
-+static void createFolderList( QStringList &folderNames, QList<QPointer<KMFolder> > &folderList )
-+{
-+ QStringList dimapFolderNames;
-+ QStringList localFolderNames;
-+ QList<QPointer<KMFolder> > dimapFolderList;
-+ QList<QPointer<KMFolder> > localFolderList;
-+ kmkernel->dimapFolderMgr()->createFolderList( &dimapFolderNames, &dimapFolderList );
-+ kmkernel->folderMgr()->createFolderList( &localFolderNames, &localFolderList );
-+ folderNames += dimapFolderNames;
-+ folderNames += localFolderNames;
-+ folderList += dimapFolderList;
-+ folderList += localFolderList;
-+}
-+
- /****************************
- * The config stuff
- */
-@@ -1882,9 +1897,6 @@
- if ( mNotes->folderType() == KMFolderTypeCachedImap )
- static_cast<KMFolderCachedImap *>( mNotes->storage() )->updateAnnotationFolderType();
-
-- // BEGIN TILL TODO The below only uses the dimap folder manager, which
-- // will fail for all other folder types. Adjust.
--
- kDebug() << "mCalendar=" << mCalendar << mCalendar->location();
- kDebug() << "mContacts=" << mContacts << mContacts->location();
- kDebug() << "mNotes=" << mNotes << mNotes->location();
-@@ -1892,13 +1904,15 @@
- // Find all extra folders
- QStringList folderNames;
- QList<QPointer<KMFolder> > folderList;
-- kmkernel->dimapFolderMgr()->createFolderList(&folderNames, &folderList);
-+ createFolderList( folderNames, folderList );
- for(QList<QPointer<KMFolder> >::iterator it = folderList.begin();
- it != folderList.end(); ++it)
- {
-- KMFolderCachedImap* storage = dynamic_cast<KMFolderCachedImap*>( (*it)->storage() );
-+ FolderStorage *storage = (*it)->storage();
-+ KMFolderCachedImap* dimapStorage = dynamic_cast<KMFolderCachedImap*>( storage );
- if ( storage && storage->contentsType() != 0 ) {
-- storage->updateAnnotationFolderType();
-+ if ( dimapStorage )
-+ dimapStorage->updateAnnotationFolderType();
- folderContentsTypeChanged( *it, storage->contentsType() );
- }
- }
-@@ -1916,8 +1930,6 @@
- if ( mExtraFolders.contains( mNotes->location() ) )
- delete mExtraFolders.take( mNotes->location() );
-
-- // END TILL TODO
--
- emit subresourceAdded( folderContentsType( KMail::ContentsTypeCalendar ),
- mCalendar->location(), mCalendar->label(), true, true );
- emit subresourceAdded( folderContentsType( KMail::ContentsTypeTask ),
-Index: kmail/messagelistview/core/model.cpp
-===================================================================
---- kmail/messagelistview/core/model.cpp (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ kmail/messagelistview/core/model.cpp (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -60,6 +60,7 @@
- #include <QScrollBar>
-
- #include <KLocale>
-+#include <KCalendarSystem>
- #include <KGlobal>
- #include <KDebug>
- #include <kcursorsaver.h>
-@@ -309,7 +310,8 @@
- void Model::setAggregation( const Aggregation * aggregation )
+ Akregator::Article Akregator::SelectionController::currentArticle() const
{
- mAggregation = aggregation;
-- mView->setRootIsDecorated( mAggregation->grouping() == Aggregation::NoGrouping );
-+ mView->setRootIsDecorated( ( mAggregation->grouping() == Aggregation::NoGrouping ) &&
-+ ( mAggregation->threading() != Aggregation::NoThreading ) );
++ if ( !m_articleLister || !m_articleLister->articleSelectionModel() )
++ return Article();
+ return ::articleForIndex( m_articleLister->articleSelectionModel()->currentIndex(), m_feedList.get() );
}
- void Model::setTheme( const Theme * theme )
-@@ -1182,34 +1184,6 @@
- }
- }
-
--static inline QString get_capitalized_long_day_name( int dayOfWeek )
--{
-- // The day name should be capitalized in the group labels
-- // This fixes some complaints from translators that have mapped
-- // their standard day names to lowercase versions for general
-- // use but still want them to be capitalized in the headers...
-- QString name = QDate::longDayName( dayOfWeek );
-- if ( name.isEmpty() )
-- return name;
-- QString copy = name;
-- copy[ 0 ] = name.at( 0 ).toUpper();
-- return copy;
--}
--
--static inline QString get_capitalized_month_name( int month )
--{
-- // The month name should be capitalized in the group labels
-- // This fixes some complaints from translators that have mapped
-- // their standard month names to lowercase versions for general
-- // use but still want them to be capitalized in the headers...
-- QString name = QDate::longMonthName( month );
-- if ( name.isEmpty() )
-- return name;
-- QString copy = name;
-- copy[ 0 ] = name.at( 0 ).toUpper();
-- return copy;
--}
--
- void Model::attachMessageToGroupHeader( MessageItem *mi )
+ QList<Akregator::Article> Akregator::SelectionController::selectedArticles() const
{
- QString groupLabel;
-@@ -1265,24 +1239,12 @@
- if ( dateWeekNumber == todayWeekNumber )
- {
- // within this week
-- groupLabel = get_capitalized_long_day_name( dDate.dayOfWeek() );
-+ groupLabel = KGlobal::locale()->calendar()->weekDayName( dDate );
- } else {
-- // not this week
-- // FIXME: After 4.2 think about a configurable date format.
-- // At the moment KMime::DateFormatter doesn't support date-only formatting.
-- // KDateTime is not better than QDate in this case.
-- // A configurable date-only format should be probably tweaked into KMime::DateFormatter
-- // but this can't be done with the string freeze in effect.
-- groupLabel = dDate.toString( Qt::DefaultLocaleShortDate );
-+ groupLabel = KGlobal::locale()->formatDate( dDate, KLocale::ShortDate );
- }
- } else {
-- // not within this month
-- // FIXME: After 4.2 think about a configurable date format.
-- // At the moment KMime::DateFormatter doesn't support date-only formatting.
-- // KDateTime is not better than QDate in this case.
-- // A configurable date-only format should be probably tweaked into KMime::DateFormatter
-- // but this can't be done with the string freeze in effect.
-- groupLabel = dDate.toString( Qt::DefaultLocaleShortDate );
-+ groupLabel = KGlobal::locale()->formatDate( dDate, KLocale::ShortDate );
- }
-
- }
-@@ -1335,7 +1297,7 @@
- if ( dateWeekNumber == todayWeekNumber )
- {
- // within this week
-- groupLabel = get_capitalized_long_day_name( dDate.dayOfWeek() );
-+ groupLabel = KGlobal::locale()->calendar()->weekDayName( dDate );
- } else {
- // previous weeks
- int weekDiff = todayWeekNumber - dateWeekNumber;
-@@ -1364,10 +1326,12 @@
- )
- {
- // group by months, this year (so no year appended)
-- groupLabel = get_capitalized_month_name( dDate.month() );
-+ groupLabel = KGlobal::locale()->calendar()->monthName( dDate );
- } else {
- // group by months
-- groupLabel = QString( "%1 %2" ).arg( get_capitalized_month_name( dDate.month() ) ).arg( dDate.year() );
-+ groupLabel = QString( "%1 %2" )
-+ .arg( KGlobal::locale()->calendar()->monthName( dDate ) )
-+ .arg( dDate.year() );
- }
- }
- }
-Index: kmail/kmpopfiltercnfrmdlg.cpp
-===================================================================
---- kmail/kmpopfiltercnfrmdlg.cpp (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ kmail/kmpopfiltercnfrmdlg.cpp (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -55,9 +55,6 @@
- << i18nc("@title:column", "Sender") << i18nc("@title:column", "Receiver")
- << i18nc("@title:column", "Date") << i18nc("@title:column", "Size");
- QTreeWidgetItem *headerItem = new QTreeWidgetItem( headerNames );
-- headerItem->setTextAlignment( 0, Qt::AlignHCenter );
-- headerItem->setTextAlignment( 1, Qt::AlignHCenter );
-- headerItem->setTextAlignment( 2, Qt::AlignHCenter );
- headerItem->setTextAlignment( 7, Qt::AlignRight );
- headerItem->setToolTip( 0, i18nc("@action:button", "Download all messages now") );
- headerItem->setToolTip( 1, i18nc("@action:button", "Download all messages later") );
-@@ -76,9 +73,9 @@
- // Disable it for now.
- //header()->setResizeMode( 3, QHeaderView::Stretch );
- header()->setStretchLastSection( false );
-- setColumnWidth( 0, 22 ); // Download Now icon
-- setColumnWidth( 1, 22 ); // Download Later icon
-- setColumnWidth( 2, 22 ); // Delete icon
-+ setColumnWidth( 0, IconSize( KIconLoader::Small ) + 6 ); // Download Now icon
-+ setColumnWidth( 1, IconSize( KIconLoader::Small ) + 6 ); // Download Later icon
-+ setColumnWidth( 2, IconSize( KIconLoader::Small ) + 6 ); // Delete icon
- setColumnWidth( 3, 180 ); // Subject
- setColumnWidth( 4, 140 ); // Sender
- setColumnWidth( 5, 140); // Receiver
-@@ -150,7 +147,8 @@
- }
- }
-
--void KMPopHeadersView::slotRadioButtonClicked( QTreeWidgetItem* item, int column ) {
-+void KMPopHeadersView::slotRadioButtonClicked( QTreeWidgetItem* item, int column )
-+{
- assert( item && column >= 0 && column < NoAction );
- mDialog->setAction( item, mapToAction( column ) );
-
-Index: kmail/cachedimapjob.cpp
-===================================================================
---- kmail/cachedimapjob.cpp (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ kmail/cachedimapjob.cpp (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -510,7 +510,7 @@
- bool b = kmkernel->iCalIface().isResourceQuiet();
- kmkernel->iCalIface().setResourceQuiet( true );
-
-- mFolder->take( i );
-+ mFolder->takeTemporarily( i );
- mFolder->addMsgKeepUID( mMsg );
- mMsg->setTransferInProgress( false );
-
-Index: kmail/kmlineeditspell.cpp
-===================================================================
---- kmail/kmlineeditspell.cpp (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ kmail/kmlineeditspell.cpp (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -97,7 +97,7 @@
- const QAction *result = menu.exec( QCursor::pos() );
- if ( !result )
- return;
-- setText( contents + result->text() );
-+ setText( contents + KGlobal::locale()->removeAcceleratorMarker( result->text() ) );
++ if ( !m_articleLister || !m_articleLister->articleSelectionModel() )
++ return QList<Akregator::Article>();
+ return ::articlesForIndexes( m_articleLister->articleSelectionModel()->selectedRows(), m_feedList.get() );
}
- void KMLineEdit::dropEvent(QDropEvent *event)
-@@ -202,8 +202,13 @@
- int idx = addCompletionSource( i18n( "Recent Addresses" ) );
- for ( ; it != recent.end(); ++it ) {
- KABC::Addressee addr;
-- KPIMUtils::extractEmailAddressAndName(*it, email, name);
-- addr.setNameFromString( KPIMUtils::quoteNameIfNecessary( name ));
-+ KPIMUtils::extractEmailAddressAndName( *it, email, name );
-+ name = KPIMUtils::quoteNameIfNecessary( name );
-+ if ( ( name[0] == '"' ) && ( name[name.length() - 1] == '"' ) ) {
-+ name.remove( 0, 1 );
-+ name.truncate( name.length() - 1 );
-+ }
-+ addr.setNameFromString( name );
- addr.insertEmail( email, true );
- addContact( addr, 120, idx ); // more weight than kabc entries and more than ldap results
- }
-Index: kmail/kmreaderwin.cpp
+Index: akregator/src/articleformatter.cpp
===================================================================
---- kmail/kmreaderwin.cpp (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ kmail/kmreaderwin.cpp (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -2489,13 +2489,13 @@
- //-----------------------------------------------------------------------------
- void KMReaderWin::slotScrollPrior()
- {
-- mViewer->view()->scrollBy( 0, -(int)(height() * 0.8 ) );
-+ mViewer->view()->scrollBy( 0, -(int)(mViewer->widget()->height() * 0.8 ) );
- }
+--- akregator/src/articleformatter.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1088121)
++++ akregator/src/articleformatter.cpp (.../branches/KDE/4.4/kdepim) (wersja 1088121)
+@@ -101,9 +101,9 @@
+ virtual bool visitFeed(Feed* node)
+ {
+ text = QString("<div class=\"headerbox\" dir=\"%1\">\n").arg(QApplication::isRightToLeft() ? "rtl" : "ltr");
+-
+- text += QString("<div class=\"headertitle\" dir=\"%1\">").arg(Utils::directionOf(Utils::stripTags(node->title())));
+- text += node->title();
++ const QString strippedTitle = Utils::stripTags(node->title());
++ text += QString("<div class=\"headertitle\" dir=\"%1\">").arg(Utils::directionOf(strippedTitle));
++ text += strippedTitle;
+ if(node->unread() == 0)
+ text += i18n(" (no unread articles)");
+ else
+@@ -173,12 +173,13 @@
+ text = QString("<div class=\"headerbox\" dir=\"%1\">\n").arg(QApplication::isRightToLeft() ? "rtl" : "ltr");
+ const QString enc = formatEnclosure( *article.enclosure() );
+
+- if (!article.title().isEmpty())
++ const QString strippedTitle = Utils::stripTags( article.title() );
++ if (!strippedTitle.isEmpty())
+ {
+- text += QString("<div class=\"headertitle\" dir=\"%1\">\n").arg(Utils::directionOf(Utils::stripTags(article.title())));
++ text += QString("<div class=\"headertitle\" dir=\"%1\">\n").arg(Utils::directionOf(strippedTitle));
+ if (article.link().isValid())
+ text += "<a href=\""+article.link().url()+"\">";
+- text += article.title().replace('<', "<").replace('>', ">"); // TODO: better leave things escaped in the parser
++ text += strippedTitle;
+ if (article.link().isValid())
+ text += "</a>";
+ text += "</div>\n";
+@@ -367,12 +368,14 @@
+ const QString enc = formatEnclosure( *article.enclosure() );
+ text = QString("<div class=\"headerbox\" dir=\"%1\">\n").arg(QApplication::isRightToLeft() ? "rtl" : "ltr");
- //-----------------------------------------------------------------------------
- void KMReaderWin::slotScrollNext()
+- if (!article.title().isEmpty())
++ const QString strippedTitle = Utils::stripTags( article.title() );
++
++ if (!strippedTitle.isEmpty())
+ {
+- text += QString("<div class=\"headertitle\" dir=\"%1\">\n").arg(Utils::directionOf(Utils::stripTags(article.title())));
++ text += QString("<div class=\"headertitle\" dir=\"%1\">\n").arg(Utils::directionOf(strippedTitle));
+ if (article.link().isValid())
+ text += "<a href=\""+article.link().url()+"\">";
+- text += article.title().replace('<', "<").replace('>', ">"); // TODO: better leave things escaped in the parser
++ text += strippedTitle;
+ if (article.link().isValid())
+ text += "</a>";
+ text += "</div>\n";
+Index: akregator/src/articlemodel.cpp
+===================================================================
+--- akregator/src/articlemodel.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1088121)
++++ akregator/src/articlemodel.cpp (.../branches/KDE/4.4/kdepim) (wersja 1088121)
+@@ -58,12 +58,22 @@
+
+ };
+
++//like Syndication::htmlToPlainText, but without linebreaks
++
++static QString stripHtml( const QString& html ) {
++ QString str(html);
++ //TODO: preserve some formatting, such as line breaks
++ str.remove(QRegExp("<[^>]*>")); // remove tags
++ str = Syndication::resolveEntities(str);
++ return str.simplified();
++}
++
+ ArticleModel::Private::Private( const QList<Article>& articles_, ArticleModel* qq )
+ : q( qq ), articles( articles_ )
{
-- mViewer->view()->scrollBy( 0, (int)(height() * 0.8 ) );
-+ mViewer->view()->scrollBy( 0, (int)(mViewer->widget()->height() * 0.8 ) );
+ titleCache.resize( articles.count() );
+ for ( int i = 0; i < articles.count(); ++i )
+- titleCache[i] = Syndication::htmlToPlainText( articles[i].title() );
++ titleCache[i] = stripHtml( articles[i].title() );
}
- //-----------------------------------------------------------------------------
-Index: kmail/kmmessage.cpp
+ Akregator::ArticleModel::ArticleModel(const QList<Article>& articles, QObject* parent) : QAbstractTableModel( parent ), d( new Private( articles, this ) )
+Index: runtime/resources/pop3/accountdialog.cpp
===================================================================
---- kmail/kmmessage.cpp (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ kmail/kmmessage.cpp (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -3237,18 +3237,17 @@
- }
-
- //-----------------------------------------------------------------------------
--void KMMessage::updateAttachmentState( DwBodyPart *part )
-+void KMMessage::updateAttachmentState( DwBodyPart *partGiven )
- {
-+ DwEntity *part = partGiven;
-+ DwBodyPart *firstPart = partGiven;
-+
- if ( !part ) {
-- part = getFirstDwBodyPart();
-+ part = firstPart = getFirstDwBodyPart();
- }
-
- if ( !part ) {
-- // kDebug() <<"updateAttachmentState - no part!";
-- if ( mStatus.hasAttachment() ) {
-- toggleStatus( MessageStatus::statusHasAttachment() );
-- }
-- return;
-+ part = mMsg; // no part, use message itself
- }
-
- bool filenameEmpty = true;
-@@ -3294,8 +3293,8 @@
- }
+Index: runtime/resources/maildir/maildirresource.cpp
+===================================================================
+Index: runtime/resources/kabc/kresourceassistant.cpp
+===================================================================
+Index: kresources/remote/resourceremoteconfig.cpp
+===================================================================
+--- kresources/remote/resourceremoteconfig.cpp (.../tags/KDE/4.4.0/kdepim) (wersja 1088121)
++++ kresources/remote/resourceremoteconfig.cpp (.../branches/KDE/4.4/kdepim) (wersja 1088121)
+@@ -93,7 +93,7 @@
- // next part
-- if ( part->Next() ) {
-- updateAttachmentState( part->Next() );
-+ if ( firstPart && firstPart->Next() ) {
-+ updateAttachmentState( firstPart->Next() );
- } else if ( attachmentState() == KMMsgAttachmentUnknown &&
- mStatus.hasAttachment() ) {
- toggleStatus( MessageStatus::statusHasAttachment() );
-Index: kmail/messageactions.cpp
-===================================================================
---- kmail/messageactions.cpp (.../tags/KDE/4.3.1/kdepim) (wersja 1023019)
-+++ kmail/messageactions.cpp (.../branches/KDE/4.3/kdepim) (wersja 1023019)
-@@ -149,28 +149,29 @@
- mForwardActionMenu = new KActionMenu(KIcon("mail-forward"), i18nc("Message->","&Forward"), this);
- mActionCollection->addAction("message_forward", mForwardActionMenu );
-
-- mForwardAttachedAction = new KAction(KIcon("mail-forward"), i18nc("Message->Forward->","As &Attachment..."), this);
-- mActionCollection->addAction("message_forward_as_attachment", mForwardAttachedAction );
-- mForwardAttachedAction->setShortcut(QKeySequence(Qt::Key_F));
-- connect( mForwardAttachedAction, SIGNAL(triggered(bool) ),
-- parent, SLOT(slotForwardAttachedMsg()) );
-+ mForwardAttachedAction = new KAction( KIcon("mail-forward"),
-+ i18nc( "@action:inmenu Message->Forward->",
-+ "As &Attachment..." ),
-+ this );
-+ connect( mForwardAttachedAction, SIGNAL( triggered( bool ) ),
-+ parent, SLOT( slotForwardAttachedMsg() ) );
-+ mActionCollection->addAction( "message_forward_as_attachment", mForwardAttachedAction );
-
-- mForwardInlineAction = new KAction( KIcon( "mail-forward" ),
-+ mForwardInlineAction = new KAction( KIcon( "mail-forward" ),
- i18nc( "@action:inmenu Message->Forward->",
- "&Inline..." ),
- this );
-+ connect( mForwardInlineAction, SIGNAL( triggered( bool ) ),
-+ parent, SLOT( slotForwardInlineMsg() ) );
- mActionCollection->addAction( "message_forward_inline", mForwardInlineAction );
-- mForwardInlineAction->setShortcut( QKeySequence( Qt::SHIFT + Qt::Key_F ) );
-- connect( mForwardInlineAction, SIGNAL(triggered(bool) ),
-- parent, SLOT(slotForwardInlineMsg()) );
-
- setupForwardActions();
-
-- mRedirectAction = new KAction(i18nc("Message->Forward->", "&Redirect..."), this);
-- mActionCollection->addAction("message_forward_redirect", mRedirectAction );
-- connect( mRedirectAction, SIGNAL(triggered(bool)),
-- parent, SLOT(slotRedirectMsg()));
-- mRedirectAction->setShortcut(QKeySequence(Qt::Key_E));
-+ mRedirectAction = new KAction(i18nc("Message->Forward->", "&Redirect..."), this );
-+ mActionCollection->addAction( "message_forward_redirect", mRedirectAction );
-+ connect( mRedirectAction, SIGNAL( triggered( bool ) ),
-+ parent, SLOT( slotRedirectMsg() ) );
-+ mRedirectAction->setShortcut( QKeySequence( Qt::Key_E ) );
- mForwardActionMenu->addAction( mRedirectAction );
+ if ( mUploadUrl->url().isEmpty() && !resource->readOnly() ) {
+ KMessageBox::information( this, i18n( "You have specified no upload URL, "
+- "the calendar will be read-only." ), "RemoteResourseNoUploadURL" );
++ "the calendar will be read-only." ),QString(), "RemoteResourseNoUploadURL");
+ resource->setReadOnly( true );
+ }
+ } else {
+Index: doc/kwatchgnupg/index.docbook
+===================================================================
+--- doc/kwatchgnupg/index.docbook (.../tags/KDE/4.4.0/kdepim) (wersja 1088121)
++++ doc/kwatchgnupg/index.docbook (.../branches/KDE/4.4/kdepim) (wersja 1088121)
+@@ -47,7 +47,7 @@
- updateActions();
-@@ -269,18 +270,18 @@
+ <legalnotice>&GPLNotice;</legalnotice>
- void MessageActions::setupForwardingActionsList( KXMLGUIClient *guiClient )
- {
-- QList<QAction*> mForwardActionList;
-+ QList<QAction*> forwardActionList;
- guiClient->unplugActionList( "forward_action_list" );
- if ( GlobalSettings::self()->forwardingInlineByDefault() ) {
-- mForwardActionList.append( mForwardInlineAction );
-- mForwardActionList.append( mForwardAttachedAction );
-+ forwardActionList.append( mForwardInlineAction );
-+ forwardActionList.append( mForwardAttachedAction );
- }
- else {
-- mForwardActionList.append( mForwardAttachedAction );
-- mForwardActionList.append( mForwardInlineAction );
-+ forwardActionList.append( mForwardAttachedAction );
-+ forwardActionList.append( mForwardInlineAction );
- }
-- mForwardActionList.append( mRedirectAction );
-- guiClient->plugActionList( "forward_action_list", mForwardActionList );
-+ forwardActionList.append( mRedirectAction );
-+ guiClient->plugActionList( "forward_action_list", forwardActionList );
- }
+-<date>2004-05-09</date>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepim/kde4-kdepim-branch.diff?r1=1.14&r2=1.14.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepim/kde4-kdepim.spec?r1=1.116.2.24&r2=1.116.2.25&f=u
More information about the pld-cvs-commit
mailing list