Hello community, here is the log from the commit of package libkpeople for openSUSE:Factory checked in at 2013-10-30 15:44:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkpeople (Old) and /work/SRC/openSUSE:Factory/.libkpeople.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkpeople" Changes: -------- --- /work/SRC/openSUSE:Factory/libkpeople/libkpeople.changes 2013-10-14 13:05:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkpeople.new/libkpeople.changes 2013-10-30 15:44:46.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Oct 27 22:20:54 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to 0.1.0 + * New upstream release, no changelog provided + +------------------------------------------------------------------- Old: ---- libkpeople-0.0.80.tar.bz2 New: ---- libkpeople-0.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkpeople.spec ++++++ --- /var/tmp/diff_new_pack.DwLU8q/_old 2013-10-30 15:44:48.000000000 +0100 +++ /var/tmp/diff_new_pack.DwLU8q/_new 2013-10-30 15:44:48.000000000 +0100 @@ -19,13 +19,14 @@ %define soversion 1 Name: libkpeople -Version: 0.0.80 +Version: 0.1.0 Release: 0 -License: LGPL-2.1+ Summary: Provides access to all contacts and the people who hold them +License: LGPL-2.1+ Group: Development/Libraries/Other Url: https://projects.kde.org/projects/playground/network/libkpeople -Source0: http://download.kde.org/unstable/%{name}/%{version}/src/%{name}-%{version}.tar.bz2 +Source0: http://download.kde.org/unstable/%{name}/%{version}/%{name}-%{version}.tar.bz2 +BuildRequires: libkde4-devel >= 4.10.1 BuildRequires: libsoprano-devel BuildRequires: nepomuk-core-devel BuildRequires: shared-desktop-ontologies-devel @@ -103,5 +104,4 @@ %{_kde4_includedir}/KPeople/ %{_kde4_includedir}/kpeople/ - %changelog ++++++ libkpeople-0.0.80.tar.bz2 -> libkpeople-0.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/CMakeLists.txt new/libkpeople-0.1.0/CMakeLists.txt --- old/libkpeople-0.0.80/CMakeLists.txt 2013-09-24 00:11:44.000000000 +0200 +++ new/libkpeople-0.1.0/CMakeLists.txt 2013-10-25 23:30:15.000000000 +0200 @@ -26,8 +26,6 @@ ${NEPOMUK_CORE_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${TELEPATHY_QT4_INCLUDE_DIR} - ${KTP_INCLUDE_DIR} ) add_subdirectory (src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/po/CMakeLists.txt new/libkpeople-0.1.0/po/CMakeLists.txt --- old/libkpeople-0.0.80/po/CMakeLists.txt 2013-09-24 00:11:44.000000000 +0200 +++ new/libkpeople-0.1.0/po/CMakeLists.txt 2013-10-25 23:30:15.000000000 +0200 @@ -1,5 +1,8 @@ +add_subdirectory( cs ) add_subdirectory( da ) add_subdirectory( de ) +add_subdirectory( hu ) +add_subdirectory( nl ) add_subdirectory( pt ) add_subdirectory( pt_BR ) add_subdirectory( sk ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/po/cs/CMakeLists.txt new/libkpeople-0.1.0/po/cs/CMakeLists.txt --- old/libkpeople-0.0.80/po/cs/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libkpeople-0.1.0/po/cs/CMakeLists.txt 2013-10-25 23:29:13.000000000 +0200 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( cs ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/po/cs/libkpeople.po new/libkpeople-0.1.0/po/cs/libkpeople.po --- old/libkpeople-0.0.80/po/cs/libkpeople.po 1970-01-01 01:00:00.000000000 +0100 +++ new/libkpeople-0.1.0/po/cs/libkpeople.po 2013-10-25 23:29:13.000000000 +0200 @@ -0,0 +1,56 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Vít Pelčák <v...@pelcak.org>, 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2013-09-22 01:49+0000\n" +"PO-Revision-Date: 2013-09-26 15:18+0200\n" +"Last-Translator: Vít Pelčák <v...@pelcak.org>\n" +"Language-Team: Czech <kde-i18n-...@kde.org>\n" +"Language: cs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Lokalize 1.5\n" + +#: contactitem.cpp:198 +msgid "Unknown contact" +msgstr "Neznámý kontakt" + +#: examples/contactlistqml.cpp:29 +msgid "SweetPeople - KPeople Example" +msgstr "" + +#: plugins/core/emailplugin.cpp:40 +#, kde-format +msgctxt "%1 is a specific email address" +msgid "Email %1" +msgstr "E-mail %1" + +#: widgets/mergedialog.cpp:65 +msgid "Duplicates Manager" +msgstr "" + +#: widgets/mergedialog.cpp:74 +msgid "Select contacts to be merged" +msgstr "" + +#: widgets/plugins/emaildetailswidget.cpp:38 +msgid "Email" +msgstr "E-mail" + +#: widgets/plugins/mergecontactswidget.cpp:51 +msgid "Show Merge Suggestions..." +msgstr "" + +#: widgets/plugins/mergecontactswidget.cpp:89 +msgid "Merge with Selected Contacts" +msgstr "" + +#: widgets/plugins/phonedetailswidget.cpp:40 +msgid "Phone" +msgstr "Telefon" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/po/da/libkpeople.po new/libkpeople-0.1.0/po/da/libkpeople.po --- old/libkpeople-0.0.80/po/da/libkpeople.po 2013-09-24 00:10:55.000000000 +0200 +++ new/libkpeople-0.1.0/po/da/libkpeople.po 2013-10-25 23:29:15.000000000 +0200 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" #: contactitem.cpp:198 @@ -54,4 +54,3 @@ #: widgets/plugins/phonedetailswidget.cpp:40 msgid "Phone" msgstr "Telefon" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/po/hu/CMakeLists.txt new/libkpeople-0.1.0/po/hu/CMakeLists.txt --- old/libkpeople-0.0.80/po/hu/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libkpeople-0.1.0/po/hu/CMakeLists.txt 2013-10-25 23:29:29.000000000 +0200 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( hu ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/po/hu/libkpeople.po new/libkpeople-0.1.0/po/hu/libkpeople.po --- old/libkpeople-0.0.80/po/hu/libkpeople.po 1970-01-01 01:00:00.000000000 +0100 +++ new/libkpeople-0.1.0/po/hu/libkpeople.po 2013-10-25 23:29:29.000000000 +0200 @@ -0,0 +1,56 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Balázs Úr <urbal...@gmail.com>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2013-09-22 01:49+0000\n" +"PO-Revision-Date: 2013-10-06 13:15+0200\n" +"Last-Translator: Balázs Úr <urbal...@gmail.com>\n" +"Language-Team: Hungarian <kde-l10n...@kde.org>\n" +"Language: hu\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 1.5\n" + +#: contactitem.cpp:198 +msgid "Unknown contact" +msgstr "Ismeretlen partner" + +#: examples/contactlistqml.cpp:29 +msgid "SweetPeople - KPeople Example" +msgstr "Kedves emberek - KPeople példa" + +#: plugins/core/emailplugin.cpp:40 +#, kde-format +msgctxt "%1 is a specific email address" +msgid "Email %1" +msgstr "E-mail %1" + +#: widgets/mergedialog.cpp:65 +msgid "Duplicates Manager" +msgstr "Duplikátumok kezelő" + +#: widgets/mergedialog.cpp:74 +msgid "Select contacts to be merged" +msgstr "Az egyesítendő partnerek kiválasztása" + +#: widgets/plugins/emaildetailswidget.cpp:38 +msgid "Email" +msgstr "E-mail" + +#: widgets/plugins/mergecontactswidget.cpp:51 +msgid "Show Merge Suggestions..." +msgstr "Egyesítési javaslatok megjelenítése…" + +#: widgets/plugins/mergecontactswidget.cpp:89 +msgid "Merge with Selected Contacts" +msgstr "Egyesítés a kijelölt partnerekkel" + +#: widgets/plugins/phonedetailswidget.cpp:40 +msgid "Phone" +msgstr "Telefon" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/po/nl/CMakeLists.txt new/libkpeople-0.1.0/po/nl/CMakeLists.txt --- old/libkpeople-0.0.80/po/nl/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libkpeople-0.1.0/po/nl/CMakeLists.txt 2013-10-25 23:29:45.000000000 +0200 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES( nl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/po/nl/libkpeople.po new/libkpeople-0.1.0/po/nl/libkpeople.po --- old/libkpeople-0.0.80/po/nl/libkpeople.po 1970-01-01 01:00:00.000000000 +0100 +++ new/libkpeople-0.1.0/po/nl/libkpeople.po 2013-10-25 23:29:45.000000000 +0200 @@ -0,0 +1,56 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Freek de Kruijf <freekdekru...@kde.nl>, 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2013-09-22 01:49+0000\n" +"PO-Revision-Date: 2013-09-22 13:10+0200\n" +"Last-Translator: Freek de Kruijf <freekdekru...@kde.nl>\n" +"Language-Team: Dutch <kde-i18n...@kde.org>\n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#: contactitem.cpp:198 +msgid "Unknown contact" +msgstr "Onbekende contactpersoon" + +#: examples/contactlistqml.cpp:29 +msgid "SweetPeople - KPeople Example" +msgstr "SweetPeople - KPeople voorbeeld" + +#: plugins/core/emailplugin.cpp:40 +#, kde-format +msgctxt "%1 is a specific email address" +msgid "Email %1" +msgstr "E-mail %1" + +#: widgets/mergedialog.cpp:65 +msgid "Duplicates Manager" +msgstr "Beheerder van duplicaten" + +#: widgets/mergedialog.cpp:74 +msgid "Select contacts to be merged" +msgstr "Samen te voegen contactpersonen selecteren" + +#: widgets/plugins/emaildetailswidget.cpp:38 +msgid "Email" +msgstr "E-mail" + +#: widgets/plugins/mergecontactswidget.cpp:51 +msgid "Show Merge Suggestions..." +msgstr "Suggesties voor samenvoegen tonen..." + +#: widgets/plugins/mergecontactswidget.cpp:89 +msgid "Merge with Selected Contacts" +msgstr "Met geselecteerde contactpersonen samenvoegen" + +#: widgets/plugins/phonedetailswidget.cpp:40 +msgid "Phone" +msgstr "Telefoon" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/po/pt_BR/libkpeople.po new/libkpeople-0.1.0/po/pt_BR/libkpeople.po --- old/libkpeople-0.0.80/po/pt_BR/libkpeople.po 2013-09-24 00:11:26.000000000 +0200 +++ new/libkpeople-0.1.0/po/pt_BR/libkpeople.po 2013-10-25 23:29:56.000000000 +0200 @@ -55,4 +55,3 @@ #: widgets/plugins/phonedetailswidget.cpp:40 msgid "Phone" msgstr "Telefone" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/src/contactitem.cpp new/libkpeople-0.1.0/src/contactitem.cpp --- old/libkpeople-0.0.80/src/contactitem.cpp 2013-09-24 00:10:44.000000000 +0200 +++ new/libkpeople-0.1.0/src/contactitem.cpp 2013-10-25 23:29:02.000000000 +0200 @@ -229,6 +229,13 @@ m->updateContact(this); } +void ContactItem::clear() +{ + Q_D(ContactItem); + + d->data.clear(); +} + void ContactItem::finishLoadingData() { Q_D(ContactItem); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/src/contactitem_p.h new/libkpeople-0.1.0/src/contactitem_p.h --- old/libkpeople-0.0.80/src/contactitem_p.h 2013-09-24 00:10:44.000000000 +0200 +++ new/libkpeople-0.1.0/src/contactitem_p.h 2013-10-25 23:29:02.000000000 +0200 @@ -61,6 +61,8 @@ */ void loadData(KPeople::PersonsModel* m); + void clear(); + void finishLoadingData(); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/src/personsmodel.cpp new/libkpeople-0.1.0/src/personsmodel.cpp --- old/libkpeople-0.0.80/src/personsmodel.cpp 2013-09-24 00:10:44.000000000 +0200 +++ new/libkpeople-0.1.0/src/personsmodel.cpp 2013-10-25 23:29:02.000000000 +0200 @@ -356,17 +356,22 @@ kDebug() << "Updating contact" << uri; - if (!d->contacts.contains(uri)) { + ContactItem *contact = d->contacts[uri]; + + if (!contact) { kWarning() << "Contact not found! Uri is" << uri; return; } + contact->clear(); + QString queryString = d->prepareQuery(uri); Soprano::Model *m = Nepomuk2::ResourceManager::instance()->mainModel(); Soprano::Util::AsyncQuery *query = Soprano::Util::AsyncQuery::executeQuery(m, queryString, Soprano::Query::QueryLanguageSparql); query->setProperty("contactUri", QVariant(uri)); + connect(query, SIGNAL(nextReady(Soprano::Util::AsyncQuery*)), this, SLOT(nextReady(Soprano::Util::AsyncQuery*))); @@ -634,6 +639,19 @@ kWarning() << "not implemented yet"; } + //TODO + //This makes the job synchronous, which is bad.. but there's already a synchronous call in this method anyway (line 591). + //If Soprano is blocked we already block our UI so this has little real impact + + //we need some changes to make sure that if this method is called twice in quick succession for the same contacts + //otherwise we can end up making attaching a single contact to two different PIMO:Person's as we check if the contact is owned by a person whilst a merge + //job is happening asyncronously. This effectively breaks the database + //This cannot be fixed without a _signifcant_ refactor. + + if (job) { + job->exec(); + } + return job; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/src/widgets/plugins/emaildetailswidget.cpp new/libkpeople-0.1.0/src/widgets/plugins/emaildetailswidget.cpp --- old/libkpeople-0.0.80/src/widgets/plugins/emaildetailswidget.cpp 2013-09-24 00:10:44.000000000 +0200 +++ new/libkpeople-0.1.0/src/widgets/plugins/emaildetailswidget.cpp 2013-10-25 23:29:02.000000000 +0200 @@ -58,6 +58,7 @@ Q_FOREACH (const QString &email, person->emails()) { QLabel *emailLabel = new QLabel(email, this); + emailLabel->setTextInteractionFlags(Qt::TextSelectableByMouse); layout()->addWidget(emailLabel); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkpeople-0.0.80/src/widgets/plugins/phonedetailswidget.cpp new/libkpeople-0.1.0/src/widgets/plugins/phonedetailswidget.cpp --- old/libkpeople-0.0.80/src/widgets/plugins/phonedetailswidget.cpp 2013-09-24 00:10:44.000000000 +0200 +++ new/libkpeople-0.1.0/src/widgets/plugins/phonedetailswidget.cpp 2013-10-25 23:29:02.000000000 +0200 @@ -59,6 +59,7 @@ Q_FOREACH (const QString &phone, person->phones()) { QLabel *phoneLabel = new QLabel(phone, this); + phoneLabel->setTextInteractionFlags(Qt::TextSelectableByMouse); layout()->addWidget(phoneLabel); } } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
