commit kdepim4-runtime for openSUSE:Factory
Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at Tue May 18 01:22:55 CEST 2010. -------- --- KDE/kdepim4-runtime/kdepim4-runtime.changes 2010-04-29 22:41:26.000000000 +0200 +++ kdepim4-runtime/kdepim4-runtime.changes 2010-05-17 15:13:27.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 17 13:13:17 UTC 2010 - llunak@novell.com + +- update 4_4_BRANCH.diff: various fixes, translation updates + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.ibRLwS/_old 2010-05-18 01:22:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ibRLwS/_new 2010-05-18 01:22:44.000000000 +0200 @@ -37,7 +37,7 @@ Summary: Base package of kdepim Url: http://www.kde.org Version: 4.4.3 -Release: 1 +Release: 2 Source0: kdepim-runtime-%version.tar.bz2 Patch: 4_4_BRANCH.diff Patch6: disable-knut.diff ++++++ 4_4_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.ibRLwS/_old 2010-05-18 01:22:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ibRLwS/_new 2010-05-18 01:22:44.000000000 +0200 @@ -1,7 +1,150 @@ -package: kdepim-4.3.1.tar.bz2 -kdemod: kdepim +package: kdepim-runtime-4.4.3.tar.bz2 +kdemod: kdepim/runtime --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 1027708 -+svn di between //tags/KDE/4.3.1/kdepim and //branches/KDE/4.3/kdepim ++current HEAD: 1127686 ++svn di between //tags/KDE/4.4.3/kdepim/runtime and //branches/KDE/4.4/kdepim/runtime +--- resources/pop3/pop3resource.desktop ++++ resources/pop3/pop3resource.desktop +@@ -2,6 +2,7 @@ + Name=POP3 + Name[ca]=POP3 + Name[ca@valencia]=POP3 ++Name[cs]=POP3 + Name[da]=POP3 + Name[de]=POP3 + Name[el]=POP3 +--- resources/birthdays/birthdaysresource.desktop ++++ resources/birthdays/birthdaysresource.desktop +@@ -30,7 +30,7 @@ + Name[ru]=Праздники + Name[sl]=Rojstni dnevi in obletnice + Name[sv]=Födelsedagar och årsdagar +-Name[tr]=Doğumgünleri & Yıldönümleri ++Name[tr]=Doğum günleri & Yıl dönümleri + Name[uk]=Дні народження і річниці + Name[x-test]=xxBirthdays & Anniversariesxx + Name[zh_CN]=生日和纪念日 +@@ -64,7 +64,7 @@ + Comment[ru]=Доступ к информации о днях рождения из адресной книги KDE как к событиям календаря + Comment[sl]=Omogoča dostop do rojstnih dni in obletnic stikov, shranjenih v vašem adresarju. Na voljo so kot koledarski dogodki. + Comment[sv]=Ger tillgång till datum för födelsedagar och årsdagar för kontakter i KDE:s adressbok som kalenderhändelser +-Comment[tr]=Adres defterindeki kişilerin doğumgünleri ve yıldönümlerine takvim olayları olarak erişmeyi sağlar ++Comment[tr]=Adres defterindeki kişilerin doğum günleri ve yıl dönümlerine takvim olayları olarak erişmeyi sağlar + Comment[uk]=Надає доступ до дат днів народження і річниць, які зберігаються у вашій адресній книзі як події календаря + Comment[x-test]=xxProvides access to birthday and anniversary dates of contacts in your address book as calendar eventsxx + Comment[zh_CN]=提供对存储在 KDE 地址簿文件夹中的联系人生日和纪念日的访问支持,并将其作为日历中的事件 +--- resources/mbox/mboxresource.desktop ++++ resources/mbox/mboxresource.desktop +@@ -2,6 +2,7 @@ + Name=Mbox + Name[ca]=Mbox + Name[ca@valencia]=Mbox ++Name[cs]=Mbox + Name[da]=Mbox + Name[de]=Mbox + Name[el]=Mbox +--- resources/contacts/contactsresource.kcfg ++++ resources/contacts/contactsresource.kcfg +@@ -13,5 +13,8 @@ + <label>Do not change the actual backend data.</label> + <default>false</default> + </entry> ++ <entry name="IsConfigured" type="Bool"> ++ <default>false</default> ++ </entry> + </group> + </kcfg> +--- resources/contacts/contactsresource.cpp ++++ resources/contacts/contactsresource.cpp +@@ -51,6 +51,9 @@ + mSupportedMimeTypes << KABC::Addressee::mimeType() << KABC::ContactGroup::mimeType() << Collection::mimeType(); + + setName( i18n( "Personal Contacts" ) ); ++ ++ if ( Settings::self()->isConfigured() ) ++ synchronize(); + } + + ContactsResource::~ContactsResource() +@@ -65,6 +68,7 @@ + { + SettingsDialog dlg( windowId ); + if ( dlg.exec() ) { ++ Settings::self()->setIsConfigured( true ); + Settings::self()->writeConfig(); + + clearCache(); +@@ -414,13 +418,37 @@ + } + + if ( !removeDirectory( directoryForCollection( collection ) ) ) { +- cancelTask( i18n("Unable to delete folder '%1'.", collection.name() ) ); ++ cancelTask( i18n( "Unable to delete folder '%1'.", collection.name() ) ); + return; + } + + changeProcessed(); + } + ++void ContactsResource::itemMoved( const Akonadi::Item &item, const Akonadi::Collection &collectionSource, ++ const Akonadi::Collection &collectionDestination ) ++{ ++ const QString sourceFileName = directoryForCollection( collectionSource ) + QDir::separator() + item.remoteId(); ++ const QString targetFileName = directoryForCollection( collectionDestination ) + QDir::separator() + item.remoteId(); ++ ++ if ( QFile::rename( sourceFileName, targetFileName ) ) ++ changeProcessed(); ++ else ++ cancelTask( i18n( "Unable to move file '%1' to '%2', '%2' already exists.", sourceFileName, targetFileName ) ); ++} ++ ++void ContactsResource::collectionMoved( const Akonadi::Collection &collection, const Akonadi::Collection &collectionSource, ++ const Akonadi::Collection &collectionDestination ) ++{ ++ const QString sourceDirectoryName = directoryForCollection( collectionSource ) + QDir::separator() + collection.remoteId(); ++ const QString targetDirectoryName = directoryForCollection( collectionDestination ) + QDir::separator() + collection.remoteId(); ++ ++ if ( QFile::rename( sourceDirectoryName, targetDirectoryName ) ) ++ changeProcessed(); ++ else ++ cancelTask( i18n( "Unable to move directory '%1' to '%2', '%2' already exists.", sourceDirectoryName, targetDirectoryName ) ); ++} ++ + QString ContactsResource::baseDirectoryPath() const + { + return Settings::self()->path(); +--- resources/contacts/contactsresource.h ++++ resources/contacts/contactsresource.h +@@ -29,7 +29,7 @@ + + class QDir; + +-class ContactsResource : public Akonadi::ResourceBase, public Akonadi::AgentBase::Observer ++class ContactsResource : public Akonadi::ResourceBase, public Akonadi::AgentBase::ObserverV2 + { + Q_OBJECT + +@@ -55,6 +55,11 @@ + virtual void collectionChanged( const Akonadi::Collection &collection ); + virtual void collectionRemoved( const Akonadi::Collection &collection ); + ++ virtual void itemMoved( const Akonadi::Item &item, const Akonadi::Collection &collectionSource, ++ const Akonadi::Collection &collectionDestination ); ++ virtual void collectionMoved( const Akonadi::Collection &collection, const Akonadi::Collection &collectionSource, ++ const Akonadi::Collection &collectionDestination ); ++ + private: + Akonadi::Collection::List createCollectionsForDirectory( const QDir &parentDirectory, + const Akonadi::Collection &parentCollection ) const; +--- resources/contacts/contactsresource.desktop ++++ resources/contacts/contactsresource.desktop +@@ -2,6 +2,7 @@ + Name=Personal Contacts + Name[ca]=Contactes personals + Name[ca@valencia]=Contactes personals ++Name[cs]=Osobní kontakty + Name[da]=Personlige kontakter + Name[de]=Persönliche Kontakte + Name[el]=Προσωπικές επαφές ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de