Author: arekm Date: Thu May 28 19:39:00 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3; branch diff is back
---- Files affected:
packages/kde4-kdepim:
kde4-kdepim-branch.diff (1.9 -> 1.10) , kde4-kdepim.spec (1.94 -> 1.95)
---- Diffs:
================================================================
Index: packages/kde4-kdepim/kde4-kdepim-branch.diff
diff -u packages/kde4-kdepim/kde4-kdepim-branch.diff:1.9
packages/kde4-kdepim/kde4-kdepim-branch.diff:1.10
--- packages/kde4-kdepim/kde4-kdepim-branch.diff:1.9 Sun Apr 19 18:52:38 2009
+++ packages/kde4-kdepim/kde4-kdepim-branch.diff Thu May 28 21:38:52 2009
@@ -1,6367 +1,5930 @@
-Index: akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop
+Index: akregator/plugins/mk4storage/feedstoragemk4impl.cpp
===================================================================
---- akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop
(.../tags/KDE/4.2.2/kdepim) (wersja 956244)
-+++ akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop
(.../branches/KDE/4.2/kdepim) (wersja 956244)
-@@ -11,6 +11,7 @@
- Name[fr]=Prise en charge des lecteurs en ligne pour Akregator
- Name[ga]=Tacaíocht Akregator do Léitheoirí Fothaí Ar Líne
- Name[gl]=Funcionalidade de Lector de Fontes en Liña do Akregator
-+Name[hu]=Akregator-támogatás online hírolvasókhoz
- Name[it]=Supporto di Akregator per i lettori di fonti in linea
- Name[ja]=Akregator のオンラインフィードリーダーのサポート
- Name[km]=គាំទ្រកម្មវិធីអានមតិព័ត៌មានលើបណ្ដាញរបស់ Akregator
-Index: akregator/plugins/onlinesync/akregator_config_onlinesync.desktop
-===================================================================
---- akregator/plugins/onlinesync/akregator_config_onlinesync.desktop
(.../tags/KDE/4.2.2/kdepim) (wersja 956244)
-+++ akregator/plugins/onlinesync/akregator_config_onlinesync.desktop
(.../branches/KDE/4.2/kdepim) (wersja 956244)
-@@ -21,6 +21,7 @@
- Name[fr]=Lecteurs en ligne
- Name[ga]=Léitheoirí Ar Líne
- Name[gl]=Lector de Novas en Liña
-+Name[hu]=Online hírolvasók
- Name[it]=Lettore di fonti in linea
- Name[ja]=オンラインリーダー
- Name[km]=កម្មវិធីអានលើបណ្ដាញ
-@@ -55,6 +56,7 @@
- Comment[fr]=Configurer les lecteurs en ligne
- Comment[ga]=Cumraigh Léitheoirí Ar Líne
- Comment[gl]=Configurar Lectores en Liña
-+Comment[hu]=Az online hírolvasók beállítása
- Comment[it]=Configura lettori di fonti in linea
- Comment[ja]=オンラインリーダーの設定
- Comment[km]=កំណត់រចនាសម្ព័ន្ធកម្មវិធីអានលើបណ្ដាញ
-Index: akregator/src/notificationmanager.cpp
-===================================================================
---- akregator/src/notificationmanager.cpp (.../tags/KDE/4.2.2/kdepim)
(wersja 956244)
-+++ akregator/src/notificationmanager.cpp (.../branches/KDE/4.2/kdepim)
(wersja 956244)
-@@ -76,7 +76,7 @@
- if (feeds.count() == 1)
- {
- //KNotifyClient::Instance inst(m_instance);
-- KNotification::event("feed_added", i18n("Feed added:\n %1",
feeds[0]), QPixmap() ,m_widget);
-+ KNotification::event("FeedAdded", i18n("Feed added:\n %1", feeds[0]),
QPixmap() ,m_widget, KNotification::CloseOnTimeout, m_instance);
- }
- else if (feeds.count() > 1)
+--- akregator/plugins/mk4storage/feedstoragemk4impl.cpp
(.../tags/KDE/4.2.3/kdepim) (wersja 974231)
++++ akregator/plugins/mk4storage/feedstoragemk4impl.cpp
(.../branches/KDE/4.2/kdepim) (wersja 974231)
+@@ -95,10 +95,6 @@
+ StorageMK4Impl* mainStorage;
+ c4_View archiveView;
+
+- c4_Storage* catStorage;
+- c4_View catView;
+- c4_Storage* tagStorage;
+- c4_View tagView;
+ bool autoCommit;
+ bool modified;
+ bool convert;
+@@ -159,23 +155,12 @@
+
+ c4_View hash = d->storage->GetAs("archiveHash[_H:I,_R:I]");
+ d->archiveView = d->archiveView.Hash(hash, 1); // hash on guid
+-
+-
+- d->tagStorage = new c4_Storage((filePath + ".mk4___TAGS").toLocal8Bit(),
true);
+- d->tagView =
d->tagStorage->GetAs("tagIndex[tag:S,taggedArticles[guid:S]]");
+- hash = d->tagStorage->GetAs("archiveHash[_H:I,_R:I]");
+- d->tagView = d->tagView.Hash(hash, 1); // hash on tag
+-
+- d->catStorage = new c4_Storage((filePath +
".mk4___CATEGORIES").toLocal8Bit(), true);
+- d->catView =
d->catStorage->GetAs("catIndex[catTerm:S,catScheme:S,catName:S,categorizedArticles[guid:S]]");
+ }
+
+
+ FeedStorageMK4Impl::~FeedStorageMK4Impl()
+ {
+ delete d->storage;
+- delete d->tagStorage;
+- delete d->catStorage;
+ delete d; d = 0;
+ }
+
+@@ -194,8 +179,6 @@
+ if (d->modified)
{
-@@ -84,7 +84,7 @@
- for (QStringList::ConstIterator it = feeds.begin(); it !=
feeds.end(); ++it)
- message += *it + '\n';
- //KNotifyClient::Instance inst(m_instance);
-- KNotification::event("feed_added", i18n("Feeds added:\n %1",
message), QPixmap() ,m_widget);
-+ KNotification::event("FeedAdded", i18n("Feeds added:\n %1", message),
QPixmap() ,m_widget, KNotification::CloseOnTimeout, m_instance);
+ d->storage->Commit();
+- d->tagStorage->Commit();
+- d->catStorage->Commit();
}
+ d->modified = false;
+ }
+@@ -203,8 +186,6 @@
+ void FeedStorageMK4Impl::rollback()
+ {
+ d->storage->Rollback();
+- d->tagStorage->Rollback();
+- d->catStorage->Rollback();
}
-@@ -92,20 +92,18 @@
+ void FeedStorageMK4Impl::close()
+@@ -244,11 +225,14 @@
+ QStringList FeedStorageMK4Impl::articles(const QString& tag) const
{
- QString message = "<html><body>";
- QString feedTitle;
-- QList<Article>::ConstIterator it = m_articles.constBegin();
-- QList<Article>::ConstIterator en = m_articles.constEnd();
-- for (; it != en; ++it)
-+
-+ Q_FOREACH( const Article& i, m_articles )
+ QStringList list;
++#if 0 //category and tag support disabled
+ if (tag.isNull()) // return all articles
{
-- if (feedTitle != (*it).feed()->title())
-+ if (feedTitle != i.feed()->title())
- {
-- feedTitle = (*it).feed()->title();
-+ feedTitle = i.feed()->title();
- message += QString("<p><b>%1:</b></p>").arg(feedTitle);
++#endif
+ int size = d->archiveView.GetSize();
+ for (int i = 0; i < size; i++) // fill with guids
+ list += QString(d->pguid(d->archiveView.GetAt(i)));
++#if 0 //category and tag support disabled
+ }
+ else
+ {
+@@ -265,13 +249,14 @@
}
-- message += (*it).title() + "<br>";
-+ message += i.title() + "<br>";
+
}
- message += "</body></html>";
-- //KNotifyClient::Instance inst(m_instance);
-- KNotification::event("new_articles", message,QPixmap() ,m_widget);
-+ KNotification::event("NewArticles", message, QPixmap() ,m_widget,
KNotification::CloseOnTimeout, m_instance);
-
- m_articles.clear();
- m_running = false;
-@@ -125,7 +123,7 @@
- m_addedInLastInterval = false;
- QTimer::singleShot(m_checkInterval, this, SLOT(slotIntervalCheck()));
- }
--
-+
++#endif
+ return list;
}
- NotificationManager* NotificationManager::m_self;
-Index: akregator/src/akregator.notifyrc
-===================================================================
---- akregator/src/akregator.notifyrc (.../tags/KDE/4.2.2/kdepim) (wersja
956244)
-+++ akregator/src/akregator.notifyrc (.../branches/KDE/4.2/kdepim) (wersja
956244)
-@@ -5,7 +5,7 @@
- Comment[pa]=ਅਕਰੀਗੇਟਰ
- Comment[x-test]=xxAkregatorxx
-
--[Event/feed_added]
-+[Event/FeedAdded]
- Name=Feed added
- Name[af]=Stroom bygevoeg
- Name[ca]=Font afegida
-@@ -101,9 +101,9 @@
- Comment[x-test]=xxA new feed was remotely added to Akregatorxx
- Comment[zh_CN]=远程添加新种子进了 Akregator
- Comment[zh_TW]=已從遠端新增 Feed 到 Akregator
--Action=Logfile
-+Action=Popup
-
--[Event/new_articles]
-+[Event/NewArticles]
- Name=New Articles
- Name[af]=Nuwe Artikels
- Name[br]=Pennadoù nevez
-@@ -202,5 +202,5 @@
- Comment[x-test]=xxNew articles were fetchedxx
- Comment[zh_CN]=获取了新文章
- Comment[zh_TW]=有新文章進來
--Action=Logfile
-+Action=Popup
-
-Index: akregator/src/trayicon.h
-===================================================================
---- akregator/src/trayicon.h (.../tags/KDE/4.2.2/kdepim) (wersja 956244)
-+++ akregator/src/trayicon.h (.../branches/KDE/4.2/kdepim) (wersja 956244)
-@@ -50,11 +50,7 @@
- void settingsChanged();
- void slotSetUnread(int unread);
- void viewButtonClicked();
-- void slotActivated(QSystemTrayIcon::ActivationReason reason);
-
-- signals:
-- void toggleShowPart();
+ QStringList FeedStorageMK4Impl::articles(const Category& cat) const
+ {
+ QStringList list;
-
- private:
- static TrayIcon* m_instance;
-
-Index: akregator/src/feed.cpp
-===================================================================
---- akregator/src/feed.cpp (.../tags/KDE/4.2.2/kdepim) (wersja 956244)
-+++ akregator/src/feed.cpp (.../branches/KDE/4.2/kdepim) (wersja 956244)
-@@ -31,6 +31,7 @@
- #include "feedstorage.h"
- #include "fetchqueue.h"
- #include "folder.h"
-+#include "notificationmanager.h"
- #include "storage.h"
- #include "treenodevisitor.h"
- #include "types.h"
-@@ -462,6 +463,7 @@
- {
- d->setTotalCountDirty();
- bool changed = false;
-+ const bool notify = useNotification() || Settings::useNotifications();
-
- QList<ItemPtr> items = feed->items();
- QList<ItemPtr>::ConstIterator it = items.constBegin();
-@@ -486,7 +488,8 @@
- mya.setStatus(New);
- else
- mya.setStatus(Read);
--
-+ if ( notify )
-+ NotificationManager::self()->slotNotifyArticle( mya );
- changed = true;
- }
- else // article is in list
-@@ -513,6 +516,7 @@
- }
++#if 0 //category and tag support disabled
+ c4_Row catrow;
+ d->pcatTerm(catrow) = cat.term.toUtf8().data();
+ d->pcatScheme(catrow) = cat.scheme.toUtf8().data();
+@@ -285,7 +270,7 @@
+ for (int i = 0; i < size; i++)
+ list += QString(d->pguid(catView.GetAt(i)));
}
-
-+
- QList<Article>::ConstIterator dit = deletedArticles.constBegin();
- QList<Article>::ConstIterator dtmp;
- QList<Article>::ConstIterator den = deletedArticles.constEnd();
-Index: akregator/src/akregator_part.h
-===================================================================
---- akregator/src/akregator_part.h (.../tags/KDE/4.2.2/kdepim) (wersja
956244)
-+++ akregator/src/akregator_part.h (.../branches/KDE/4.2/kdepim) (wersja
956244)
-@@ -133,7 +133,6 @@
- void showKNotifyOptions();
-
- signals:
-- void toggleShowPart();
- void signalSettingsChanged();
-
-
-@@ -150,9 +149,6 @@
-
- void importFile(const KUrl& url);
-
-- /** FIXME: hack to get the tray icon working */
-- QWidget* getMainWindow();
-
- KParts::Part *hitTest(QWidget *widget, const QPoint &globalPos);
-
- private slots:
-Index: akregator/src/mainwindow.cpp
-===================================================================
---- akregator/src/mainwindow.cpp (.../tags/KDE/4.2.2/kdepim) (wersja
956244)
-+++ akregator/src/mainwindow.cpp (.../branches/KDE/4.2/kdepim) (wersja
956244)
-@@ -110,7 +110,6 @@
-
- connect(m_part, SIGNAL(setWindowCaption(QString)), this,
SLOT(setCaption(QString)) );
- connect(TrayIcon::getInstance(), SIGNAL(quitSelected()), this,
SLOT(slotQuit()));
-- connect(m_part, SIGNAL(toggleShowPart()), this,
SLOT(slotToggleVisibility()) );
-
- createGUI(m_part);
- browserExtension(m_part)->setBrowserInterface(m_browserIface);
-@@ -236,11 +235,6 @@
- m_statusLabel->setText(text);
++#endif
+ return list;
}
--void MainWindow::slotToggleVisibility()
--{
-- setVisible(!isVisible());
--}
+@@ -636,7 +621,7 @@
+ d->pcatTerm(catrow) = cat.term.toUtf8().data();
+ d->pcatScheme(catrow) = cat.scheme.toUtf8().data();
+ d->pcatName(catrow) = cat.name.toUtf8().data();
-
- void MainWindow::autoSaveProperties()
- {
- KConfig config("autosaved", KConfig::SimpleConfig,
-Index: akregator/src/akregator_part.cpp
-===================================================================
---- akregator/src/akregator_part.cpp (.../tags/KDE/4.2.2/kdepim) (wersja
956244)
-+++ akregator/src/akregator_part.cpp (.../branches/KDE/4.2/kdepim) (wersja
956244)
-@@ -154,23 +154,18 @@
- // notify the part that this is our internal widget
- setWidget(m_mainWidget);
-
-- TrayIcon* trayIcon = new TrayIcon( getMainWindow() );
-+ TrayIcon* trayIcon = new TrayIcon( m_mainWidget->window() );
- TrayIcon::setInstance(trayIcon);
- m_actionManager->initTrayIcon(trayIcon);
++#if 0 //category and tag support disabled
+ int catidx2 = d->catView.Find(catrow);
- connect(trayIcon, SIGNAL(toggleShowPart()), this,
SIGNAL(toggleShowPart()));
-
- if ( isTrayIconEnabled() )
-- {
- trayIcon->show();
--#ifdef __GNUC__
--#warning this needs a way to get the position of the systray
--#endif
-- NotificationManager::self()->setWidget(0, componentData());
-- }
-- else
-- NotificationManager::self()->setWidget(getMainWindow(),
componentData());
+ if (catidx2 == -1)
+@@ -657,7 +642,7 @@
+ d->pcategorizedArticles(catrow2) = catView2;
+ d->catView.SetAt(catidx2, catrow2);
+ }
+-
++#endif
+ markDirty();
+ }
+ }
+@@ -691,6 +676,7 @@
+ }
+ else // return all categories in the feed
+ {
++#if 0 //category and tag support disabled
+ int size = d->catView.GetSize();
+ for (int i = 0; i < size; i++)
+ {
+@@ -703,6 +689,8 @@
-+ QWidget* const notificationParent = isTrayIconEnabled() ?
m_mainWidget->window() : 0;
-+ NotificationManager::self()->setWidget(notificationParent,
componentData());
+ list += cat;
+ }
++#endif
+
- connect( trayIcon, SIGNAL(quitSelected()),
- kapp, SLOT(quit())) ;
+ }
-@@ -224,11 +219,7 @@
+ return list;
+@@ -710,6 +698,7 @@
- void Part::slotSettingsChanged()
+ void FeedStorageMK4Impl::addTag(const QString& guid, const QString& tag)
{
--#ifdef __GNUC__
--#warning Tray icons are no longer widgets
--#endif
--// NotificationManager::self()->setWidget(isTrayIconEnabled() ?
TrayIcon::getInstance() : getMainWindow(), instance());
-- NotificationManager::self()->setWidget( getMainWindow(), componentData());
-+ NotificationManager::self()->setWidget(isTrayIconEnabled() ?
m_mainWidget->window() : 0, componentData());
++#if 0 //category and tag support disabled
+ int findidx = findArticle(guid);
+ if (findidx == -1)
+ return;
+@@ -747,10 +736,12 @@
+ }
+ markDirty();
+ }
++#endif
+ }
- Syndication::FileRetriever::setUseCache(Settings::useHTMLCache());
+ void FeedStorageMK4Impl::removeTag(const QString& guid, const QString& tag)
+ {
++#if 0 //category and tag support disabled
+ int findidx = findArticle(guid);
+ if (findidx == -1)
+ return;
+@@ -789,12 +780,13 @@
-@@ -458,29 +449,6 @@
- return Settings::showTrayIcon();
+ markDirty();
+ }
++#endif
}
--QWidget* Part::getMainWindow()
--{
-- // this is a dirty fix to get the main window used for the tray icon
-- QWidgetList l = QApplication::topLevelWidgets();
-- QWidget* wid = 0L;
--
-- // check if there is an akregator main window
-- foreach (wid, QApplication::topLevelWidgets())
-- {
-- if (wid->objectName() == "akregator_mainwindow")
-- return wid;
-- }
--
-- // if not, check if there is an kontact main window
-- foreach (wid, QApplication::topLevelWidgets())
-- {
-- if (wid->objectName().startsWith("kontact-mainwindow"))
-- return wid;
-- }
+ QStringList FeedStorageMK4Impl::tags(const QString& guid) const
+ {
+ QStringList list;
-
-- return 0;
--}
++#if 0 //category and tag support disabled
+ if (!guid.isNull()) // return tags for an articles
+ {
+ int findidx = findArticle(guid);
+@@ -815,7 +807,7 @@
+ for (int i = 0; i < size; i++)
+ list += QString(d->ptag(d->tagView.GetAt(i)));
+ }
-
- void Part::importFile(const KUrl& url)
++#endif
+ return list;
+ }
+
+@@ -905,7 +897,7 @@
+ void FeedStorageMK4Impl::clear()
{
- QString filename;
-Index: akregator/src/akregator.desktop
+ d->storage->RemoveAll();
+- d->tagStorage->RemoveAll();
++
+ setUnread(0);
+ markDirty();
+ }
+Index: akregator/plugins/CMakeLists.txt
===================================================================
---- akregator/src/akregator.desktop (.../tags/KDE/4.2.2/kdepim) (wersja
956244)
-+++ akregator/src/akregator.desktop (.../branches/KDE/4.2/kdepim) (wersja
956244)
-@@ -18,6 +18,7 @@
- GenericName[fr]=Lecteur de flux
- GenericName[ga]=Léitheoir Fothaí
- GenericName[gl]=Lector de Novas
-+GenericName[hu]=Hírolvasó
- GenericName[it]=Lettore di fonti
- GenericName[ja]=フィードリーダー
- GenericName[km]=កម្មវិធីអានមតិព័ត៌មាន
-@@ -53,6 +54,7 @@
- Comment[fr]=Un lecteur de flux pour KDE
- Comment[ga]=Léitheoir Fothaí KDE
- Comment[gl]=Un lector de novas para o KDE
-+Comment[hu]=RSS-alapú hírolvasó a KDE-hez
- Comment[it]=Un lettore di fonti per KDE
- Comment[ja]=KDE のフィードリーダー
- Comment[km]=កម្មវិធីអានមតិព័ត៌មានរបស់ KDE
-Index: akregator/src/mainwindow.h
-===================================================================
---- akregator/src/mainwindow.h (.../tags/KDE/4.2.2/kdepim) (wersja 956244)
-+++ akregator/src/mainwindow.h (.../branches/KDE/4.2/kdepim) (wersja 956244)
-@@ -88,7 +88,6 @@
- public slots:
- void slotClearStatusText();
- void slotSetStatusBarText(const QString &c);
-- void slotToggleVisibility();
+--- akregator/plugins/CMakeLists.txt (.../tags/KDE/4.2.3/kdepim) (wersja
974231)
++++ akregator/plugins/CMakeLists.txt (.../branches/KDE/4.2/kdepim) (wersja
974231)
+@@ -1,3 +1,8 @@
+ add_subdirectory( mk4storage )
++
++# onlinesync plugin is broken, thus disabled
++# minimal TODO before reactivating this:
++# * make it work
++# * make it use KWallet instead of plaintext KConfig to store the password
+ add_subdirectory( onlinesync )
- protected:
- /**
-Index: akregator/src/mainwidget.cpp
+Index: akregator/src/articleviewer.cpp
===================================================================
---- akregator/src/mainwidget.cpp (.../tags/KDE/4.2.2/kdepim) (wersja
956244)
-+++ akregator/src/mainwidget.cpp (.../branches/KDE/4.2/kdepim) (wersja
956244)
-@@ -125,8 +125,6 @@
- m_horizontalSplitter->setOpaqueResize(true);
- lt->addWidget(m_horizontalSplitter);
-
-- connect(Kernel::self()->fetchQueue(), SIGNAL(fetched(Akregator::Feed*)),
-- this, SLOT(slotFeedFetched(Akregator::Feed*)));
- connect(Kernel::self()->fetchQueue(), SIGNAL(signalStarted()),
- this, SLOT(slotFetchingStarted()));
- connect(Kernel::self()->fetchQueue(), SIGNAL(signalStopped()),
-@@ -820,26 +818,6 @@
- m_mainFrame->slotSetStatusText(QString());
+--- akregator/src/articleviewer.cpp (.../tags/KDE/4.2.3/kdepim) (wersja
974231)
++++ akregator/src/articleviewer.cpp (.../branches/KDE/4.2/kdepim) (wersja
974231)
+@@ -304,7 +304,9 @@
+ QClipboard *cb = QApplication::clipboard();
+ cb->setText(m_url.prettyUrl(), QClipboard::Clipboard);
+ // don't set url to selection as it's a no-no according to a fd.o spec
+- //cb->setText(m_url.prettyUrl(), QClipboard::Selection);
++ // which spec? Nobody seems to care (tested Firefox (3.5.10)
Konqueror,and KMail (4.2.3)), so I re-enable the following line unless someone
gives
++ // a good reason to remove it again (bug 183022) --Frank
++ cb->setText(m_url.prettyUrl(), QClipboard::Selection);
}
--void Akregator::MainWidget::slotFeedFetched(Feed *feed)
--{
-- // iterate through the articles (once again) to do notifications properly
-- if (feed->articles().count() > 0)
-- {
-- QList<Article> articles = feed->articles();
-- QList<Article>::ConstIterator it;
-- QList<Article>::ConstIterator end = articles.constEnd();
-- for (it = articles.constBegin(); it != end; ++it)
-- {
-- if ((*it).status()==Akregator::New &&
((*it).feed()->useNotification() || Settings::useNotifications()))
-- {
-- NotificationManager::self()->slotNotifyArticle(*it);
-- }
-- }
-- }
--}
--
--
--
- void Akregator::MainWidget::slotArticleSelected(const Akregator::Article&
article)
- {
- if (m_viewMode == CombinedView)
-Index: akregator/src/createfeedcommand.cpp
+ void ArticleViewer::slotSelectionChanged()
+@@ -710,9 +712,9 @@
+ if(url == "config:/disable_introduction")
+ {
+ KGuiItem yesButton(KStandardGuiItem::yes());
+- yesButton.setText(i18n("Keep Enabled"));
++ yesButton.setText(i18n("Disable"));
+ KGuiItem noButton(KStandardGuiItem::no());
+- noButton.setText(i18n("Disable"));
++ noButton.setText(i18n("Keep Enabled"));
+ if(KMessageBox::questionYesNo( widget(), i18n("Are you sure you want
to disable this introduction page?"), i18n("Disable Introduction Page"),
yesButton, noButton) == KMessageBox::Yes)
+ {
+ KConfigGroup conf(Settings::self()->config(), "General");
+Index: akregator/src/selectioncontroller.cpp
===================================================================
---- akregator/src/createfeedcommand.cpp (.../tags/KDE/4.2.2/kdepim)
(wersja 956244)
-+++ akregator/src/createfeedcommand.cpp (.../branches/KDE/4.2/kdepim)
(wersja 956244)
-@@ -36,6 +36,7 @@
-
- #include <QPointer>
- #include <QTimer>
-+#include <QClipboard>
-
- #include <cassert>
-
-@@ -75,8 +76,20 @@
+--- akregator/src/selectioncontroller.cpp (.../tags/KDE/4.2.3/kdepim)
(wersja 974231)
++++ akregator/src/selectioncontroller.cpp (.../branches/KDE/4.2/kdepim)
(wersja 974231)
+@@ -181,7 +181,7 @@
+
+ void Akregator::SelectionController::articleHeadersAvailable()
+ {
+- ArticleModel* const newModel = new ArticleModel( m_selectedSubscription );
++ ArticleModel* const newModel = new ArticleModel( m_selectedSubscription,
this );
+ m_articleLister->setIsAggregation(
m_selectedSubscription->isAggregation() );
+ m_articleLister->setArticleModel( newModel );
+ delete m_articleModel;
+Index: akregator/src/feed.cpp
+===================================================================
+--- akregator/src/feed.cpp (.../tags/KDE/4.2.3/kdepim) (wersja 974231)
++++ akregator/src/feed.cpp (.../branches/KDE/4.2/kdepim) (wersja 974231)
+@@ -668,7 +668,7 @@
+ }
<<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.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdepim/kde4-kdepim.spec?r1=1.94&r2=1.95&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
