SOURCES: kdepim-branch.diff - updated
arekm
arekm at pld-linux.org
Sat Feb 11 15:24:40 CET 2006
Author: arekm Date: Sat Feb 11 14:24:40 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdepim-branch.diff (1.15 -> 1.16)
---- Diffs:
================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.15 SOURCES/kdepim-branch.diff:1.16
--- SOURCES/kdepim-branch.diff:1.15 Sat Jan 21 23:58:52 2006
+++ SOURCES/kdepim-branch.diff Sat Feb 11 15:24:34 2006
@@ -1,12896 +1,1761 @@
Index: akregator/ChangeLog
===================================================================
---- akregator/ChangeLog (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/ChangeLog (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -1,10 +1,34 @@
- Akregator ChangeLog
+--- akregator/ChangeLog (.../tags/KDE/3.5.1/kdepim) (revision 508291)
++++ akregator/ChangeLog (.../branches/KDE/3.5/kdepim) (revision 508291)
+@@ -2,6 +2,15 @@
===================
--(c) 2004, 2005 the Akregator authors.
-+(c) 2004-2006 the Akregator authors.
+ (c) 2004-2006 the Akregator authors.
-+Changes after 1.2:
++Changes after 1.2.1:
+-----------------------------
+
+Bug fixes:
+
-+ 2006/01/17 Do not open binary files in the HTML viewer but externally.
-+ Fix Save Link As for binary files (regression introduced after 1.2)
-+ (#120087 (partially)) -fo
-+ 2006/01/16 Fix article order in Combined View: sort by date (reversed) (#118055) -fo
-+ 2006/01/15 Fix parsing of Atom 1.0 feeds with escaped HTML in it: Don't show tags
-+ as text (#112491, #117938) -fo
-+ 2006/01/10 Select next item in article list when deleting the selected article
-+ (single selection mode only) (#119724) -fo
-+ 2006/01/10 Fix item handling in the feed list, avoid crashes as happening
-+ after moving a folder and deleting a subitem afterwards
-+ (#118659) -fo
-+ 2006/01/08 Fix problems with keyboard navigation getting stuck on duplicated
-+ articles and prevent creation of new items when selecting an unread
-+ dupe (#114997) -fo
-+ 2005/12/05 Wait 30 minutes before retrying fetching when fetching failed (host
-+ down, parsing error) (#113358) -fo
++ 2006/01/31 RSS parser: ignore unknown or invalid version attribute value in the <rss> tag and
++ just assume RSS 2.0. The older formats are compatible to 2.0, so this should work.
++ (at least better than refusing to parse the feeds) (#118793) -fo
+
- Changes after 1.0:
+ Changes after 1.2:
-----------------------------
-+Note: This section (i.e. changes between 1.0 and 1.2) is completely incomplete
-+
- New features:
- - add "Save link as" to context menus -fo
-
-Index: akregator/src/articleviewer.cpp
-===================================================================
---- akregator/src/articleviewer.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/src/articleviewer.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -637,6 +637,7 @@
- return slotClear();
-
- QValueList<Article> articles = m_node->articles();
-+ qHeapSort(articles);
- QValueList<Article>::ConstIterator end = articles.end();
- QValueList<Article>::ConstIterator it = articles.begin();
-
-Index: akregator/src/notificationmanager.cpp
-===================================================================
---- akregator/src/notificationmanager.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/src/notificationmanager.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -33,7 +33,7 @@
- #include "feed.h"
- #include "notificationmanager.h"
-
--using namespace Akregator;
-+namespace Akregator {
-
- NotificationManager::NotificationManager() : QObject()
- {
-@@ -138,4 +138,6 @@
- return m_self;
- }
-
-+} // namespace Akregator
-+
- #include "notificationmanager.moc"
-Index: akregator/src/treenodeitem.cpp
-===================================================================
---- akregator/src/treenodeitem.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/src/treenodeitem.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -34,7 +34,7 @@
-
- #include <kdebug.h>
-
--using namespace Akregator;
-+namespace Akregator {
-
- TreeNodeItem::TreeNodeItem(FolderItem* parent, TreeNode* node)
- : KListViewItem(parent), m_node(node)
-@@ -160,7 +160,6 @@
- p->setPen( cg.highlightedText() );
- else
- p->setPen( cg.text() );*/
--
--
- }
-
-+} // namespace Akregator
-Index: akregator/src/tagnodeitem.cpp
-===================================================================
---- akregator/src/tagnodeitem.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/src/tagnodeitem.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -33,7 +33,7 @@
- #include <qpoint.h>
- #include <qpopupmenu.h>
-
--using namespace Akregator;
-+namespace Akregator {
-
- TagNodeItem::TagNodeItem(FolderItem* parent, TagNode* node) : TreeNodeItem(parent, node)
- {
-@@ -87,3 +87,5 @@
- TagNodeItem::~TagNodeItem()
- {}
-
-+} // namespace Akregator
-+
-Index: akregator/src/feed.cpp
-===================================================================
---- akregator/src/feed.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/src/feed.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -62,9 +62,14 @@
- bool markImmediatelyAsRead;
- bool useNotification;
- bool loadLinkedWebsite;
-- int lastFetched;
-
- bool fetchError;
-+
-+ int lastErrorFetch; // save time of last fetch that went wrong.
-+ // != lastFetch property from the archive
-+ // (that saves the last _successfull fetch!)
-+ // workaround for 3.5.x
-+
- int fetchTries;
- bool followDiscovery;
- RSS::Loader* loader;
-@@ -267,6 +272,7 @@
- d->markImmediatelyAsRead = false;
- d->useNotification = false;
- d->fetchError = false;
-+ d->lastErrorFetch = 0;
- d->fetchTries = 0;
- d->loader = 0;
- d->articlesLoaded = false;
-@@ -395,6 +401,14 @@
- queue->addFeed(this);
- else
- {
-+ uint now = QDateTime::currentDateTime().toTime_t();
-+
-+ // workaround for 3.5.x: if the last fetch went wrong, try again after 30 minutes
-+ // this fixes annoying behaviour of akregator, especially when the host is reachable
-+ // but Akregator can't parse the feed (the host is hammered every minute then)
-+ if ( fetchErrorOccurred() && now - d->lastErrorFetch <= 30*60 )
-+ return;
-+
- int interval = -1;
-
- if (useCustomFetchInterval() )
-@@ -405,8 +419,6 @@
-
- uint lastFetch = d->archive->lastFetch();
-
-- uint now = QDateTime::currentDateTime().toTime_t();
--
- if ( interval > 0 && now - lastFetch >= (uint)interval )
- queue->addFeed(this);
- }
-@@ -587,6 +599,7 @@
- else
- {
- d->fetchError = true;
-+ d->lastErrorFetch = QDateTime::currentDateTime().toTime_t();
- emit fetchError(this);
- }
- return;
-Index: akregator/src/articlelistview.cpp
-===================================================================
---- akregator/src/articlelistview.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/src/articlelistview.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -59,9 +59,21 @@
- class ArticleListView::ArticleListViewPrivate
- {
- public:
-+
-+ ArticleListViewPrivate(ArticleListView* parent) : m_parent(parent) { }
-+
-+ void ensureCurrentItemVisible()
-+ {
-+ if (m_parent->currentItem())
-+ {
-+ m_parent->center( m_parent->contentsX(), m_parent->itemPos(m_parent->currentItem()), 0, 9.0 );
-+ }
-+ }
-+
-+ ArticleListView* m_parent;
-+
- /** maps article to article item */
- QMap<Article, ArticleItem*> articleMap;
--
- TreeNode* node;
- Akregator::Filters::ArticleMatcher textFilter;
- Akregator::Filters::ArticleMatcher statusFilter;
-@@ -201,8 +213,9 @@
- /* ==================================================================================== */
-
- ArticleListView::ArticleListView(QWidget *parent, const char *name)
-- : KListView(parent, name), d (new ArticleListViewPrivate)
-+ : KListView(parent, name)
- {
-+ d = new ArticleListViewPrivate(this);
- d->noneSelected = true;
- d->node = 0;
- d->columnMode = ArticleListViewPrivate::feedMode;
-@@ -355,6 +368,12 @@
- {
- setUpdatesEnabled(false);
-
-+ // if only one item is selected and this selected item
-+ // is deleted, we will select the next item in the list
-+ bool singleSelected = selectedArticles().count() == 1;
-+
-+ QListViewItem* next = 0; // the item to select if a selected item is deleted
-+
- for (QValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
- {
-
-@@ -362,8 +381,16 @@
- {
- ArticleItem* ali = d->articleMap[*it];
-
-- if ((*it).isDeleted()) // if article was set to deleted, delete item
-+ if (ali && (*it).isDeleted()) // if article was set to deleted, delete item
- {
-+ if (singleSelected && ali->isSelected())
-+ {
-+ if (ali->itemBelow())
-+ next = ali->itemBelow();
-+ else if (ali->itemAbove())
-+ next = ali->itemAbove();
-+ }
-+
- d->articleMap.remove(*it);
- delete ali;
- }
-@@ -377,22 +404,55 @@
- }
- }
-
-+ // if the only selected item was deleted, select
-+ // an item next to it
-+ if (singleSelected && next != 0)
-+ {
-+ setSelected(next, true);
-+ setCurrentItem(next);
-+ }
-+
- setUpdatesEnabled(true);
- triggerUpdate();
- }
-
- void ArticleListView::slotArticlesRemoved(TreeNode* /*node*/, const QValueList<Article>& list)
- {
-+ // if only one item is selected and this selected item
-+ // is deleted, we will select the next item in the list
-+ bool singleSelected = selectedArticles().count() == 1;
-+
-+ QListViewItem* next = 0; // the item to select if a selected item is deleted
-+
- setUpdatesEnabled(false);
-+
- for (QValueList<Article>::ConstIterator it = list.begin(); it != list.end(); ++it)
- {
- if (d->articleMap.contains(*it))
- {
- ArticleItem* ali = d->articleMap[*it];
- d->articleMap.remove(*it);
-+
-+ if (singleSelected && ali->isSelected())
-+ {
-+ if (ali->itemBelow())
-+ next = ali->itemBelow();
-+ else if (ali->itemAbove())
-+ next = ali->itemAbove();
-+ }
-+
- delete ali;
- }
- }
-+
-+ // if the only selected item was deleted, select
-+ // an item next to it
-+ if (singleSelected && next != 0)
-+ {
-+ setSelected(next, true);
-+ setCurrentItem(next);
-+ }
-+
- setUpdatesEnabled(true);
- triggerUpdate();
- }
-@@ -524,7 +584,7 @@
- clearSelection();
- setSelected(d->articleMap[a], true);
- setCurrentItem(d->articleMap[a]);
-- ensureItemVisible(d->articleMap[a]);
-+ d->ensureCurrentItemVisible();
- }
- }
-
-@@ -542,7 +602,7 @@
- clearSelection();
- setSelected(d->articleMap[a], true);
- setCurrentItem(d->articleMap[a]);
-- ensureItemVisible(d->articleMap[a]);
-+ d->ensureCurrentItemVisible();
- }
- }
-
-@@ -572,7 +632,7 @@
- setCurrentItem(d->articleMap[a]);
- clearSelection();
- setSelected(d->articleMap[a], true);
-- ensureItemVisible(d->articleMap[a]);
-+ d->ensureCurrentItemVisible();
- }
- }
-
-@@ -602,7 +662,7 @@
- setCurrentItem(d->articleMap[a]);
- clearSelection();
- setSelected(d->articleMap[a], true);
-- ensureItemVisible(d->articleMap[a]);
-+ d->ensureCurrentItemVisible();
- }
- }
-
-Index: akregator/src/mainwindow.cpp
-===================================================================
---- akregator/src/mainwindow.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/src/mainwindow.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -59,7 +59,7 @@
- #include <qtimer.h>
-
-
--using namespace Akregator;
-+namespace Akregator {
-
- BrowserInterface::BrowserInterface( MainWindow *shell, const char *name )
- : KParts::BrowserInterface( shell, name )
-@@ -282,6 +282,8 @@
- m_statusLabel->setText(text);
- }
-
-+} // namespace Akregator
-+
- #include "mainwindow.moc"
-
-
-Index: akregator/src/librss/tools_p.cpp
-===================================================================
---- akregator/src/librss/tools_p.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/src/librss/tools_p.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -45,24 +45,42 @@
- return QString::null;
-
- QDomElement e = node.toElement();
-- QString result;
-+ QString result = e.text().stripWhiteSpace(); // let's assume plain text
-
-- if (elemName == "content" && ((e.hasAttribute("mode") && e.attribute("mode") == "xml") || !e.hasAttribute("mode")))
-- result = childNodesAsXML(node);
-- else
-- result = e.text();
--
-- bool hasPre = result.contains("<pre>",false);
-- bool hasHtml = hasPre || result.contains("<"); // FIXME: test if we have html, should be more clever -> regexp
-- if(!isInlined && !hasHtml) // perform nl2br if not a inline elt and it has no html elts
-- result = result = result.replace(QChar('\n'), "<br />");
-- if(!hasPre) // strip white spaces if no <pre>
-- result = result.simplifyWhiteSpace();
--
-- if (result.isEmpty())
-- return QString::null;
--
-- return result;
-+ bool doHTMLCheck = true;
-+
-+ if (elemName == "content") // we have Atom here
-+ {
-+ doHTMLCheck = false;
-+ // the first line is always the Atom 0.3, the second Atom 1.0
-+ if (( e.hasAttribute("mode") && e.attribute("mode") == "escaped" && e.attribute("type") == "text/html" )
-+ || (!e.hasAttribute("mode") && e.attribute("type") == "html"))
-+ {
-+ result = KCharsets::resolveEntities(e.text().simplifyWhiteSpace()); // escaped html
-+ }
-+ else if (( e.hasAttribute("mode") && e.attribute("mode") == "escaped" && e.attribute("type") == "text/plain" )
-+ || (!e.hasAttribute("mode") && e.attribute("type") == "text"))
-+ {
-+ result = e.text().stripWhiteSpace(); // plain text
-+ }
-+ else if (( e.hasAttribute("mode") && e.attribute("mode") == "xml" )
-+ || (!e.hasAttribute("mode") && e.attribute("type") == "xhtml"))
-+ {
-+ result = childNodesAsXML(e); // embedded XHMTL
-+ }
-+ }
-+
-+ if (doHTMLCheck) // check for HTML; not necessary for Atom:content
-+ {
-+ bool hasPre = result.contains("<pre>",false);
-+ bool hasHtml = hasPre || result.contains("<"); // FIXME: test if we have html, should be more clever -> regexp
-+ if(!isInlined && !hasHtml) // perform nl2br if not a inline elt and it has no html elts
-+ result = result = result.replace(QChar('\n'), "<br />");
-+ if(!hasPre) // strip white spaces if no <pre>
-+ result = result.simplifyWhiteSpace();
-+ }
-+
-+ return result.isEmpty() ? QString::null : result;
- }
-
- QString RSS::extractTitle(const QDomNode & parent)
-Index: akregator/src/actionmanagerimpl.cpp
+Index: akregator/src/librss/document.cpp
===================================================================
---- akregator/src/actionmanagerimpl.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/src/actionmanagerimpl.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -69,14 +69,14 @@
- public:
- NodeSelectVisitor(ActionManagerImpl* manager) : m_manager(manager) {}
-
-- virtual bool visitFeed(Feed* /*node*/)
-+ virtual bool visitFeed(Feed* node)
- {
- KAction* remove = m_manager->action("feed_remove");
- if (remove)
- remove->setEnabled(true);
- KAction* hp = m_manager->action("feed_homepage");
- if (hp)
-- remove->setEnabled(true);
-+ hp->setEnabled(!node->htmlUrl().isEmpty());
- m_manager->action("feed_fetch")->setText(i18n("&Fetch Feed"));
- m_manager->action("feed_remove")->setText(i18n("&Delete Feed"));
- m_manager->action("feed_modify")->setText(i18n("&Edit Feed..."));
-Index: akregator/src/mk4storage/metakit/src/column.cpp
-===================================================================
---- akregator/src/mk4storage/metakit/src/column.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/src/mk4storage/metakit/src/column.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -1441,8 +1441,9 @@
- Set(index_++, c4_Bytes (ptr, length));
+--- akregator/src/librss/document.cpp (.../tags/KDE/3.5.1/kdepim) (revision 508291)
++++ akregator/src/librss/document.cpp (.../branches/KDE/3.5/kdepim) (revision 508291)
+@@ -110,7 +110,8 @@
+ d->version = v0_93;
+ else if (attr == QString::fromLatin1("0.94"))
+ d->version = v0_94;
+- else if (attr.startsWith("2.0") || attr == QString::fromLatin1("2")) // http://www.breuls.org/rss puts 2.00 in version (BR #0000016)
++ else // otherwise, we just assume a RSS2 compatible feed. As rss2 is generally
++ // backward-compatible, this should work
+ d->version = v2_0;
}
- }
-- else
-+ else {
- d4_assert(count_ == 0);
-+ }
-
- FixSize(false);
- }
+
Index: akregator/src/mk4storage/akregator_mk4storage_plugin.desktop
===================================================================
---- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -5,12 +5,15 @@
- Name[cs]=Metakit ĂşloĹžiĹĄtÄ›
- Name[da]=Metakit lagringsgrĂŚnseflade
- Name[de]=Metakit Archiv-Modul
-+Name[el]=ÎŁĎĎƒĎ„ÎˇÎźÎą Ď
Ď€ÎżĎƒĎ„ÎŽĎΚΞΡς ιποθΎκξĎ
ĎƒÎˇĎ‚ Metakit
- Name[es]=Dorsal de almacenamiento Metakit
+--- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop (.../tags/KDE/3.5.1/kdepim) (revision 508291)
++++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop (.../branches/KDE/3.5/kdepim) (revision 508291)
+@@ -10,6 +10,7 @@
Name[et]=Metakiti salvestamisrakendus
-+Name[eu]=Metakit-en biltegiratze euskarria
+ Name[eu]=Metakit-en biltegiratze euskarria
Name[fr]=Stockage avec Metakit
++Name[hu]=Metakit tĂĄrolĂł
Name[is]=Metakit geymslu bakendi
Name[it]=Backend archiviazione metakit
Name[nb]=Metakit lagringsbakstykke
-+Name[nds]=Metakit-Archivmoduul
- Name[nl]=Metakit-opslagbackend
- Name[nn]=Metakit-lagringsbakstykke
- Name[pl]=System przechowywania Metakit
-@@ -21,35 +24,39 @@
+@@ -20,6 +21,7 @@
+ Name[pt]=Infra-estrutura de armazenamento Metakit
+ Name[pt_BR]=Mecanismo de armazenamento Metakit
+ Name[ru]=ДвиМОк Metakit
++Name[sl]=Shranjevanje Metakit
+ Name[sr]=ХиŃтоП Са ŃĐźĐľŃˆŃ‚Đ°ŃšĐľ ĐœĐľŃ‚Đ° кОПпНота
Name[sr at Latn]=Sistem za smeĹĄtanje Meta kompleta
Name[sv]=Metakit lagringsgränssnitt
- Name[uk]=ĐŸŃ€ĐžĐłŃ€Đ°ĐźĐ° ĐˇĐąĐľŃ€Ń–ĐłĐ°Đ˝Đ˝Ń Metakit
--Name[xx]=xxMetakit storage backendxx
- Name[zh_CN]=Metakit ĺ˜ĺ‚¨ĺŽçŤŻ
- X-KDE-Library=libakregator_mk4storage_plugin
- Comment=Plugin for Akregator
- Comment[bg]=ĐŸŃ€Đ¸Ńтавка Са Akregator
-+Comment[br]=Lugent evit Akregator
- Comment[cs]=Modul pro Akregator
- Comment[de]=Modul fĂźr Akregator
-+Comment[el]=Î ĎĎŒĎƒÎ¸ÎľĎ„Îż γΚι Ď„Îż Akregator
- Comment[es]=ExtensiĂłn para Akregator
- Comment[et]=Akregatori plugin
-+Comment[eu]=Akregator-en plugina
+@@ -38,6 +40,7 @@
Comment[fr]=Module pour Akregator
Comment[ga]=BreiseĂĄn Akregator
Comment[he]=תוץף עבור Akregator
++Comment[hu]=Akregator bĹ‘vĂtĹ‘modul
Comment[is]=Ăforrit fyrir Akregator
Comment[it]=Plugin per Akregator
-+Comment[ja]=Akregator ç”¨ăƒ—ăƒŠă‚°ă‚¤ăƒł
- Comment[lt]=Akregator skirtas priedas
- Comment[nb]=Programtillegg for Akregator
-+Comment[nds]=Moduul fĂśr Akregator
- Comment[nl]=Plugin voor Akregator
- Comment[nn]=Programtillegg til Akregator
- Comment[pl]=Wtyczka dla Akregatora
- Comment[pt]='Plugin' para o Akregator
- Comment[pt_BR]=Plugin para o Akregator
- Comment[ru]=ĐœĐžĐ´ŃƒĐťŃŒ Đ´ĐťŃ Akregator
-+Comment[sl]=Vstavek za Akregator
- Comment[sr]=ĐŸŃ€Đ¸ĐşŃ™ŃƒŃ‡Đ°Đş Са Akregator
- Comment[sr at Latn]=PrikljuÄak za Akregator
- Comment[sv]=Insticksprogram fĂśr Akregator
- Comment[tr]=Akregator Eklentisi
- Comment[uk]=Đ’Ń‚ŃƒĐťĐžĐş Đ´ĐťŃ Akregator
- Comment[uz]=Akregator ŃƒŃ‡ŃƒĐ˝ пНагин
--Comment[xx]=xxPlugin for Akregatorxx
- Comment[zh_CN]=Akregator ć’äťś
- ServiceTypes=Akregator/Plugin
-
-Index: akregator/src/akregator_part.cpp
-===================================================================
---- akregator/src/akregator_part.cpp (.../tags/KDE/3.5.0/kdepim) (revision 501053)
-+++ akregator/src/akregator_part.cpp (.../branches/KDE/3.5/kdepim) (revision 501053)
-@@ -393,12 +393,15 @@
- if (!doc.setContent(str))
- {
-
-- QString backup = m_file + "-backup." + QString::number(QDateTime::currentDateTime().toTime_t());
-+ if (file.size() > 0) // don't backup empty files
-+ {
-+ QString backup = m_file + "-backup." + QString::number(QDateTime::currentDateTime().toTime_t());
-+
-+ copyFile(backup);
-+
-+ KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") );
-+ }
-
-- copyFile(backup);
--
-- KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (invalid XML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("XML Parsing Error") );
--
- if (!doc.setContent(listBackup))
- doc = createDefaultFeedList();
- }
-@@ -406,11 +409,13 @@
-
- if (!m_view->loadFeeds(doc))
- {
-- QString backup = m_file + "-backup." + QString::number(QDateTime::currentDateTime().toTime_t());
-- copyFile(backup);
-+ if (file.size() > 0) // don't backup empty files
-+ {
-+ QString backup = m_file + "-backup." + QString::number(QDateTime::currentDateTime().toTime_t());
-+ copyFile(backup);
-
-- KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") );
--
-+ KMessageBox::error(m_view, i18n("<qt>The standard feed list is corrupted (no valid OPML). A backup was created:<p><b>%2</b></p></qt>").arg(backup), i18n("OPML Parsing Error") );
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.15&r2=1.16&f=u
More information about the pld-cvs-commit
mailing list