Hello community,

here is the log from the commit of package kdepim4-runtime for openSUSE:Factory
checked in at Thu Apr 21 13:38:17 CEST 2011.



--------
--- KDE/kdepim4-runtime/kdepim4-runtime.changes 2011-02-17 15:16:24.000000000 
+0100
+++ /mounts/work_src_done/STABLE/kdepim4-runtime/kdepim4-runtime.changes        
2011-04-09 20:35:51.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Apr  9 18:16:20 UTC 2011 - wstephen...@novell.com
+
+- Add fixes from kdepim 4.4 branch:
+  * Turn Nepomuk disabled warning into a KNotification
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdepim4-runtime.spec ++++++
--- /var/tmp/diff_new_pack.N18ipy/_old  2011-04-21 13:37:29.000000000 +0200
+++ /var/tmp/diff_new_pack.N18ipy/_new  2011-04-21 13:37:29.000000000 +0200
@@ -27,7 +27,7 @@
 Summary:        Base package of kdepim
 Url:            http://www.kde.org
 Version:        4.4.10
-Release:        6
+Release:        7
 Source0:        kdepim-runtime-%version.tar.bz2
 Patch:          4_4_BRANCH.diff
 Patch6:         disable-knut.diff
@@ -50,7 +50,7 @@
 
 %prep
 %setup -q -n kdepim-runtime-%version
-%patch
+%patch -p2
 %patch6
 
 %build

++++++ 4_4_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.N18ipy/_old  2011-04-21 13:37:29.000000000 +0200
+++ /var/tmp/diff_new_pack.N18ipy/_new  2011-04-21 13:37:29.000000000 +0200
@@ -0,0 +1,21 @@
+diff --git a/runtime/agents/nepomukfeeder/nepomukfeederagentbase.cpp 
b/runtime/agents/nepomukfeeder/nepomukfeederagentbase.cpp
+index 716d459..4f00122 100644
+--- a/runtime/agents/nepomukfeeder/nepomukfeederagentbase.cpp
++++ b/runtime/agents/nepomukfeeder/nepomukfeederagentbase.cpp
+@@ -42,6 +42,7 @@
+ #include <KProcess>
+ #include <KMessageBox>
+ #include <KStandardDirs>
++#include <KNotification>
+ 
+ #include <Soprano/Vocabulary/NAO>
+ 
+@@ -320,7 +321,7 @@ void NepomukFeederAgentBase::selfTest()
+   emit status( Broken, i18n( "Nepomuk not operational" ) );
+   if ( !QDBusConnection::sessionBus().registerService( QLatin1String( 
"org.kde.pim.nepomukfeeder.selftestreport" ) ) )
+     return;
+-  //KMessageBox::error( 0, message, i18n( "Nepomuk Indexing Disabled" ), 
KMessageBox::Notify | KMessageBox::AllowLink );
++  KNotification::event( KNotification::Warning, i18n( "Nepomuk Indexing 
Disabled" ), message );
+   QDBusConnection::sessionBus().unregisterService( QLatin1String( 
"org.kde.pim.nepomukfeeder.selftestreport" ) );
+ }
+ 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to