SOURCES: kdepim-branch.diff - updated
arekm
arekm at pld-linux.org
Fri Sep 15 13:00:59 CEST 2006
Author: arekm Date: Fri Sep 15 11:00:59 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdepim-branch.diff (1.20 -> 1.21)
---- Diffs:
================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.20 SOURCES/kdepim-branch.diff:1.21
--- SOURCES/kdepim-branch.diff:1.20 Thu Sep 7 17:17:59 2006
+++ SOURCES/kdepim-branch.diff Fri Sep 15 13:00:54 2006
@@ -1,7 +1,7 @@
Index: akregator/ChangeLog
===================================================================
---- akregator/ChangeLog (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/ChangeLog (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/ChangeLog (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/ChangeLog (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -2,6 +2,22 @@
===================
(c) 2004-2006 the Akregator authors.
@@ -27,8 +27,8 @@
Index: akregator/src/aboutdata.cpp
===================================================================
---- akregator/src/aboutdata.cpp (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/aboutdata.cpp (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/src/aboutdata.cpp (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/aboutdata.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -31,7 +31,7 @@
AboutData::AboutData()
: KAboutData("akregator", I18N_NOOP("Akregator"), AKREGATOR_VERSION, I18N_NOOP("A KDE Feed Aggregator"),
@@ -40,9 +40,81 @@
addAuthor( "Teemu Rytilahti", I18N_NOOP("Developer"), "tpr at d5k.net" );
Index: akregator/src/articleviewer.cpp
===================================================================
---- akregator/src/articleviewer.cpp (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/articleviewer.cpp (.../branches/KDE/3.5/kdepim) (revision 581794)
-@@ -384,7 +384,7 @@
+--- akregator/src/articleviewer.cpp (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/articleviewer.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -187,8 +187,7 @@
+ const QColorGroup & cg = QApplication::palette().active();
+
+ // from kmail::headerstyle.cpp
+- m_normalModeCSS = QString (
+- "<style type=\"text/css\">\n"
++ m_normalModeCSS = QString(
+ "@media screen, print {"
+ "body {\n"
+ " font-family: \"%1\" ! important;\n"
+@@ -199,7 +198,7 @@
+ .arg(QString::number(pointsToPixel(Settings::mediumFontSize()))+"px")
+ .arg(cg.text().name())
+ .arg(cg.base().name());
+- m_normalModeCSS += (
++ m_normalModeCSS += QString(
+ "a {\n"
+ + QString(" color: %1 ! important;\n")
+ + QString(!Settings::underlineLinks() ? " text-decoration: none ! important;\n" : "")
+@@ -223,6 +222,7 @@
+ .arg(cg.highlightedText().name())
+ .arg(cg.highlightedText().name())
+ .arg(cg.highlightedText().name());
++
+ m_normalModeCSS += QString(
+ ".headertitle {\n"
+ " background: %1 ! important;\n"
+@@ -253,11 +253,12 @@
+ ".content > P:first-child {\n margin-top: 1px; }\n"
+ ".content > DIV:first-child {\n margin-top: 1px; }\n"
+ ".content > BR:first-child {\n display: none; }\n"
+- //".contentlink {\n display: block; }\n"
+- "}\n\n" // @media screen, print
+- // Why did we need that, bug #108187?
+- //"@media screen { body { overflow: auto; } }\n"
+- "\n\n");
++ "iframe {display: none !important; }\n"
++ "frame {display: none !important; }\n"
++ "frameset {display: none !important; }\n"
++ "object {display: none !important; }\n"
++ "applet {display: none !important; }\n"
++ "}\n\n"); // @media screen, print
+ }
+
+ void ArticleViewer::generateCombinedModeCSS()
+@@ -266,7 +267,7 @@
+
+ // from kmail::headerstyle.cpp
+ m_combinedModeCSS = QString (
+- "<style type=\"text/css\">\n"
++// "<style type=\"text/css\">\n"
+ "@media screen, print {"
+ "body {\n"
+ " font-family: \"%1\" ! important;\n"
+@@ -331,11 +332,12 @@
+ ".content > P:first-child {\n margin-top: 1px; }\n"
+ ".content > DIV:first-child {\n margin-top: 1px; }\n"
+ ".content > BR:first-child {\n display: none; }\n"
+- //".contentlink {\n display: block; }\n"
+- "}\n\n" // @media screen, print
+- // Why did we need that, bug #108187?
+- //"@media screen { body { overflow: auto; } }\n"
+- "\n\n");
++ "iframe {display: none !important; }\n"
++ "frame {display: none !important; }\n"
++ "frameset {display: none !important; }\n"
++ "object {display: none !important; }\n"
++ "applet {display: none !important; }\n"
++ "}\n\n"); // @media screen, print
+ }
+
+ void ArticleViewer::reload()
+@@ -384,7 +386,7 @@
"<p>Thank you,</p>\n"
"<p style='margin-bottom: 0px'> The Akregator Team</p>\n")
.arg(AKREGATOR_VERSION) // Akregator version
@@ -51,7 +123,7 @@
QString fontSize = QString::number( pointsToPixel( Settings::mediumFontSize() ));
QString appTitle = i18n("Akregator");
-@@ -428,8 +428,7 @@
+@@ -428,8 +430,7 @@
if (feed && !feed->image().isNull())
{
@@ -61,7 +133,7 @@
KURL u(m_imageDir);
u.setFileName(file);
text += QString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
-@@ -493,13 +492,15 @@
+@@ -493,13 +494,15 @@
QString text;
text = QString("<div class=\"headerbox\" dir=\"%1\">\n").arg(QApplication::reverseLayout() ? "rtl" : "ltr");
@@ -80,7 +152,7 @@
text += "</a>";
text += "</div>\n";
}
-@@ -524,8 +525,7 @@
+@@ -524,8 +527,7 @@
if (feed && !feed->image().isNull())
{
@@ -90,7 +162,7 @@
KURL u(m_imageDir);
u.setFileName(file);
text += QString("<a href=\"%1\"><img class=\"headimage\" src=\"%2.png\"></a>\n").arg(feed->htmlUrl()).arg(u.url());
-@@ -554,13 +554,13 @@
+@@ -554,13 +556,13 @@
text += "</a>";
}
@@ -107,10 +179,51 @@
}
else
{
+@@ -586,16 +588,10 @@
+
+ void ArticleViewer::beginWriting()
+ {
+- QString head = QString("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n <html><head><title>.</title>");
+-
+- if (m_viewMode == CombinedView)
+- head += m_combinedModeCSS;
+- else
+- head += m_normalModeCSS;
+-
+- head += "</style></head><body>";
++ QString head = QString("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n <html><head><title>.</title></head>");
+ view()->setContentsPos(0,0);
+ begin(m_link);
++ setUserStyleSheet(m_viewMode == CombinedView ? m_combinedModeCSS : m_normalModeCSS);
+ write(head);
+ }
+
+Index: akregator/src/storagefactory.h
+===================================================================
+--- akregator/src/storagefactory.h (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/storagefactory.h (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -25,6 +25,8 @@
+ #ifndef AKREGATOR_BACKEND_STORAGEFACTORY_H
+ #define AKREGATOR_BACKEND_STORAGEFACTORY_H
+
++#include "akregator_export.h"
++
+ class QString;
+ class QStringList;
+ class QWidget;
+@@ -33,7 +35,7 @@
+
+ class Storage;
+
+-class StorageFactory
++class AKREGATOR_EXPORT StorageFactory
+ {
+ public:
+
Index: akregator/src/feed.cpp
===================================================================
---- akregator/src/feed.cpp (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/feed.cpp (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/src/feed.cpp (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/feed.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -46,6 +46,7 @@
#include "feedstorage.h"
#include "storage.h"
@@ -145,8 +258,8 @@
Index: akregator/src/articlelistview.cpp
===================================================================
---- akregator/src/articlelistview.cpp (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/articlelistview.cpp (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/src/articlelistview.cpp (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/articlelistview.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -424,6 +424,11 @@
setSelected(next, true);
setCurrentItem(next);
@@ -188,7 +301,7 @@
Index: akregator/src/librss/feeddetector.h
===================================================================
--- akregator/src/librss/feeddetector.h (.../tags/KDE/3.5.4/kdepim) (revision 0)
-+++ akregator/src/librss/feeddetector.h (.../branches/KDE/3.5/kdepim) (revision 581794)
++++ akregator/src/librss/feeddetector.h (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -0,0 +1,80 @@
+/*
+ This file is part of Akregator.
@@ -272,8 +385,8 @@
+#endif //LIBRSS_FEEDDETECTOR_H
Index: akregator/src/librss/loader.cpp
===================================================================
---- akregator/src/librss/loader.cpp (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/librss/loader.cpp (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/src/librss/loader.cpp (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/librss/loader.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -10,6 +10,7 @@
*/
#include "loader.h"
@@ -383,8 +496,8 @@
#include "loader.moc"
Index: akregator/src/librss/Makefile.am
===================================================================
---- akregator/src/librss/Makefile.am (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/librss/Makefile.am (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/src/librss/Makefile.am (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/librss/Makefile.am (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -9,7 +9,7 @@
loader.h librss.h enclosure.h
@@ -397,7 +510,7 @@
Index: akregator/src/librss/feeddetector.cpp
===================================================================
--- akregator/src/librss/feeddetector.cpp (.../tags/KDE/3.5.4/kdepim) (revision 0)
-+++ akregator/src/librss/feeddetector.cpp (.../branches/KDE/3.5/kdepim) (revision 581794)
++++ akregator/src/librss/feeddetector.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -0,0 +1,179 @@
+/*
+ This file is part of Akregator.
@@ -578,10 +691,58 @@
+ endl;
+ return u.url();
+}
+Index: akregator/src/mk4storage/Makefile.am
+===================================================================
+--- akregator/src/mk4storage/Makefile.am (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/mk4storage/Makefile.am (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -21,10 +21,7 @@
+ libakregator_mk4storage_plugin_la_SOURCES = feedstoragemk4impl.cpp \
+ storagemk4impl.cpp \
+ storagefactorymk4impl.cpp \
+- mk4confwidgetbase.ui \
+- mk4confwidget.cpp \
+- mk4plugin.cpp \
+- mk4config.kcfgc
++ mk4plugin.cpp
+
+ METASOURCES = AUTO
+
+Index: akregator/src/mk4storage/storagefactorymk4impl.cpp
+===================================================================
+--- akregator/src/mk4storage/storagefactorymk4impl.cpp (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/mk4storage/storagefactorymk4impl.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -23,8 +23,8 @@
+ */
+ #include "storagefactorymk4impl.h"
+ #include "storagemk4impl.h"
+-#include "mk4confwidget.h"
+-#include "mk4config.h"
++//#include "mk4confwidget.h"
++//#include "mk4config.h"
+
+ #include <klocale.h>
+ #include <qstring.h>
+@@ -53,7 +53,7 @@
+
+
+ void StorageFactoryMK4Impl::configure()
+-{
++{ /*
+ MK4ConfWidgetBase* confWidget = new MK4ConfWidget();
+ // fill with Settings
+
+@@ -64,6 +64,7 @@
+ }
+
+ delete confWidget;
++ */
+ }
+
+ }
Index: akregator/src/feedlistview.cpp
===================================================================
---- akregator/src/feedlistview.cpp (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/feedlistview.cpp (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/src/feedlistview.cpp (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/feedlistview.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -72,47 +72,8 @@
DisconnectNodeVisitor* disconnectNodeVisitor;
CreateItemVisitor* createItemVisitor;
@@ -728,10 +889,46 @@
KURL::List urls;
KURLDrag::decode( e, urls );
e->accept();
+Index: akregator/src/plugin.h
+===================================================================
+--- akregator/src/plugin.h (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/plugin.h (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -4,6 +4,8 @@
+ #ifndef AKREGATOR_PLUGIN_H
+ #define AKREGATOR_PLUGIN_H
+
++#include "akregator_export.h"
++
+ #define AKREGATOR_EXPORT_PLUGIN( classname ) \
+ extern "C" { \
+ Akregator::Plugin* create_plugin() { return new classname; } \
+@@ -17,7 +19,7 @@
+ {
+ // class PluginConfig;
+
+- class Plugin
++ class AKREGATOR_EXPORT Plugin
+ {
+ public:
+ virtual ~Plugin();
+Index: akregator/src/Makefile.am
+===================================================================
+--- akregator/src/Makefile.am (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/Makefile.am (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -39,7 +39,8 @@
+ #########################################################################
+
+ # install headers (for storage plugins)
+-akregatorinclude_HEADERS = storage.h feedstorage.h storagefactory.h storagefactoryregistry.h plugin.h
++akregatorinclude_HEADERS = storage.h feedstorage.h storagefactory.h storagefactoryregistry.h \
++ plugin.h articleinterceptor.h akregator_export.h
+ akregatorincludedir = $(includedir)/akregator
+
+ # this is a lib shared by both the KPart and the main application
Index: akregator/src/pageviewer.cpp
===================================================================
---- akregator/src/pageviewer.cpp (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/pageviewer.cpp (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/src/pageviewer.cpp (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/pageviewer.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -175,7 +175,7 @@
// Taken from KDevelop (lib/widgets/kdevhtmlpart.cpp)
void PageViewer::slotForward()
@@ -741,10 +938,23 @@
{
QValueList<HistoryEntry>::Iterator tmp = d->current;
++tmp;
+Index: akregator/src/viewer.cpp
+===================================================================
+--- akregator/src/viewer.cpp (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/viewer.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -51,7 +51,7 @@
+ : KHTMLPart(parent, name), m_url(0)
+ {
+ setZoomFactor(100);
+- setJScriptEnabled(true);
++ setJScriptEnabled(false);
+ setJavaEnabled(true);
+ setMetaRefreshEnabled(true);
+ setPluginsEnabled(true);
Index: akregator/src/utils.h
===================================================================
---- akregator/src/utils.h (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/utils.h (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/src/utils.h (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/utils.h (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -43,6 +43,14 @@
*/
@@ -760,10 +970,32 @@
};
}
+Index: akregator/src/storagefactoryregistry.h
+===================================================================
+--- akregator/src/storagefactoryregistry.h (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/storagefactoryregistry.h (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -25,6 +25,8 @@
+ #ifndef AKREGATOR_BACKEND_STORAGEFACTORYREGISTRY_H
+ #define AKREGATOR_BACKEND_STORAGEFACTORYREGISTRY_H
+
++#include "akregator_export.h"
++
+ class QString;
+ class QStringList;
+
+@@ -33,7 +35,7 @@
+
+ class StorageFactory;
+
+-class StorageFactoryRegistry
++class AKREGATOR_EXPORT StorageFactoryRegistry
+ {
+ public:
+ static StorageFactoryRegistry* self();
Index: akregator/src/akregator_run.cpp
===================================================================
---- akregator/src/akregator_run.cpp (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/akregator_run.cpp (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/src/akregator_run.cpp (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/akregator_run.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -31,7 +31,7 @@
@@ -773,10 +1005,65 @@
{
m_currentViewer = currentViewer;
m_openingMode = mode;
+Index: akregator/src/storage.h
+===================================================================
+--- akregator/src/storage.h (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/storage.h (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -27,6 +27,8 @@
+
+ #include <qobject.h>
+
++#include "akregator_export.h"
++
+ class QString;
+ class QStringList;
+
+@@ -39,7 +41,7 @@
+
+ An archive implementation must implement Storage, FeedStorage and StorageFactory. See mk4storage for an example.
+ */
+-class Storage : public QObject
++class AKREGATOR_EXPORT Storage : public QObject
+ {
+ public:
+
+Index: akregator/src/akregator_export.h
+===================================================================
+--- akregator/src/akregator_export.h (.../tags/KDE/3.5.4/kdepim) (revision 0)
++++ akregator/src/akregator_export.h (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -0,0 +1,28 @@
++/*
++ This file is part of Akregator.
++
++ Copyright (C) 2006 Frank Osterfeld <frank.osterfeld at kdemail.net>
++
++ This library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public
++ License as published by the Free Software Foundation; either
++ version 2 of the License, or (at your option) any later version.
++
++ This library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public License
++ along with this library; see the file COPYING.LIB. If not, write to
++ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ Boston, MA 02110-1301, USA.
++*/
++#ifndef AKREGATOR_AKREGATOREXPORT_H
++#define AKREGATOR_AKREGATOREXPORT_H
++
++#include <kdepimmacros.h>
++
++#define AKREGATOR_EXPORT KDE_EXPORT
++
++#endif
Index: akregator/src/akregator.desktop
===================================================================
---- akregator/src/akregator.desktop (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/akregator.desktop (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/src/akregator.desktop (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/akregator.desktop (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -58,7 +58,6 @@
Comment[fi]=RSS-syĂśtelukija
Comment[fr]=Un lecteur de flux RSS pour KDE
@@ -785,10 +1072,41 @@
Comment[hu]=KDE-s hĂrolvasĂł RSS hĂrcsatornĂĄkhoz
Comment[is]=RSS frĂŠttaforrit fyrir KDE
Comment[it]=Un concentratore KDE per RSS
+Index: akregator/src/feedstorage.h
+===================================================================
+--- akregator/src/feedstorage.h (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/feedstorage.h (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -27,6 +27,8 @@
+ #include <qobject.h>
+ #include <qstring.h>
+
++#include "akregator_export.h"
++
+ class QStringList;
+
+
+@@ -34,7 +36,7 @@
+ namespace Backend {
+
+ /** a convenience class to handle categories in the backend */
+-class Category
++class AKREGATOR_EXPORT Category
+ {
+ public:
+
+@@ -62,7 +64,7 @@
+
+ class Storage;
+
+-class FeedStorage : public QObject
++class AKREGATOR_EXPORT FeedStorage : public QObject
+ {
+ public:
+
Index: akregator/src/utils.cpp
===================================================================
---- akregator/src/utils.cpp (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/utils.cpp (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/src/utils.cpp (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/utils.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -44,4 +44,16 @@
return hash;
}
@@ -806,10 +1124,45 @@
}
+
+}
+Index: akregator/src/articleinterceptor.h
+===================================================================
+--- akregator/src/articleinterceptor.h (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/articleinterceptor.h (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -1,15 +1,19 @@
+ #ifndef AKREGATOR_ARTICLEINTERCEPTOR_H
+ #define AKREGATOR_ARTICLEINTERCEPTOR_H
+
++#include "akregator_export.h"
++
+ template <class T> class QValueList;
+
+ namespace Akregator {
+
+ class Article;
+
+-/** Interface for intercepting new articles which were just fetched before adding them to the archive. E.g. an article filter could implement this interface to get fetched articles and label them */
++/** Interface for intercepting new articles which were just fetched before adding
++ * them to the archive. E.g. an article filter could implement this interface to
++ * get fetched articles and label them */
+
+-class ArticleInterceptor
++class AKREGATOR_EXPORT ArticleInterceptor
+ {
+ public:
+ /** processes an article. Note that the interceptor may modify the article */
+@@ -18,7 +22,7 @@
+ };
+
+ /** Singleton managing the interceptors */
+-class ArticleInterceptorManager
++class AKREGATOR_EXPORT ArticleInterceptorManager
+ {
+ public:
+
Index: akregator/src/akregator_view.cpp
===================================================================
---- akregator/src/akregator_view.cpp (.../tags/KDE/3.5.4/kdepim) (revision 581794)
-+++ akregator/src/akregator_view.cpp (.../branches/KDE/3.5/kdepim) (revision 581794)
+--- akregator/src/akregator_view.cpp (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ akregator/src/akregator_view.cpp (.../branches/KDE/3.5/kdepim) (revision 584596)
@@ -819,6 +819,9 @@
m_articleViewer->slotShowSummary(node);
}
@@ -832,10 +1185,22 @@
}
}
+Index: kmobile/kmobile.desktop
+===================================================================
+--- kmobile/kmobile.desktop (.../tags/KDE/3.5.4/kdepim) (revision 584596)
++++ kmobile/kmobile.desktop (.../branches/KDE/3.5/kdepim) (revision 584596)
+@@ -12,6 +12,7 @@
+ Name[nn]=KMobil
+ Name[sv]=Kmobile
+ Name[ta]=ŕŽ•ŕŻ‡ŕŽ¨ŕŽŸŕŽŽŕŽžŕŽŸŕŻŕŽŽŕŻ ŕŽ¤ŕŻŠŕŽ˛ŕŻˆŕŽŞŕŻ‡ŕŽšŕŽż
++Name[zh_TW]=KMobile čĄŒĺ‹•čŁç˝Ž
+
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.20&r2=1.21&f=u
More information about the pld-cvs-commit
mailing list