SOURCES: kdepim-branch.diff - updated
arekm
arekm at pld-linux.org
Tue Aug 2 08:09:34 CEST 2005
Author: arekm Date: Tue Aug 2 06:09:34 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
kdepim-branch.diff (1.7 -> 1.8)
---- Diffs:
================================================================
Index: SOURCES/kdepim-branch.diff
diff -u SOURCES/kdepim-branch.diff:1.7 SOURCES/kdepim-branch.diff:1.8
--- SOURCES/kdepim-branch.diff:1.7 Wed Mar 30 15:35:36 2005
+++ SOURCES/kdepim-branch.diff Tue Aug 2 08:09:29 2005
@@ -1,11809 +1,909 @@
-diff -urN -x CVS kdepim.orig/admin/acinclude.m4.in kdepim/admin/acinclude.m4.in
---- kdepim.orig/admin/acinclude.m4.in 2005-02-09 23:21:09.000000000 +0100
-+++ kdepim/admin/acinclude.m4.in 2005-03-24 20:18:09.000000000 +0100
-@@ -1644,7 +1644,15 @@
-
- AC_MSG_RESULT([$kde_cv_uic_plugins])
- if test "$kde_cv_uic_plugins" != yes; then
-- AC_MSG_ERROR([you need to install kdelibs first.])
-+ AC_MSG_ERROR([
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs.
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if its the
-+same Qt version, compiled with the same compiler and the same Qt
-+configuration settings.
-+])
- fi
- fi
- ])
-@@ -3104,8 +3112,8 @@
- fi
- rm -f conftest.h conftest.h.gch
- fi
-- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
- fi
-+ AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
- if test "$CXX" = "KCC"; then
- dnl unfortunately we currently cannot disable exception support in KCC
- dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
-@@ -3194,6 +3202,51 @@
- ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
- ])
-
-+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
-+ [
-+ AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
-+ [
-+ AC_LANG_SAVE
-+ AC_LANG_CPLUSPLUS
-+
-+ safe_CXXFLAGS=$CXXFLAGS
-+ safe_LDFLAGS=$LDFLAGS
-+ CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+ LDFLAGS="$LDFLAGS -shared -fPIC"
-+
-+ AC_TRY_LINK(
-+ [
-+ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-+ template<typename CharT>
-+ struct VisTest
-+ {
-+ inline VisTest ();
-+ };
-+ template<typename CharT>
-+ inline VisTest<CharT>::VisTest()
-+ {}
-+ extern template class VisTest<char>; // It works if we drop that line
-+ int some_function( int do_something ) __attribute__ ((visibility("default")));
-+ int some_function( int )
-+ {
-+ VisTest<char> a;
-+ return 0;
-+ }
-+ ], [/* elvis is alive */],
-+ kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
-+
-+ CXXFLAGS=$safe_CXXFLAGS
-+ LDFLAGS=$safe_LDFLAGS
-+ AC_LANG_RESTORE
-+ ]
-+ )
-+
-+ if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+ fi
-+ ]
-+)
-+
- AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
- [
- if test "$GXX" = "yes"; then
-@@ -3202,7 +3255,9 @@
- KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
- KDE_CHECK_COMPILER_FLAG(fvisibility=hidden,
- [
-- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+ KDE_CHECK_VISIBILITY_GCC_BUG
-+
- HAVE_GCC_VISIBILITY=1
- AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
- ])
-diff -urN -x CVS kdepim.orig/admin/am_edit kdepim/admin/am_edit
---- kdepim.orig/admin/am_edit 2004-12-17 21:18:28.000000000 +0100
-+++ kdepim/admin/am_edit 2005-03-29 11:15:16.000000000 +0200
-@@ -483,6 +483,7 @@
- $MakefileData =~ s/$lookup/$replacement/;
- $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
- $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
-+ next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);
- substituteLine($lookup, $replacement);
- } else {
- $found = 0;
-@@ -634,7 +635,7 @@
- if ($pre eq '' && exists($varcontent{$variable})) {
- my @addlist = split(/[\034\s]+/, $varcontent{$variable});
- push(@objlist, @addlist);
-- } elsif ($variable !~ 'OBJEXT') {
-+ } elsif ($variable !~ 'OBJEXT' && $variable !~ /am__objects_\d+/ ) {
- $ocv = 1;
- }
- }
-@@ -2276,7 +2277,7 @@
- "\t echo \"\$\$i\"; \\\n" .
- "\t if ! ";
- $t .= $cxxsuffix eq "KKK" ?
-- "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
-+ "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
- "\$(CXXCOMPILE) ";
- $t .= " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
- "\t rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
-@@ -2352,7 +2353,7 @@
- $MakefileData =~ s/\034/\\\n/g; # Restore continuation lines
- # Append our $progId line, _below_ the "generated by automake" line
- # because automake-1.6 relies on the first line to be his own.
-- my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
-+ my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
- if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
- warn "automake line not found in $makefile\n";
- # Fallback: first line
-diff -urN -x CVS kdepim.orig/akregator/ChangeLog kdepim/akregator/ChangeLog
---- kdepim.orig/akregator/ChangeLog 2005-02-13 00:02:18.000000000 +0100
-+++ kdepim/akregator/ChangeLog 2005-03-22 08:43:50.000000000 +0100
-@@ -2,6 +2,20 @@
- ===================
- (c) 2004, 2005 the Akregator authors.
-
-+Changes after 1.0
-+-----------------------------
-+
-+Changes:
-+ - Changed prev/next unread article actions to cycle through all unread articles -fo
-+
-+Bug fixes:
-+ - make BrowserRun delete itself when the Viewer gets destroyed (#101413) -tpr
-+ - tolerate leading and trailing whitespace in the Add Feed Dialog (#101988) -fo
-+ - fixed confusion of "disable archiving" and expiry by age (#101907) -fo
-+ - show open|save|cancel dialog for non-html links (101274) -fo
-+ - make forms work again (regression) #94964 -fo
-+ - fix notification when running as kontact plugin -fo
-+
- Changes after 1.0b9:
- -----------------------------
-
-diff -urN -x CVS kdepim.orig/akregator/src/addfeeddialog.cpp kdepim/akregator/src/addfeeddialog.cpp
---- kdepim.orig/akregator/src/addfeeddialog.cpp 2005-03-02 22:27:31.000000000 +0100
-+++ kdepim/akregator/src/addfeeddialog.cpp 2005-03-20 16:54:30.000000000 +0100
-@@ -68,7 +68,7 @@
- void AddFeedDialog::slotOk( )
- {
- enableButtonOK(false);
-- feedURL = widget->urlEdit->text();
-+ feedURL = widget->urlEdit->text().stripWhiteSpace();
-
- Feed *f=new Feed();
-
-diff -urN -x CVS kdepim.orig/akregator/src/akregator.desktop kdepim/akregator/src/akregator.desktop
---- kdepim.orig/akregator/src/akregator.desktop 2005-02-23 06:06:58.000000000 +0100
-+++ kdepim/akregator/src/akregator.desktop 2005-03-28 09:03:32.000000000 +0200
-@@ -1,7 +1,6 @@
- [Desktop Entry]
- Encoding=UTF-8
- Name=Akregator
--Name[xx]=xxAkregatorxx
- Exec=akregator %i %m -caption "%c"
- Icon=akregator
- Type=Application
-@@ -27,6 +26,8 @@
- GenericName[pt_BR]=Leitor de Fontes de NotĂcias RSS
- GenericName[ru]=Чтонио Нонт нОвОŃтоК
- GenericName[sl]=Bralnik dovodov RSS
-+GenericName[sr]=Читач RSS дОвОда
-+GenericName[sr at Latn]=ÄŒitaÄ RSS dovoda
- GenericName[sv]=Läsare av RSS-källor
- GenericName[uk]=ĐŸŃ€ĐžĐłŃ€Đ°ĐźĐ° Đ´ĐťŃ Ń‡Đ¸Ń‚Đ°Đ˝Đ˝Ń ĐżĐžĐ´Đ°Ń‡ RSS
- GenericName[zh_CN]=RSS ç§ĺé˜
话器
-@@ -50,6 +51,8 @@
- Comment[pt_BR]=Um Agregador RSS para o KDE
- Comment[ru]=Чтонио Нонт нОвОŃтоК RSS
- Comment[sl]=Zbiralnik RSS za KDE
-+Comment[sr]=ĐĄĐ°ĐşŃƒĐżŃ™Đ°Ń‡ RSS дОвОда Са KDE
-+Comment[sr at Latn]=SakupljaÄ RSS dovoda za KDE
- Comment[sv]=En RSS-samlare fĂśr KDE
- Comment[uk]=ĐгрогатОр RSS Đ´ĐťŃ KDE
- Comment[zh_CN]=KDE RSS 新闝攜集器
-diff -urN -x CVS kdepim.orig/akregator/src/akregator_part.cpp kdepim/akregator/src/akregator_part.cpp
---- kdepim.orig/akregator/src/akregator_part.cpp 2005-03-02 22:27:31.000000000 +0100
-+++ kdepim/akregator/src/akregator_part.cpp 2005-03-05 10:47:29.000000000 +0100
-@@ -202,10 +202,10 @@
- if ( isTrayIconEnabled() )
- {
- m_trayIcon->show();
-- NotificationManager::self()->setWidget(m_trayIcon);
-+ NotificationManager::self()->setWidget(m_trayIcon, instance());
- }
- else
-- NotificationManager::self()->setWidget(getMainWindow());
-+ NotificationManager::self()->setWidget(getMainWindow(), instance());
-
- connect( m_trayIcon, SIGNAL(quitSelected()),
- kapp, SLOT(quit())) ;
-@@ -240,7 +240,7 @@
-
- void Part::slotSettingsChanged()
- {
-- NotificationManager::self()->setWidget(isTrayIconEnabled() ? m_trayIcon : getMainWindow());
-+ NotificationManager::self()->setWidget(isTrayIconEnabled() ? m_trayIcon : getMainWindow(), instance());
-
- RSS::FileRetriever::setUseCache(Settings::useHTMLCache());
-
-diff -urN -x CVS kdepim.orig/akregator/src/akregator_part.desktop kdepim/akregator/src/akregator_part.desktop
---- kdepim.orig/akregator/src/akregator_part.desktop 2005-02-13 05:30:58.000000000 +0100
-+++ kdepim/akregator/src/akregator_part.desktop 2005-03-07 15:21:27.000000000 +0100
-@@ -6,7 +6,6 @@
- Name[fi]=AkregatorPart
- Name[pt_BR]=Componente do aKregator
- Name[sv]=aKregator-delprogram
--Name[xx]=xxaKregatorPartxx
- ServiceTypes=KParts/ReadOnlyPart
- X-KDE-Library=libakregatorpart
- Type=Service
-diff -urN -x CVS kdepim.orig/akregator/src/akregator_run.cpp kdepim/akregator/src/akregator_run.cpp
---- kdepim.orig/akregator/src/akregator_run.cpp 2005-03-02 22:27:31.000000000 +0100
-+++ kdepim/akregator/src/akregator_run.cpp 2005-03-19 18:54:32.000000000 +0100
-@@ -34,6 +34,7 @@
- : KParts::BrowserRun(url, args, part, parent, false, true)
- {
- m_viewer=viewer;
-+ connect(m_viewer, SIGNAL(destroyed()), this, SLOT(killMyself()));
- }
-
- BrowserRun::~BrowserRun()
-@@ -46,7 +47,13 @@
- if (type=="text/html" ||type=="text/xml" || type=="application/xhtml+xml" )
- m_viewer->openPage(url());
- else
-- KParts::BrowserRun::foundMimeType( type );
-+ KParts::BrowserRun::handleNonEmbeddable( type );
-+}
-+
-+void BrowserRun::killMyself()
-+{
-+ kdDebug() << "BrowserRun::killMyself()" << endl;
-+ delete this;
- }
-
- #include "akregator_run.moc"
-diff -urN -x CVS kdepim.orig/akregator/src/akregator_run.h kdepim/akregator/src/akregator_run.h
---- kdepim.orig/akregator/src/akregator_run.h 2005-03-02 22:27:31.000000000 +0100
-+++ kdepim/akregator/src/akregator_run.h 2005-03-19 18:54:32.000000000 +0100
-@@ -42,6 +42,9 @@
- protected:
- virtual void foundMimeType( const QString & _type );
-
-+ private slots:
-+ void killMyself();
-+
- private:
- Viewer *m_viewer;
- };
-diff -urN -x CVS kdepim.orig/akregator/src/akregator_view.cpp kdepim/akregator/src/akregator_view.cpp
---- kdepim.orig/akregator/src/akregator_view.cpp 2005-03-02 22:27:31.000000000 +0100
-+++ kdepim/akregator/src/akregator_view.cpp 2005-03-20 12:06:19.000000000 +0100
-@@ -1021,12 +1021,20 @@
-
- void View::slotNextUnreadArticle()
- {
-- m_articles->slotNextUnreadArticle();
-+ TreeNode* sel = m_tree->selectedNode();
-+ if (sel && sel->unread() > 0)
-+ m_articles->slotNextUnreadArticle();
-+ else
-+ slotNextUnreadFeed();
- }
-
- void View::slotPrevUnreadArticle()
- {
-- m_articles->slotPreviousUnreadArticle();
-+ TreeNode* sel = m_tree->selectedNode();
-+ if (sel && sel->unread() > 0)
-+ m_articles->slotPreviousUnreadArticle();
-+ else
-+ slotPrevUnreadFeed();
- }
-
- void View::slotPrevUnreadFeed()
-diff -urN -x CVS kdepim.orig/akregator/src/articlelist.cpp kdepim/akregator/src/articlelist.cpp
---- kdepim.orig/akregator/src/articlelist.cpp 2005-03-02 22:27:31.000000000 +0100
-+++ kdepim/akregator/src/articlelist.cpp 2005-03-20 16:54:30.000000000 +0100
-@@ -324,17 +324,30 @@
- ArticleListItem *it= static_cast<ArticleListItem*>(selectedItem());
- if (!it)
- it = static_cast<ArticleListItem*>(firstChild());
--
-+
- for ( ; it; it = static_cast<ArticleListItem*>(it->nextSibling()))
- {
-- if ((it->article().status()==MyArticle::Unread) ||
-- (it->article().status()==MyArticle::New) )
-+ if (it->article().status() != MyArticle::Read)
- {
- setSelected(it, true);
- ensureItemVisible(it);
- return;
- }
- }
-+ // only reached when there is no unread article after the selected one
-+ if (m_node->unread() > 0)
-+ {
-+ it = static_cast<ArticleListItem*>(firstChild());
-+ for ( ; it; it = static_cast<ArticleListItem*>(it->nextSibling()))
-+ {
-+ if (it->article().status() != MyArticle::Read)
-+ {
-+ setSelected(it, true);
-+ ensureItemVisible(it);
-+ return;
-+ }
-+ }
-+ }
- }
-
- void ArticleList::slotPreviousUnreadArticle()
-@@ -357,6 +370,25 @@
- return;
- }
- }
-+ // only reached when there is no unread article before the selected one
-+ if (m_node->unread() > 0)
-+ {
-+ it = static_cast<ArticleListItem*>(lastChild());
-+
-+ for ( ; it.current(); --it )
-+ {
-+ ArticleListItem* ali = static_cast<ArticleListItem*> (it.current());
-+ if (!ali)
-+ break;
-+ if ((ali->article().status()==MyArticle::Unread) ||
-+ (ali->article().status()==MyArticle::New))
-+ {
-+ setSelected(ali, true);
-+ ensureItemVisible(ali);
-+ return;
-+ }
-+ }
-+ }
- }
-
- void ArticleList::keyPressEvent(QKeyEvent* e)
-diff -urN -x CVS kdepim.orig/akregator/src/eventsrc kdepim/akregator/src/eventsrc
---- kdepim.orig/akregator/src/eventsrc 2005-02-23 06:06:58.000000000 +0100
-+++ kdepim/akregator/src/eventsrc 2005-03-28 09:03:32.000000000 +0200
-@@ -3,7 +3,6 @@
- Comment=Akregator
- Comment[da]=Akregator Plugin
- Comment[sv]=aKregator
--Comment[xx]=xxAkregatorxx
-
- [feed_added]
- Name=Feed added
-@@ -26,9 +25,10 @@
- Name[pt_BR]=Fonte de notĂcias adicionada
- Name[ru]=Лонта нОвОŃтоК дОйавНона
- Name[sl]=Dovod je dodan
-+Name[sr]=ДОвОд Ń˜Đľ дОдат
-+Name[sr at Latn]=Dovod je dodat
- Name[sv]=Källa tillagd
- Name[uk]=ĐŸĐžĐ´Đ°Ń‡Ńƒ дОданО
--Name[xx]=xxFeed addedxx
- Name[zh_CN]=ćˇťĺŠ äş†ć–°é—ťćş
- Comment=A new feed was remotely added to Akregator
- Comment[bg]=ОтдаНочонО о дОйавона нОва нОвина къП Akregator
-@@ -50,9 +50,10 @@
- Comment[pt_BR]=Uma nova fonte de notĂcias foi adicionada remotamente ao Akregator
- Comment[ru]=ĐĐžĐ˛Đ°Ń ĐťĐľĐ˝Ń‚Đ° нОвОŃтоК дОйавНона в ŃпиŃОк Akregator
- Comment[sl]=Nov dovod je bil oddaljeno dodan k Akregatorju
-+Comment[sr]=ĐОви дОвОд Ń˜Đľ ŃƒĐ´Đ°Ń™ĐľĐ˝Đž дОдат Ńƒ Akregator
-+Comment[sr at Latn]=Novi dovod je udaljeno dodat u Akregator
- Comment[sv]=En ny källa har lagts till i aKregator utifrün
- Comment[uk]=ĐĐžĐ˛Ńƒ ĐżĐžĐ´Đ°Ń‡Ńƒ ĐąŃƒĐťĐž віддаНонО дОданО Đ´Đž Akregator
--Comment[xx]=xxA new feed was remotely added to Akregatorxx
- Comment[zh_CN]=ć–°é—ťćşčżœç¨‹ćˇťĺŠ 进了 Akregator
- default_presentation=4
-
-@@ -81,9 +82,10 @@
- Name[ru]=ĐОвыо ŃŃ‚Đ°Ń‚ŃŒĐ¸
- Name[se]=OÄ‘Ä‘a artihkkalat
- Name[sl]=Novi Älanki
-+Name[sr]=ĐОви чНанци
-+Name[sr at Latn]=Novi Älanci
- Name[sv]=Nya artiklar
- Name[uk]=ĐОві ŃŃ‚Đ°Ń‚Ń‚Ń–
--Name[xx]=xxNew Articlesxx
- Name[zh_CN]=ć–°é—ťć–‡çŤ
- Comment=New articles were fetched
- Comment[bg]=ĐŸŃ€Đ¸ŃтигнаНи ŃĐ° нОви Ńтатии
-@@ -93,6 +95,7 @@
- Comment[de]=Neue Artikel wurden abgeholt
- Comment[es]=Se obtuvieron los artĂculos nuevos
- Comment[et]=TĂľmmati uued artiklid
-+Comment[fi]=Uutta postia saapunut
- Comment[fr]=Les nouveaux articles ont ĂŠtĂŠ relevĂŠs
- Comment[he]=הורדו מ××ž×¨×™× × ×•×Ą×¤×™×
- Comment[hu]=Ăšj hĂrek lettek letĂśltve
-@@ -106,9 +109,10 @@
- Comment[ru]=ĐŸĐžĐťŃƒŃ‡ĐľĐ˝Ń‹ нОвыо ŃŃ‚Đ°Ń‚ŃŒĐ¸
- Comment[se]=Ođđa artihkkalat viŞŞon
- Comment[sl]=PovleÄeni so bili novi Älanki
-+Comment[sr]=ДОйављони ŃŃƒ нОви чНанци
-+Comment[sr at Latn]=Dobavljeni su novi Älanci
- Comment[sv]=Nya artiklar har hämtats
- Comment[uk]=ОтриПанО нОві ŃŃ‚Đ°Ń‚Ń‚Ń–
--Comment[xx]=xxNew articles were fetchedxx
- Comment[zh_CN]=莡ĺ–了新文çŤ
- default_presentation=4
-
-diff -urN -x CVS kdepim.orig/akregator/src/notificationmanager.cpp kdepim/akregator/src/notificationmanager.cpp
---- kdepim.orig/akregator/src/notificationmanager.cpp 2005-03-02 22:27:31.000000000 +0100
-+++ kdepim/akregator/src/notificationmanager.cpp 2005-03-05 10:47:29.000000000 +0100
-@@ -44,6 +44,7 @@
- m_addedInLastInterval = false;
- m_maxArticles = 20;
- m_widget = NULL;
-+ m_instance = NULL;
- }
-
- NotificationManager::~NotificationManager()
-@@ -51,9 +52,10 @@
- m_self = 0;
- }
-
--void NotificationManager::setWidget(QWidget* widget)
-+void NotificationManager::setWidget(QWidget* widget, KInstance* inst)
- {
- m_widget = widget;
-+ m_instance = inst != NULL ? inst : KGlobal::instance();
- }
-
- void NotificationManager::slotNotifyArticle(const MyArticle& article)
-@@ -73,6 +75,7 @@
- {
- if (feeds.count() == 1)
- {
-+ KNotifyClient::Instance inst(m_instance);
- KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feed added:\n %1").arg(feeds[0]));
- }
- else if (feeds.count() > 1)
-@@ -80,6 +83,7 @@
- QString message;
- for (QStringList::ConstIterator it = feeds.begin(); it != feeds.end(); ++it)
- message += *it + "\n";
-+ KNotifyClient::Instance inst(m_instance);
- KNotifyClient::event(m_widget->winId(), "feed_added", i18n("Feeds added:\n %1").arg(message));
- }
- }
-@@ -100,6 +104,7 @@
- message += (*it).title() + "<br>";
- }
- message += "</body></html>";
-+ KNotifyClient::Instance inst(m_instance);
- KNotifyClient::event(m_widget->winId(), "new_articles", message);
-
- m_articles.clear();
-diff -urN -x CVS kdepim.orig/akregator/src/notificationmanager.h kdepim/akregator/src/notificationmanager.h
---- kdepim.orig/akregator/src/notificationmanager.h 2005-03-02 22:27:31.000000000 +0100
-+++ kdepim/akregator/src/notificationmanager.h 2005-03-05 10:47:29.000000000 +0100
-@@ -43,7 +43,7 @@
- ~NotificationManager();
-
- /** the widget used for notification, normally either the mainwindow or the tray icon */
-- void setWidget(QWidget* widget);
-+ void setWidget(QWidget* widget, KInstance* inst=0);
-
- public slots:
-
-@@ -73,7 +73,8 @@
- bool m_running;
- bool m_addedInLastInterval;
- QWidget* m_widget;
--
-+ KInstance* m_instance;
-+
- QValueList<MyArticle> m_articles;
-
- static NotificationManager* m_self;
-diff -urN -x CVS kdepim.orig/akregator/src/pageviewer.cpp kdepim/akregator/src/pageviewer.cpp
---- kdepim.orig/akregator/src/pageviewer.cpp 2005-03-02 22:27:31.000000000 +0100
-+++ kdepim/akregator/src/pageviewer.cpp 2005-03-11 03:47:03.000000000 +0100
-@@ -84,7 +84,7 @@
- m_stopAction = new KAction(i18n("Stop"), "stop", 0,
- this, SLOT(slotStop()),
- actionCollection(), "pageviewer_stop");
--
-+
- //connect( this, SIGNAL(popupMenu(const QString &, const QPoint &)), this, SLOT(slotPopupMenu(const QString &, const QPoint &)));
-
- m_backAction->setEnabled(false);
-@@ -95,11 +95,6 @@
- connect(this, SIGNAL(completed()), this, SLOT(slotCompleted()));
- connect(this, SIGNAL(canceled(const QString &)), this, SLOT(slotCancelled(const QString &)));
-
-- connect(browserExtension(),
-- SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
-- this,
-- SLOT(formClicked(const KURL&, const KParts::URLArgs&)));
--
- m_current = m_history.end();
- m_restoring = false;
- // uncomment this to load konq plugins (doesn't work properly and clutters the GUI)
-@@ -220,10 +215,14 @@
-
- void PageViewer::slotOpenURLRequest(const KURL& url, const KParts::URLArgs& args)
- {
-+
- if (args.frameName == "_blank") // apparently this indicates that the MMB was pressed...
- Viewer::slotOpenURLRequest(url, args);
- else
-+ {
-+ browserExtension()->setURLArgs(args);
- openURL(url);
-+ }
- }
-
- void PageViewer::slotPopupActivated( int id )
-@@ -410,13 +409,5 @@
- }
- }
-
--void PageViewer::formClicked(const KURL& url, const KParts::URLArgs& args)
--{
-- if (args.doPost()) {
-- browserExtension()->setURLArgs(args);
-- openURL(url);
-- }
--}
--
- #include "pageviewer.moc"
- // vim: ts=4 sw=4 et
-diff -urN -x CVS kdepim.orig/akregator/src/pageviewer.h kdepim/akregator/src/pageviewer.h
---- kdepim.orig/akregator/src/pageviewer.h 2005-03-02 22:27:31.000000000 +0100
-+++ kdepim/akregator/src/pageviewer.h 2005-03-11 03:47:03.000000000 +0100
-@@ -86,8 +86,7 @@
- virtual void slotPopupMenu(KXMLGUIClient*, const QPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t);
-
- void slotGlobalBookmarkArticle();
-- void formClicked(const KURL& url, const KParts::URLArgs& args);
--
-+
- virtual void slotOpenURLRequest(const KURL& url, const KParts::URLArgs& args);
-
- signals:
-diff -urN -x CVS kdepim.orig/akregator/src/settings_archive.ui kdepim/akregator/src/settings_archive.ui
---- kdepim.orig/akregator/src/settings_archive.ui 2005-02-21 08:34:52.000000000 +0100
-+++ kdepim/akregator/src/settings_archive.ui 2005-03-20 12:06:19.000000000 +0100
-@@ -42,14 +42,6 @@
- <string>Keep all articles</string>
- </property>
- </widget>
-- <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2">
-- <property name="name">
-- <cstring>rb_DisableArchiving</cstring>
-- </property>
-- <property name="text">
-- <string>Disable archiving</string>
-- </property>
-- </widget>
- <widget class="QRadioButton" row="1" column="0">
- <property name="name">
- <cstring>rb_LimitArticleNumber</cstring>
-@@ -58,6 +50,22 @@
- <string>Limit feed archive size to:</string>
- </property>
- </widget>
-+ <widget class="QRadioButton" row="2" column="0">
-+ <property name="name">
-+ <cstring>rb_LimitArticleAge</cstring>
-+ </property>
-+ <property name="text">
-+ <string>Delete articles older than: </string>
-+ </property>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kdepim-branch.diff?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list