SOURCES: kdepim-branch.diff - up from upstream
arekm
arekm at pld-linux.org
Tue Dec 6 18:25:13 CET 2005
Author: arekm Date: Tue Dec 6 17:25:03 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up from upstream
---- Files affected:
SOURCES:
kdepim-branch.diff (1.9 -> 1.10)
---- Diffs:
================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.9 SOURCES/kdepim-branch.diff:1.10
--- SOURCES/kdepim-branch.diff:1.9 Fri Aug 26 11:43:22 2005
+++ SOURCES/kdepim-branch.diff Tue Dec 6 18:24:58 2005
@@ -1,1741 +1,7309 @@
+Index: akregator/ChangeLog
+===================================================================
+--- akregator/ChangeLog (.../tags/KDE/3.5.0/kdepim) (revision 486057)
++++ akregator/ChangeLog (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -2,9 +2,18 @@
+ ===================
+ (c) 2004, 2005 the Akregator authors.
+
++Changes after 1.2:
++
++Bug fixes:
++
++ 2005/12/05 Wait 30 minutes before retrying fetching when fetching failed (host down, parsing error)
++ (#113358) -fo
++
+ Changes after 1.0:
+ -----------------------------
+
++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/notificationmanager.cpp
+===================================================================
+--- akregator/src/notificationmanager.cpp (.../tags/KDE/3.5.0/kdepim) (revision 486057)
++++ akregator/src/notificationmanager.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -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 486057)
++++ akregator/src/treenodeitem.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -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 486057)
++++ akregator/src/tagnodeitem.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -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 486057)
++++ akregator/src/feed.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -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 486057)
++++ akregator/src/articlelistview.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -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;
+@@ -524,7 +537,7 @@
+ clearSelection();
+ setSelected(d->articleMap[a], true);
+ setCurrentItem(d->articleMap[a]);
+- ensureItemVisible(d->articleMap[a]);
++ d->ensureCurrentItemVisible();
+ }
+ }
+
+@@ -542,7 +555,7 @@
+ clearSelection();
+ setSelected(d->articleMap[a], true);
+ setCurrentItem(d->articleMap[a]);
+- ensureItemVisible(d->articleMap[a]);
++ d->ensureCurrentItemVisible();
+ }
+ }
+
+@@ -572,7 +585,7 @@
+ setCurrentItem(d->articleMap[a]);
+ clearSelection();
+ setSelected(d->articleMap[a], true);
+- ensureItemVisible(d->articleMap[a]);
++ d->ensureCurrentItemVisible();
+ }
+ }
+
+@@ -602,7 +615,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 486057)
++++ akregator/src/mainwindow.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -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/actionmanagerimpl.cpp
+===================================================================
+--- akregator/src/actionmanagerimpl.cpp (.../tags/KDE/3.5.0/kdepim) (revision 486057)
++++ akregator/src/actionmanagerimpl.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -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/akregator_mk4storage_plugin.desktop
+===================================================================
+--- akregator/src/mk4storage/akregator_mk4storage_plugin.desktop (.../tags/KDE/3.5.0/kdepim) (revision 486057)
++++ akregator/src/mk4storage/akregator_mk4storage_plugin.desktop (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -5,8 +5,10 @@
+ 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
+ Name[et]=Metakiti salvestamisrakendus
++Name[eu]=Metakit-en biltegiratze euskarria
+ Name[fr]=Stockage avec Metakit
+ Name[is]=Metakit geymslu bakendi
+ Name[it]=Backend archiviazione metakit
+@@ -21,20 +23,22 @@
+ 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[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
+ Comment[fr]=Module pour Akregator
+ Comment[ga]=BreiseĂĄn Akregator
+ Comment[he]=ת×ץף ע××ר Akregator
+ Comment[is]=Ăforrit fyrir Akregator
+ Comment[it]=Plugin per Akregator
++Comment[ja]=Akregator ç¨ăăŠă°ă¤ăł
+ Comment[lt]=Akregator skirtas priedas
+ Comment[nb]=Programtillegg for Akregator
+ Comment[nl]=Plugin voor Akregator
+@@ -43,13 +47,13 @@
+ 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/propertiesdialog.cpp
+===================================================================
+--- akregator/src/propertiesdialog.cpp (.../tags/KDE/3.5.0/kdepim) (revision 486057)
++++ akregator/src/propertiesdialog.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -36,7 +36,7 @@
+ #include <qbuttongroup.h>
+ #include <qradiobutton.h>
+
+-using namespace Akregator;
++namespace Akregator {
+
+ FeedPropertiesWidget::FeedPropertiesWidget(QWidget *parent, const char *name)
+ : FeedPropertiesWidgetBase(parent, name)
+@@ -318,5 +318,7 @@
+ widget->feedNameEdit->selectAll();
+ }
+
++} // namespace Akregator
++
+ #include "propertiesdialog.moc"
+ // vim: ts=4 sw=4 et
+Index: akregator/src/akregator_view.h
+===================================================================
+--- akregator/src/akregator_view.h (.../tags/KDE/3.5.0/kdepim) (revision 486057)
++++ akregator/src/akregator_view.h (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -32,6 +32,7 @@
+
+ #include <kurl.h>
+
++#include "akregator_run.h"
+ #include "feed.h"
+
+ class QSplitter;
+@@ -47,6 +48,7 @@
+ class KListView;
+ class KListViewItem;
+ class KTabWidget;
++class Viewer;
+
+ namespace KIO {
+
+@@ -60,6 +62,7 @@
+ class ArticleMatcher;
+ class ArticleListView;
+ class ArticleViewer;
++ class BrowserRun;
+ class Folder;
+ class FeedList;
+ class Frame;
+@@ -175,7 +178,7 @@
+ /** opens a page viewer in a new tab and loads an URL
+ @param url the url to load
+ @param background whether the tab should be opened in the background or in the foreground (activated after creation) */
+- void slotOpenTab(const KURL& url, bool background = false);
++ void slotOpenNewTab(const KURL& url, bool background = false);
+
+ /** called when another part/frame is activated. Updates progress bar, caption etc. accordingly
+ @param f the activated frame */
+@@ -273,7 +276,7 @@
+ void disconnectFromFeedList(FeedList* feedList);
+
+ void updateTagActions();
+-
++
+ protected slots:
+
+ /** this is called by the ctor, does init steps which need a properly created view and part */
+@@ -284,12 +287,17 @@
+
+ void setTabIcon(const QPixmap&);
+
+- /** Display article in external browser. */
+- void displayInExternalBrowser(const KURL &url);
+-
+ void slotDoIntervalFetches();
+ void slotDeleteExpiredArticles();
+
++ /** HACK: receives signal from browserrun when the browserrun detects an HTML mimetype and actually loads the page TODO: Remove for KDE 4.0 */
++ void slotOpenURLReply(const KURL& url, Akregator::Viewer* currentViewer, Akregator::BrowserRun::OpeningMode mode);
++
++ /** HACK: part of the url opening hack for 3.5. called when a viewer emits urlClicked(). TODO: Remove for KDE4 */
++ void slotUrlClickedInViewer(const KURL& url, bool background);
++
++ void slotOpenURL(const KURL& url, Akregator::Viewer* currentViewer, Akregator::BrowserRun::OpeningMode mode);
++
+ public: // compat with KDE-3.x assertions, remove for KDE 4
+ // private:
+
+Index: akregator/src/feeditem.cpp
+===================================================================
+--- akregator/src/feeditem.cpp (.../tags/KDE/3.5.0/kdepim) (revision 486057)
++++ akregator/src/feeditem.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -32,7 +32,7 @@
+ #include <kiconloader.h>
+ #include <qstring.h>
+
+-using namespace Akregator;
++namespace Akregator {
+
+ FeedItem::FeedItem(FolderItem* parent, Feed* node) : TreeNodeItem(parent, node)
+ {
+@@ -115,3 +115,5 @@
+ static_cast<QPopupMenu *>(w)->exec(p);
+ }
+
++} // namespace Akregator
++
+Index: akregator/src/folderitem.cpp
+===================================================================
+--- akregator/src/folderitem.cpp (.../tags/KDE/3.5.0/kdepim) (revision 486057)
++++ akregator/src/folderitem.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -31,7 +31,7 @@
+ #include <kaction.h>
+ #include <kiconloader.h>
+
+-using namespace Akregator;
++namespace Akregator {
+
+ FolderItem::FolderItem(FolderItem* parent, Folder* node) : TreeNodeItem(parent, node)
+ {
+@@ -82,3 +82,5 @@
+ if (w)
+ static_cast<QPopupMenu *>(w)->exec(p);
+ }
++
++} // namespace Akregator
+Index: akregator/src/addfeeddialog.cpp
+===================================================================
+--- akregator/src/addfeeddialog.cpp (.../tags/KDE/3.5.0/kdepim) (revision 486057)
++++ akregator/src/addfeeddialog.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -37,7 +37,7 @@
+ #include <ksqueezedtextlabel.h>
+ #include <kmessagebox.h>
+
+-using namespace Akregator;
++namespace Akregator {
+
+ AddFeedWidget::AddFeedWidget(QWidget *parent, const char *name)
+ : AddFeedWidgetBase(parent, name)
+@@ -117,5 +117,7 @@
+ enableButtonOK(!text.isEmpty());
+ }
+
++} // namespace Akregator
++
+ #include "addfeeddialog.moc"
+ // vim: ts=4 sw=4 et
Index: akregator/src/pageviewer.cpp
===================================================================
---- akregator/src/pageviewer.cpp (.../tags/KDE/3.4.2/kdepim) (revision 453465)
-+++ akregator/src/pageviewer.cpp (.../branches/KDE/3.4/kdepim) (revision 453465)
-@@ -361,7 +361,7 @@
- if (copylinkaddress)
+--- akregator/src/pageviewer.cpp (.../tags/KDE/3.5.0/kdepim) (revision 486057)
++++ akregator/src/pageviewer.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -237,12 +237,15 @@
+ closeURL();
+ }
+
+-void PageViewer::openPage(const KURL& url)
++bool PageViewer::openURL(const KURL& url)
+ {
+- Viewer::openPage(url);
++ updateHistoryEntry(); // update old history entry before switching to the new one
++ emit started(0);
+
+- addHistoryEntry(url);
++ bool val = KHTMLPart::openURL(url);
+
++ addHistoryEntry(url); // add new URL to history
++
+ d->backAction->setEnabled( d->current != d->history.begin() );
+ d->forwardAction->setEnabled( d->current != d->history.fromLast() );
+
+@@ -251,30 +254,11 @@
+ emit setTabIcon(QPixmap(KGlobal::dirs()->findResource("cache", favicon+".png")));
+ else
+ emit setTabIcon(SmallIcon("html"));
+-}
+
+-// Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp)
+-bool PageViewer::openURL(const KURL &url)
+-{
+- updateHistoryEntry();
+- new Akregator::BrowserRun(this, (QWidget*)parent(), this, url, browserExtension()->urlArgs());
+- emit started(0);
+-
+-// if (!d->restoring)
+-// addHistoryEntry(url);
+-//
+-// d->backAction->setEnabled( d->current != d->history.begin() );
+-// d->forwardAction->setEnabled( d->current != d->history.fromLast() );
+-//
+-// QString favicon = FeedIconManager::self()->iconLocation(url);
+-// if (!favicon.isEmpty())
+-// emit setTabIcon(QPixmap(KGlobal::dirs()->findResource("cache", favicon+".png")));
+-// else
+-// emit setTabIcon(SmallIcon("html"));
+-//
+- return true;
++ return val;
+ }
+
++
+ void PageViewer::slotOpenURLRequest(const KURL& url, const KParts::URLArgs& args)
+ {
+ updateHistoryEntry();
+@@ -494,7 +478,7 @@
+ // kurl.addPath(url);
+ if (kurl.isValid())
+ ;// slotOpenInNewWindow(kurl);
+-// openURL( kurl );
++// ( kurl );
+ }
+ }
+
+Index: akregator/src/viewer.cpp
+===================================================================
+--- akregator/src/viewer.cpp (.../tags/KDE/3.5.0/kdepim) (revision 486057)
++++ akregator/src/viewer.cpp (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -45,7 +45,7 @@
+ #include "akregator_run.h"
+ #include "akregatorconfig.h"
+
+-using namespace Akregator;
++namespace Akregator {
+
+ Viewer::Viewer(QWidget *parent, const char *name)
+ : KHTMLPart(parent, name), m_url(0)
+@@ -327,6 +327,8 @@
+ setStatusMessagesEnabled(false);
+ }
+
++} // namespace Akregator
++
+ #include "viewer.moc"
+
+ // vim: set et ts=4 sts=4 sw=4:
+Index: akregator/src/akregator_run.h
+===================================================================
+--- akregator/src/akregator_run.h (.../tags/KDE/3.5.0/kdepim) (revision 486057)
++++ akregator/src/akregator_run.h (.../branches/KDE/3.5/kdepim) (revision 486057)
+@@ -30,23 +30,37 @@
+ namespace Akregator
+ {
+
+- class Viewer;
+-
+- class BrowserRun : public KParts::BrowserRun
++class Viewer;
++
++class BrowserRun : public KParts::BrowserRun
+ {
+- Q_OBJECT
++ Q_OBJECT
+ public:
+- BrowserRun(Viewer *, QWidget *, KParts::ReadOnlyPart *, const KURL & , const KParts::URLArgs &);
++ /** indicates how HTML pages should be opened. It is passed in the constructor and sent back via the openInViewer signal. This is a workaround to fix opening of non-HTML mimetypes in 3.5, which will be refactored for KDE4 anyway. For 3.5.x it's the easiest way to fix the problem without changing too much code TODO KDE4: refactor, remove this enum */
++ enum OpeningMode
++ {
++ CURRENT_TAB,
++ NEW_TAB_FOREGROUND,
++ NEW_TAB_BACKGROUND,
++ EXTERNAL
++ };
++
++ BrowserRun(QWidget* mainWindow, Viewer* currentViewer, const KURL& url, const KParts::URLArgs& args, OpeningMode mode);
+ virtual ~BrowserRun();
+-
++
++ signals:
++
++ void signalOpenInViewer(const KURL&, Akregator::Viewer*, Akregator::BrowserRun::OpeningMode);
++
+ protected:
+- virtual void foundMimeType( const QString & _type );
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.9&r2=1.10&f=u
More information about the pld-cvs-commit
mailing list