Hello community,
here is the log from the commit of package kdepimlibs4 for openSUSE:Factory
checked in at Fri Jan 16 01:45:33 CET 2009.
--------
--- KDE/kdepimlibs4/kdepimlibs4.changes 2009-01-09 11:38:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdepimlibs4/kdepimlibs4.changes 2009-01-13 18:19:45.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Jan 13 18:18:46 CET 2009 - dmueller@suse.de
+
+- update to 4.1.96
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdepimlibs-4.1.87.tar.bz2
New:
----
kdepimlibs-4.1.96.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepimlibs4.spec ++++++
--- /var/tmp/diff_new_pack.B16101/_old 2009-01-16 01:44:42.000000000 +0100
+++ /var/tmp/diff_new_pack.B16101/_new 2009-01-16 01:44:42.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdepimlibs4 (Version 4.1.87)
+# spec file for package kdepimlibs4 (Version 4.1.96)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,7 +23,7 @@
Group: System/GUI/KDE
Summary: KDE PIM Libraries
Url: http://www.kde.org
-Version: 4.1.87
+Version: 4.1.96
Release: 1
Source0: kdepimlibs-%version.tar.bz2
Source1: _upstream
@@ -196,6 +196,8 @@
%_kde_share_dir/config.kcfg/mailtransport.kcfg
%changelog
+* Tue Jan 13 2009 dmueller@suse.de
+- update to 4.1.96
* Fri Jan 09 2009 dmueller@suse.de
- update to 4.2.87 (Januar snapshot KDE 4.2)
* Sat Dec 13 2008 wstephenson@suse.de
++++++ kdepimlibs-4.1.87.tar.bz2 -> kdepimlibs-4.1.96.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/agenttypedialog.cpp new/kdepimlibs-4.1.96/akonadi/agenttypedialog.cpp
--- old/kdepimlibs-4.1.87/akonadi/agenttypedialog.cpp 2008-11-04 18:12:19.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/agenttypedialog.cpp 2009-01-06 18:19:33.000000000 +0100
@@ -22,7 +22,11 @@
#include <QObject>
#include
+#include
+
+#if KDE_IS_VERSION(4,1,85)
#include
+#endif
using namespace Akonadi;
@@ -40,13 +44,14 @@
setButtons( Ok | Cancel );
QVBoxLayout *layout = new QVBoxLayout( mainWidget() );
- KFilterProxySearchLine* searchLine = new KFilterProxySearchLine( mainWidget() );
- layout->addWidget( searchLine );
-
d->Widget = new Akonadi::AgentTypeWidget( mainWidget() );
connect( d->Widget, SIGNAL( activated() ), this, SLOT( accept() ) );
+#if KDE_IS_VERSION(4,1,85)
+ KFilterProxySearchLine* searchLine = new KFilterProxySearchLine( mainWidget() );
+ layout->addWidget( searchLine );
searchLine->setProxy( d->Widget->agentFilterProxyModel() );
+#endif
layout->addWidget( d->Widget );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/CMakeLists.txt new/kdepimlibs-4.1.96/akonadi/CMakeLists.txt
--- old/kdepimlibs-4.1.87/akonadi/CMakeLists.txt 2008-12-04 09:34:08.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/CMakeLists.txt 2009-01-06 18:19:33.000000000 +0100
@@ -124,8 +124,16 @@
kde4_add_library( akonadi-kde SHARED ${akonadikde_LIB_SRC} )
+macro_ensure_version( "4.2.0" ${KDE_VERSION} KDE_IS_AT_LEAST_42 )
+
target_link_libraries( akonadi-kde ${KDE4_SOLID_LIBS} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTSQL_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${AKONADI_COMMON_LIBRARIES} )
-target_link_libraries( akonadi-kde LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} )
+set( AKONADI_KDE_DEPS ${KDE4_KDEUI_LIBS} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} )
+
+if(${KDE_IS_AT_LEAST_42})
+target_link_libraries( akonadi-kde LINK_INTERFACE_LIBRARIES ${AKONADI_KDE_DEPS})
+else(${KDE_IS_AT_LEAST_42})
+target_link_libraries( akonadi-kde ${AKONADI_KDE_DEPS})
+endif(${KDE_IS_AT_LEAST_42})
set_target_properties( akonadi-kde PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/collectionmodel_p.cpp new/kdepimlibs-4.1.96/akonadi/collectionmodel_p.cpp
--- old/kdepimlibs-4.1.87/akonadi/collectionmodel_p.cpp 2008-11-12 17:37:00.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/collectionmodel_p.cpp 2009-01-06 18:19:33.000000000 +0100
@@ -33,6 +33,7 @@
#include
#include
+#include <QCoreApplication>
#include
using namespace Akonadi;
@@ -290,7 +291,8 @@
{
Q_Q( CollectionModel );
- session = new Session( QByteArray("CollectionModel-") + QByteArray::number( qrand() ), q );
+ session = new Session( QCoreApplication::instance()->applicationName().toUtf8()
+ + QByteArray("-CollectionModel-") + QByteArray::number( qrand() ), q );
QTimer::singleShot( 0, q, SLOT(startFirstListJob()) );
// monitor collection changes
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/erroroverlay.cpp new/kdepimlibs-4.1.96/akonadi/erroroverlay.cpp
--- old/kdepimlibs-4.1.87/akonadi/erroroverlay.cpp 2008-11-12 17:37:00.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/erroroverlay.cpp 2009-01-06 18:19:33.000000000 +0100
@@ -40,7 +40,7 @@
QList > baseWidgets;
};
-K_GLOBAL_STATIC( ErrorOverlayStatic, sInstance )
+K_GLOBAL_STATIC( ErrorOverlayStatic, sInstanceOverlay )
static bool isParentOf( QObject* o1, QObject* o2 )
{
@@ -59,11 +59,11 @@
Q_ASSERT( parentWidget() != baseWidget );
// check existing overlays to detect cascading
- for ( QList >::Iterator it = sInstance->baseWidgets.begin();
- it != sInstance->baseWidgets.end(); ) {
+ for ( QList >::Iterator it = sInstanceOverlay->baseWidgets.begin();
+ it != sInstanceOverlay->baseWidgets.end(); ) {
if ( (*it).first == 0 || (*it).second == 0 ) {
// garbage collection
- it = sInstance->baseWidgets.erase( it );
+ it = sInstanceOverlay->baseWidgets.erase( it );
continue;
}
if ( isParentOf( (*it).first, baseWidget ) ) {
@@ -76,12 +76,12 @@
if ( isParentOf( baseWidget, (*it).first ) ) {
// child already has overlay, kill that one
delete (*it).second;
- it = sInstance->baseWidgets.erase( it );
+ it = sInstanceOverlay->baseWidgets.erase( it );
continue;
}
++it;
}
- sInstance->baseWidgets.append( qMakePair( mBaseWidget, QPointer<QWidget>( this ) ) );
+ sInstanceOverlay->baseWidgets.append( qMakePair( mBaseWidget, QPointer<QWidget>( this ) ) );
connect( baseWidget, SIGNAL(destroyed()), SLOT(deleteLater()) );
mPreviousState = mBaseWidget->isEnabled();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/itemmodel.cpp new/kdepimlibs-4.1.96/akonadi/itemmodel.cpp
--- old/kdepimlibs-4.1.87/akonadi/itemmodel.cpp 2008-08-28 18:12:10.000000000 +0200
+++ new/kdepimlibs-4.1.96/akonadi/itemmodel.cpp 2009-01-06 18:19:33.000000000 +0100
@@ -31,6 +31,7 @@
#include
#include
+#include <QCoreApplication>
#include
#include
@@ -64,7 +65,8 @@
Private( ItemModel *parent )
: mParent( parent ), monitor( new Monitor() )
{
- session = new Session( QByteArray("ItemModel-") + QByteArray::number( qrand() ), mParent );
+ session = new Session( QCoreApplication::instance()->applicationName().toUtf8()
+ + QByteArray("-ItemModel-") + QByteArray::number( qrand() ), mParent );
monitor->ignoreSession( session );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/monitor_p.cpp new/kdepimlibs-4.1.96/akonadi/monitor_p.cpp
--- old/kdepimlibs-4.1.87/akonadi/monitor_p.cpp 2008-08-28 18:12:10.000000000 +0200
+++ new/kdepimlibs-4.1.96/akonadi/monitor_p.cpp 2009-01-06 18:19:32.000000000 +0100
@@ -93,7 +93,7 @@
Item item( msg.uid() );
item.setRemoteId( msg.remoteId() );
- ItemCollectionFetchJob *job = new ItemCollectionFetchJob( item, msg.parentCollection(), q_ptr );
+ ItemCollectionFetchJob *job = new ItemCollectionFetchJob( item, msg.parentCollection(), msg.parentDestCollection(), q_ptr );
job->setFetchScope( mItemFetchScope );
pendingJobs.insert( job, msg );
QObject::connect( job, SIGNAL(result(KJob*)), q_ptr, SLOT(slotItemJobFinished(KJob*)) );
@@ -258,6 +258,7 @@
} else {
Item item;
Collection col;
+ Collection destCol;
ItemFetchJob *fetchJob = qobject_cast( job );
if ( fetchJob && fetchJob->items().count() > 0 )
item = fetchJob->items().first();
@@ -265,8 +266,9 @@
if ( cfjob ) {
item = cfjob->item();
col = cfjob->collection();
+ destCol = cfjob->destCollection();
}
- emitItemNotification( msg, item, col );
+ emitItemNotification( msg, item, col, destCol );
}
}
@@ -294,9 +296,9 @@
}
-ItemCollectionFetchJob::ItemCollectionFetchJob( const Item &item, Collection::Id collectionId, QObject *parent )
+ItemCollectionFetchJob::ItemCollectionFetchJob( const Item &item, Collection::Id collectionId, Collection::Id destCollectionId, QObject *parent )
: Job( parent ),
- mReferenceItem( item ), mCollectionId( collectionId )
+ mReferenceItem( item ), mCollectionId( collectionId ), mDestCollectionId( destCollectionId )
{
}
@@ -314,6 +316,11 @@
return mCollection;
}
+Collection ItemCollectionFetchJob::destCollection() const
+{
+ return mDestCollection;
+}
+
void ItemCollectionFetchJob::setFetchScope( const ItemFetchScope &fetchScope )
{
mFetchScope = fetchScope;
@@ -325,6 +332,11 @@
connect( listJob, SIGNAL( result( KJob* ) ), SLOT( collectionJobDone( KJob* ) ) );
addSubjob( listJob );
+ CollectionFetchJob *destListJob = new CollectionFetchJob( Collection( mDestCollectionId ), CollectionFetchJob::Base, this );
+ connect( destListJob, SIGNAL( result( KJob* ) ), SLOT( destCollectionJobDone( KJob* ) ) );
+ addSubjob( destListJob );
+
+
ItemFetchJob *fetchJob = new ItemFetchJob( mReferenceItem, this );
fetchJob->setFetchScope( mFetchScope );
connect( fetchJob, SIGNAL( result( KJob* ) ), SLOT( itemJobDone( KJob* ) ) );
@@ -343,6 +355,18 @@
}
}
+void ItemCollectionFetchJob::destCollectionJobDone( KJob* job )
+{
+ if ( !job->error() ) {
+ CollectionFetchJob *listJob = qobject_cast( job );
+ if ( listJob->collections().isEmpty() ) {
+ setError( 1 );
+ setErrorText( QLatin1String( "No collection found" ) );
+ } else
+ mDestCollection = listJob->collections().first();
+ }
+}
+
void ItemCollectionFetchJob::itemJobDone( KJob* job )
{
if ( !job->error() ) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/monitor_p.h new/kdepimlibs-4.1.96/akonadi/monitor_p.h
--- old/kdepimlibs-4.1.87/akonadi/monitor_p.h 2008-10-09 11:46:22.000000000 +0200
+++ new/kdepimlibs-4.1.96/akonadi/monitor_p.h 2009-01-06 18:19:32.000000000 +0100
@@ -159,11 +159,12 @@
Q_OBJECT
public:
- explicit ItemCollectionFetchJob( const Item &item, Collection::Id collectionId, QObject *parent = 0 );
+ explicit ItemCollectionFetchJob( const Item &item, Collection::Id collectionId, Collection::Id destCollectionId, QObject *parent = 0 );
~ItemCollectionFetchJob();
Item item() const;
Collection collection() const;
+ Collection destCollection() const;
void setFetchScope( const ItemFetchScope &fetchScope );
@@ -172,14 +173,17 @@
private Q_SLOTS:
void collectionJobDone( KJob* job );
+ void destCollectionJobDone( KJob* job );
void itemJobDone( KJob* job );
private:
Item mReferenceItem;
Collection::Id mCollectionId;
+ Collection::Id mDestCollectionId;
Item mItem;
Collection mCollection;
+ Collection mDestCollection;
ItemFetchScope mFetchScope;
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/session.cpp new/kdepimlibs-4.1.96/akonadi/session.cpp
--- old/kdepimlibs-4.1.87/akonadi/session.cpp 2009-01-01 17:24:39.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/session.cpp 2009-01-06 18:19:33.000000000 +0100
@@ -29,6 +29,7 @@
#include
#include
+#include <QCoreApplication>
#include
#include
#include
@@ -221,10 +222,12 @@
QObject( parent ),
d( new SessionPrivate( this ) )
{
- if ( !sessionId.isEmpty() )
+ if ( !sessionId.isEmpty() ) {
d->sessionId = sessionId;
- else
- d->sessionId = QByteArray::number( qrand() );
+ } else {
+ d->sessionId = QCoreApplication::instance()->applicationName().toUtf8()
+ + "-" + QByteArray::number( qrand() );
+ }
d->connected = false;
d->theNextTag = 1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/tests/testrunner/config.cpp new/kdepimlibs-4.1.96/akonadi/tests/testrunner/config.cpp
--- old/kdepimlibs-4.1.87/akonadi/tests/testrunner/config.cpp 2008-11-19 11:17:35.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/tests/testrunner/config.cpp 2009-01-06 18:19:31.000000000 +0100
@@ -30,16 +30,17 @@
{
}
-Config *Config::getInstance()
+Config *Config::getInstance(QString pathToConfig)
{
if(instance == 0){
- const QString pathToConfig = KStandardDirs::locate("config","akonaditest.xml");
- instance = new ConfigReader(pathToConfig);
- //instance= new ConfigReader("/home/igor/codes/kde/tests/test_akonadi/config.xml");
+ if(pathToConfig == NULL)
+ const QString pathToConfig = KStandardDirs::locate("config","akonaditest.xml");
+ instance = new ConfigReader(pathToConfig);
}
return instance;
}
+
void Config::destroyInstance()
{
delete instance;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/tests/testrunner/config.h new/kdepimlibs-4.1.96/akonadi/tests/testrunner/config.h
--- old/kdepimlibs-4.1.87/akonadi/tests/testrunner/config.h 2008-11-19 11:17:35.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/tests/testrunner/config.h 2009-01-06 18:19:31.000000000 +0100
@@ -33,7 +33,7 @@
static Config *instance;
public:
- static Config *getInstance();
+ static Config *getInstance(QString pathToConfig = NULL);
static void destroyInstance();
QString getKdeHome() const;
QString getXdgDataHome() const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/tests/testrunner/configreader.h new/kdepimlibs-4.1.96/akonadi/tests/testrunner/configreader.h
--- old/kdepimlibs-4.1.87/akonadi/tests/testrunner/configreader.h 2008-11-19 11:17:35.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/tests/testrunner/configreader.h 2009-01-06 18:19:31.000000000 +0100
@@ -16,7 +16,7 @@
*/
#ifndef CONFIGREADER_H
-#define CONFIGHEADER_H
+#define CONFIGREADER_H
#include <QString>
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/tests/testrunner/dao.h new/kdepimlibs-4.1.96/akonadi/tests/testrunner/dao.h
--- old/kdepimlibs-4.1.87/akonadi/tests/testrunner/dao.h 2008-11-19 11:17:35.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/tests/testrunner/dao.h 2009-01-06 18:19:31.000000000 +0100
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2008 Igor Trindade Oliveira
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+
#ifndef DAO_H
#define DAO_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/tests/testrunner/main.cpp new/kdepimlibs-4.1.96/akonadi/tests/testrunner/main.cpp
--- old/kdepimlibs-4.1.87/akonadi/tests/testrunner/main.cpp 2008-11-19 11:17:35.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/tests/testrunner/main.cpp 2009-01-06 18:19:31.000000000 +0100
@@ -36,16 +36,16 @@
KCmdLineArgs::init(argc, argv, &aboutdata);
KCmdLineOptions options;
-
- // TODO: add --config option for overriding with a specific one
-
- KCmdLineArgs::addCmdLineOptions(options);
+ options.add("+[config]", ki18n("Configuration file to open"));
+ KCmdLineArgs::addCmdLineOptions(options);
KApplication app;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
- Q_UNUSED( args ) // TODO pass value of --config once available
+
+ if(args->count())
+ Config *config = Config::getInstance(QString(args->arg(0)));
+
SetupTest *setup = new SetupTest();
setup->startAkonadiDaemon();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/tests/testrunner/setup.cpp new/kdepimlibs-4.1.96/akonadi/tests/testrunner/setup.cpp
--- old/kdepimlibs-4.1.87/akonadi/tests/testrunner/setup.cpp 2008-11-19 11:17:35.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/tests/testrunner/setup.cpp 2009-01-06 18:19:31.000000000 +0100
@@ -187,6 +187,7 @@
symbol->insertSymbol("KDEHOME", config->getKdeHome());
symbol->insertSymbol("XDG_DATA_HOME", config->getXdgDataHome());
symbol->insertSymbol("XDG_CONFIG_HOME", config->getXdgConfigHome());
+ symbol->insertSymbol("AKONADI_TESTRUNNER_PID", QString::number( QCoreApplication::instance()->applicationPid() ) );
dpid = startDBusDaemon();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/tests/testrunner/shellscript.cpp new/kdepimlibs-4.1.96/akonadi/tests/testrunner/shellscript.cpp
--- old/kdepimlibs-4.1.87/akonadi/tests/testrunner/shellscript.cpp 2008-11-19 11:17:35.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/tests/testrunner/shellscript.cpp 2009-01-06 18:19:31.000000000 +0100
@@ -23,26 +23,44 @@
shellScript::shellScript()
{
- symbol = Symbols::getInstance();
+ symbol = Symbols::getInstance();
}
void shellScript::writeEnvironmentVariables()
{
QHashIterator i( symbol->getSymbols() );
-
+
while( i.hasNext() )
{
i.next();
script.append( i.key() );
script.append( "=" );
script.append( i.value() );
- script.append( "\n" );
-
+ script.append( "\n" );
+
script.append("export ");
script.append( i.key() );
- script.append("\n");
+ script.append("\n");
}
- script.append("\n\n");
+ script.append("\n\n");
+}
+
+void shellScript::writeShutdownFunction()
+{
+ const QString s =
+ "function shutdown-testenvironment()\n"
+ "{\n"
+ " echo Stopping Akonadi server\n"
+ " qdbus org.freedesktop.Akonadi.Control /ControlManager org.freedesktop.Akonadi.ControlManager.shutdown\n"
+ " echo \"Stopping testrunner with PID \" $TESTRUNNER_PID\n"
+ " kill $AKONADI_TESTRUNNER_PID\n"
+ " # wait a bit before killing D-Bus\n"
+ " echo \"Waiting 10 seconds before killing D-Bus\"\n"
+ " sleep 10\n"
+ " echo \"Killing D-Bus with PID \" $DBUS_SESSION_BUS_PID\n"
+ " kill $DBUS_SESSION_BUS_PID\n"
+ "}\n\n";
+ script.append( s );
}
void shellScript::makeShellScript()
@@ -50,13 +68,13 @@
QFile file("testenvironment.sh"); //can user define the file name/location?
file.open( QIODevice::WriteOnly );
-
+
writeEnvironmentVariables();
-
+ writeShutdownFunction();
+
//script.append("exec /usr/bin/dbus-launch \n");
- //script.append("exec akonadiconsole\n");
+ //script.append("exec akonadiconsole\n");
file.write(script.toAscii(), qstrlen(script.toAscii()) );
file.close();
}
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/tests/testrunner/shellscript.h new/kdepimlibs-4.1.96/akonadi/tests/testrunner/shellscript.h
--- old/kdepimlibs-4.1.87/akonadi/tests/testrunner/shellscript.h 2008-11-19 11:17:35.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/tests/testrunner/shellscript.h 2009-01-06 18:19:31.000000000 +0100
@@ -14,6 +14,10 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see http://www.gnu.org/licenses/.
*/
+#ifndef SHELLSCRIPT_H
+#define SHELLSCRIPT_H
+
+
#include <QHash>
#include "symbols.h"
@@ -21,13 +25,14 @@
{
private:
Symbols *symbol;
- QString script;
+ QString script;
- void writeEnvironmentVariables();
+ void writeEnvironmentVariables();
+ void writeShutdownFunction();
public:
shellScript();
void makeShellScript();
-
+
};
-
+#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/tests/testrunner/symbols.cpp new/kdepimlibs-4.1.96/akonadi/tests/testrunner/symbols.cpp
--- old/kdepimlibs-4.1.87/akonadi/tests/testrunner/symbols.cpp 2008-11-19 11:17:35.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/tests/testrunner/symbols.cpp 2009-01-06 18:19:31.000000000 +0100
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2008 Igor Trindade Oliveira
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+
#include "symbols.h"
#include <QtTest>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/tests/testrunner/symbols.h new/kdepimlibs-4.1.96/akonadi/tests/testrunner/symbols.h
--- old/kdepimlibs-4.1.87/akonadi/tests/testrunner/symbols.h 2008-11-19 11:17:35.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/tests/testrunner/symbols.h 2009-01-06 18:19:31.000000000 +0100
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2008 Igor Trindade Oliveira
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see http://www.gnu.org/licenses/.
+ */
+
#ifndef SYMBOLS_H
#define SYMBOLS_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/akonadi/tests/testrunner/testrunner-config.xsd new/kdepimlibs-4.1.96/akonadi/tests/testrunner/testrunner-config.xsd
--- old/kdepimlibs-4.1.87/akonadi/tests/testrunner/testrunner-config.xsd 1970-01-01 01:00:00.000000000 +0100
+++ new/kdepimlibs-4.1.96/akonadi/tests/testrunner/testrunner-config.xsd 2009-01-06 18:19:31.000000000 +0100
@@ -0,0 +1,51 @@
+http://www.w3.org/2001/XMLSchema">
+
+<!--
+
+ Copyright (c) 2009 Volker Krause <vkrause@kde.org>
+
+ 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.
+
+-->
+
+
+ xsd:complexType
+ xsd:sequence
+
+
+
+
+
+
+
+
+
+
+ xsd:simpleContent
+
+
+
+
+
+
+
+
+ xsd:simpleContent
+
+
+
+
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/CMakeLists.txt new/kdepimlibs-4.1.96/CMakeLists.txt
--- old/kdepimlibs-4.1.87/CMakeLists.txt 2009-01-01 17:24:39.000000000 +0100
+++ new/kdepimlibs-4.1.96/CMakeLists.txt 2009-01-06 18:19:33.000000000 +0100
@@ -9,7 +9,9 @@
set(KDEPIMLIBS_VERSION ${KDEPIMLIBS_VERSION_MAJOR}.${KDEPIMLIBS_VERSION_MINOR}.${KDEPIMLIBS_VERSION_PATCH} )
# search packages used by KDE
-find_package(KDE4 REQUIRED)
+# Adjust the version of kdelibs which is required as needed (should be 4.2.0 once KDE 4.2 is released), Alex
+find_package(KDE4 4.1.80 REQUIRED)
+
include (KDE4Defaults)
include (MacroLibrary)
Files old/kdepimlibs-4.1.87/doc/kcontrol/kresources/index.cache.bz2 and new/kdepimlibs-4.1.96/doc/kcontrol/kresources/index.cache.bz2 differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/kabc/stdaddressbook.cpp new/kdepimlibs-4.1.96/kabc/stdaddressbook.cpp
--- old/kdepimlibs-4.1.87/kabc/stdaddressbook.cpp 2009-01-01 17:24:39.000000000 +0100
+++ new/kdepimlibs-4.1.96/kabc/stdaddressbook.cpp 2009-01-06 18:19:31.000000000 +0100
@@ -166,6 +166,7 @@
Resource *res = mParent->standardResource();
if ( !res ) {
res = manager->createResource( "file" );
+ res->setResourceName( i18n( "Default Addressbook" ) );
if ( res ) {
mParent->addResource( res );
} else {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/kcal/icaltimezones.cpp new/kdepimlibs-4.1.96/kcal/icaltimezones.cpp
--- old/kdepimlibs-4.1.87/kcal/icaltimezones.cpp 2008-11-12 17:36:59.000000000 +0100
+++ new/kdepimlibs-4.1.96/kcal/icaltimezones.cpp 2009-01-06 18:19:28.000000000 +0100
@@ -271,7 +271,8 @@
return false;
}
- setData( other.data()->clone(), other.source() );
+ KTimeZoneData* otherData = other.data() ? other.data()->clone() : 0;
+ setData( otherData, other.source() );
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/kcal/incidenceformatter.cpp new/kdepimlibs-4.1.96/kcal/incidenceformatter.cpp
--- old/kdepimlibs-4.1.87/kcal/incidenceformatter.cpp 2008-12-21 21:18:55.000000000 +0100
+++ new/kdepimlibs-4.1.96/kcal/incidenceformatter.cpp 2009-01-06 18:19:28.000000000 +0100
@@ -256,9 +256,14 @@
KIconLoader *iconLoader = KIconLoader::global();
tmpStr += "<td>";
if ( incidence->type() == "Todo" ) {
- tmpStr += "iconPath( "view-calendar-tasks", KIconLoader::Small ) +
- "\">";
+ tmpStr += "( incidence );
+ if ( !todo->isCompleted() ) {
+ tmpStr += iconLoader->iconPath( "view-calendar-tasks", KIconLoader::Small );
+ } else {
+ tmpStr += iconLoader->iconPath( "task-complete", KIconLoader::Small );
+ }
+ tmpStr += "\">";
}
if ( incidence->type() == "Event" ) {
tmpStr += "= ' ' && c <= '~' ) {
+ if ( c == '\t' || ( c >= ' ' && c <= '~' ) ) {
++mPrintable;
} else if ( c == 127 || c < ' ' ) {
++mCTL;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/kmime/kmime_codec_qp.cpp new/kdepimlibs-4.1.96/kmime/kmime_codec_qp.cpp
--- old/kdepimlibs-4.1.87/kmime/kmime_codec_qp.cpp 2008-01-05 00:53:09.000000000 +0100
+++ new/kdepimlibs-4.1.96/kmime/kmime_codec_qp.cpp 2009-01-06 18:19:28.000000000 +0100
@@ -86,7 +86,7 @@
static inline bool keep( uchar ch )
{
// no CTLs, except HT and not '?'
- return !( ch < ' ' && ch != '\t' || ch == '?' );
+ return !( ( ch < ' ' && ch != '\t' ) || ch == '?' );
}
//
@@ -117,7 +117,7 @@
mFinished( false ) {}
bool needsEncoding( uchar ch )
- { return ch > '~' || ch < ' ' && ch != '\t' || ch == '='; }
+ { return ch > '~' || ( ch < ' ' && ch != '\t' ) || ch == '='; }
bool needsEncodingAtEOL( uchar ch )
{ return ch == ' ' || ch == '\t'; }
bool needsEncodingAtBOL( uchar ch )
@@ -404,7 +404,7 @@
mLastChar = ch;
}
} else { // not mInsideHexChar
- if ( ch <= '~' && ch >= ' ' || ch == '\t' ) {
+ if ( ( ch <= '~' && ch >= ' ' ) || ch == '\t' ) {
if ( ch == mEscapeChar ) {
mInsideHexChar = true;
} else if ( mQEncoding && ch == '_' ) {
@@ -569,7 +569,7 @@
}
if ( Never == mAccuNeedsEncoding ||
- AtBOL == mAccuNeedsEncoding && mCurrentLineLength != 0 ) {
+ ( AtBOL == mAccuNeedsEncoding && mCurrentLineLength != 0 ) ) {
write( mAccu, dcursor, dend );
mCurrentLineLength++;
} else {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/mailtransport/transportconfigdialog.cpp new/kdepimlibs-4.1.96/mailtransport/transportconfigdialog.cpp
--- old/kdepimlibs-4.1.87/mailtransport/transportconfigdialog.cpp 2008-11-28 16:33:07.000000000 +0100
+++ new/kdepimlibs-4.1.96/mailtransport/transportconfigdialog.cpp 2009-01-06 18:19:31.000000000 +0100
@@ -286,6 +286,9 @@
{
Q_ASSERT( d->passwordEdit );
+ // Load the password from the original to our cloned copy
+ d->transport->updatePasswordState();
+
if ( d->passwordEdit->text().isEmpty() ) {
d->passwordEdit->setText( d->transport->password() );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/mailtransport/transport.cpp new/kdepimlibs-4.1.96/mailtransport/transport.cpp
--- old/kdepimlibs-4.1.87/mailtransport/transport.cpp 2008-11-28 16:33:07.000000000 +0100
+++ new/kdepimlibs-4.1.96/mailtransport/transport.cpp 2009-01-06 18:19:31.000000000 +0100
@@ -88,6 +88,22 @@
d->password = passwd;
}
+void Transport::updatePasswordState()
+{
+ Transport *original = TransportManager::self()->transportById( id(), false );
+ if ( original == this ) {
+ kWarning() << "Tried to update password state of non-cloned transport.";
+ return;
+ }
+ if ( original ) {
+ d->password = original->d->password;
+ d->passwordLoaded = original->d->passwordLoaded;
+ d->passwordDirty = original->d->passwordDirty;
+ }
+ else
+ kWarning() << "Transport with this ID not managed by transport manager.";
+}
+
bool Transport::isComplete() const
{
return !requiresAuthentication() || !storePassword() || d->passwordLoaded;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/mailtransport/transport.h new/kdepimlibs-4.1.96/mailtransport/transport.h
--- old/kdepimlibs-4.1.87/mailtransport/transport.h 2008-03-25 18:22:00.000000000 +0100
+++ new/kdepimlibs-4.1.96/mailtransport/transport.h 2009-01-06 18:19:31.000000000 +0100
@@ -61,6 +61,18 @@
void setPassword( const QString &passwd );
/**
+ This function syncronizes the password of this transport with the password of the
+ transport with the same ID that is managed by the transport manager.
+ This is only useful for cloned transports, since their passwords don't automatically
+ get updated when calling TransportManager::loadPasswordsAsync() or
+ TransportManager::loadPasswords().
+
+ @sa clone()
+ @since 4.2
+ */
+ void updatePasswordState();
+
+ /**
Returns true if all settings have been loaded.
This is the way to find out if the password has already been loaded
from the wallet.
@@ -77,6 +89,8 @@
automatically updated. Use this if you need to store a Transport object
over a longer time. However it is recommended to store transport identifiers
instead if possible.
+
+ @sa updatePasswordState()
*/
Transport *clone() const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/mailtransport/transportmanager.h new/kdepimlibs-4.1.96/mailtransport/transportmanager.h
--- old/kdepimlibs-4.1.87/mailtransport/transportmanager.h 2008-05-29 13:18:35.000000000 +0200
+++ new/kdepimlibs-4.1.96/mailtransport/transportmanager.h 2009-01-06 18:19:31.000000000 +0100
@@ -194,6 +194,8 @@
/**
Emitted when passwords have been loaded from the wallet.
+ If you made a deep copy of a transport, you should call updatePasswordState()
+ for the cloned transport to ensure its password is updated as well.
*/
void passwordsChanged();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdepimlibs-4.1.87/README.libical new/kdepimlibs-4.1.96/README.libical
--- old/kdepimlibs-4.1.87/README.libical 2008-01-05 00:53:23.000000000 +0100
+++ new/kdepimlibs-4.1.96/README.libical 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-The directory kcal/libical contains version 0.24 of libical with KDE local
-modifications to fix some bugs and let it compile in the kdepimlibs module.
-You may obtain the original distribution from
- http://sourceforge.net/projects/freeassociation/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org