Hello community, here is the log from the commit of package ktp-contact-runner for openSUSE:Factory checked in at 2013-10-08 10:54:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktp-contact-runner (Old) and /work/SRC/openSUSE:Factory/.ktp-contact-runner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktp-contact-runner" Changes: -------- --- /work/SRC/openSUSE:Factory/ktp-contact-runner/ktp-contact-runner.changes 2013-09-25 14:32:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktp-contact-runner.new/ktp-contact-runner.changes 2013-10-08 10:54:17.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 26 22:02:14 UTC 2013 - hrvoje.sen...@gmail.com + +- Update to version 0.6.80 + * New feature release, please see http://www.sharpley.org.uk/blog/ktp-0.7-beta + +------------------------------------------------------------------- Old: ---- ktp-contact-runner-0.6.3.tar.bz2 New: ---- ktp-contact-runner-0.6.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktp-contact-runner.spec ++++++ --- /var/tmp/diff_new_pack.DdL2Ku/_old 2013-10-08 10:54:17.000000000 +0200 +++ /var/tmp/diff_new_pack.DdL2Ku/_new 2013-10-08 10:54:17.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ktp-contact-runner # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -11,21 +11,22 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ktp-contact-runner -Version: 0.6.3 -Release: 1 -License: LGPL-2.1+ +Version: 0.6.80 +Release: 0 Summary: Telepathy Krunner plugin -Url: http://community.kde.org/Real-Time_Communication_and_Collaboration +License: LGPL-2.1+ Group: Productivity/Networking/Instant Messenger -Source0: http://download.kde.org/stable/kde-telepathy/%{version}/src/%{name}-%{version}.tar.bz2 +Url: http://community.kde.org/Real-Time_Communication_and_Collaboration +Source0: http://download.kde.org/unstable/kde-telepathy/%{version}/src/%{name}-%{version}.tar.bz2 BuildRequires: fdupes -BuildRequires: libkde4-devel BuildRequires: ktp-common-internals-devel +BuildRequires: libkde4-devel BuildRequires: telepathy-qt4-devel >= 0.9.1 Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ ktp-contact-runner-0.6.3.tar.bz2 -> ktp-contact-runner-0.6.80.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-contact-runner-0.6.3/CMakeLists.txt new/ktp-contact-runner-0.6.80/CMakeLists.txt --- old/ktp-contact-runner-0.6.3/CMakeLists.txt 2013-08-06 03:18:37.000000000 +0200 +++ new/ktp-contact-runner-0.6.80/CMakeLists.txt 2013-09-23 23:19:12.000000000 +0200 @@ -1,6 +1,6 @@ project(KTPContactRunner) -set(KTP_CONTACT_RUNNER_VERSION "0.6.3") +set(KTP_CONTACT_RUNNER_VERSION "0.6.80") set(IS_KTP_INTERNAL_MODULE TRUE) set(CMAKE_MODULE_PATH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-contact-runner-0.6.3/plasma-runner-ktp-contact.desktop.cmake new/ktp-contact-runner-0.6.80/plasma-runner-ktp-contact.desktop.cmake --- old/ktp-contact-runner-0.6.3/plasma-runner-ktp-contact.desktop.cmake 2013-08-06 03:17:34.000000000 +0200 +++ new/ktp-contact-runner-0.6.80/plasma-runner-ktp-contact.desktop.cmake 2013-09-23 23:18:12.000000000 +0200 @@ -1,86 +1,51 @@ [Desktop Entry] -Name=Instant Messaging Contacts -Name[bs]=Brze poruke -Name[ca]=Contactes de missatgeria instantània -Name[ca@valencia]=Contactes de missatgeria instantània -Name[cs]=Kontakty komunikátoru -Name[da]=Instant messaging-kontakter -Name[de]=Instant-Messenger-Kontakte -Name[el]=Επαφές στγμιαίων μηνυμάτων -Name[es]=Contactos de mensajería instantánea -Name[et]=Kiirsuhtluskontaktid -Name[fi]=Pikaviestinkäyttäjät -Name[fr]=Contacts de messagerie instantanée -Name[ga]=Teagmhálacha Teachtaireachtaí Meandracha -Name[gl]=Contactos de mensaxería instantánea -Name[hu]=Azonnali üzenetküldési partnerek -Name[ia]=Contactos de messageria instantanee -Name[it]=Contatti di messaggistica istantanea -Name[kk]=Лезде хабарласу контакттар тізімі -Name[km]=ទំនាក់ទំនងការផ្ញើសារបន្ទាន់ -Name[lt]=Greitųjų žinučių kontaktai -Name[mr]=त्वरित संदेश संपर्क -Name[nb]=Lynmeldingskontakter -Name[nl]=Contactpersonen van Instant Messaging -Name[pl]=Kontakty komunikatorów internetowych -Name[pt]=Contactos das Mensagens Instantâneas -Name[pt_BR]=Contatos de mensagens instantâneas -Name[ro]=Contacte de mesagerie instantanee -Name[ru]=Контакты системы обмена сообщениями -Name[sk]=Kontakty priamej komunikácie -Name[sl]=Stiki hipnega sporočanja -Name[sr]=Брзогласнички контакти -Name[sr@ijekavian]=Брзогласнички контакти -Name[sr@ijekavianlatin]=Brzoglasnički kontakti -Name[sr@latin]=Brzoglasnički kontakti +Name=Instant Messaging +Name[ca]=Missatgeria instantània +Name[cs]=Instant Messaging +Name[da]=Instant messaging +Name[de]=Instant-Messaging +Name[es]=Mensajería instantánea +Name[fi]=Pikaviestintä +Name[fr]=Messagerie instantanée +Name[it]=Messaggistica istantanea +Name[nb]=Lynmelding +Name[nl]=Instant Messaging +Name[pt]=Mensagens Instantâneas +Name[pt_BR]=Mensagens instantâneas +Name[sk]=Priama komunikácia +Name[sl]=Hipno sporočanje +Name[sr]=Брзо гласништво +Name[sr@ijekavian]=Брзо гласништво +Name[sr@ijekavianlatin]=Brzo glasništvo +Name[sr@latin]=Brzo glasništvo Name[sv]=Direktmeddelandekontakter -Name[tr]=Anında Mesajlaşma Kişileri -Name[uk]=Контакти миттєвого обміну повідомленнями -Name[wa]=Soçons del messaedjreye sol moumint -Name[x-test]=xxInstant Messaging Contactsxx -Name[zh_CN]=即时通讯联系人 -Name[zh_TW]=即時訊息聯絡人 -Comment=Start chat with any of your IM contacts -Comment[bs]=Počnite ćaskanje s nekim od IM kontakta -Comment[ca]=Inicia un xat amb qualsevol dels vostres contactes de MI -Comment[ca@valencia]=Inicia un xat amb qualsevol dels vostres contactes de MI -Comment[cs]=Začít rozhovor s kterýmkoliv vaším kontaktem v IM -Comment[da]=Start chat med en af dine IM-kontakter -Comment[de]=Chats mit ihren Kontakten starten -Comment[el]=Έναρξη συνομιλίας με οποιαδήποτε επαφή στιγμιαίων μηνυμάτων -Comment[es]=Iniciar una charla con cualquiera de sus contactos de MI -Comment[et]=Vestluse alustamine mõne oma kiirsuhtluskontaktiga -Comment[fi]=Aloita keskustelu muun pikaviestinkäyttäjän kanssa -Comment[fr]=Démarre une discussion avec n'importe lequel de vos contacts de messagerie instantanée -Comment[ga]=Déan comhrá le teagmháil TM -Comment[gl]=Inicie unha conversa con calquera dos seus contactos -Comment[hu]=Csevegjen az azonnali üzenetküldési partnereivel -Comment[ia]=Starta conversation con qualcunque de tu contactos de IM -Comment[it]=Avvia una chat con un tuo contatto di messaggistica istantanea -Comment[kk]=Кез-келген лезде хабарласу контактыңызбен чат-әңгімені бастау -Comment[km]=ចាប់ផ្ដើមជជែកជាមួយទំនាក់ទំនងការផ្ញើសារបន្ទាន់របស់អ្នក -Comment[lt]=Pradėti pokalbį su bet kuriuo TP kontaktu -Comment[mr]=तुमच्या आयएम संपर्कातील कोणाशीही गप्पा मारा -Comment[nb]=Start en prat med en av dine LM-kontakter -Comment[nl]=Begin een chat met een van uw IM-contactpersonen -Comment[pl]=Rozpocznij rozmowę z kimkolwiek z twoich kontaktów z komunikatora -Comment[pt]=Iniciar uma conversa com qualquer um dos seus contactos MI -Comment[pt_BR]=Inicia um bate-papo com qualquer um dos seus contatos de MI -Comment[ro]=Începeți o discuție cu oricare dintre contactele de mesagerie instantanee -Comment[ru]=Общение с любым собеседником системы обмена сообщениями -Comment[sk]=Spustiť rozhovor s nejakým z vašich IM kontaktov -Comment[sl]=Začnite klepet s katerimkoli izmed vaših stikov hipnega sporočanja -Comment[sr]=Започните ћаскање преко ИМ контакта -Comment[sr@ijekavian]=Започните ћаскање преко ИМ контакта -Comment[sr@ijekavianlatin]=Započnite ćaskanje preko IM kontakta -Comment[sr@latin]=Započnite ćaskanje preko IM kontakta -Comment[sv]=Börja chatta med någon direktmeddelandekontakt -Comment[tr]=IM kişilerinizden biriyle sohbete başlayın -Comment[uk]=Почати спілкування з будь-яким з ваших контактів у системах обміну повідомленнями -Comment[wa]=Ataker on berdelaedje avou tolminme ké soçon di MSM -Comment[x-test]=xxStart chat with any of your IM contactsxx -Comment[zh_CN]=与任意您的即时通讯联系人开始聊天 -Comment[zh_TW]=與您的即時訊息聯絡人開始聊天 +Name[ug]=مۇڭداشقۇ +Name[uk]=Миттєвий обмін повідомленнями +Name[x-test]=xxInstant Messagingxx +Name[zh_TW]=即時訊息 +Comment=Start a chat with any of your IM contacts or change your IM status +Comment[ca]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat de MI +Comment[cs]=Začít rozhovor s kterýmkoliv vaším kontaktem v IM nebo změnit stav na IM +Comment[da]=Start chat med en af dine IM-kontakter eller skift din IM-status +Comment[de]=Chats mit ihren Kontakten starten oder Ihren IM-Status ändern +Comment[es]=Iniciar una conversación con cualquiera de sus contactos de MI o cambiar su estado de MI +Comment[fi]=Aloita keskustelu muun pikaviestinkäyttäjän kanssa tai vaihda pikaviestintilaasi +Comment[fr]=Démarre une discussion avec n'importe lequel de vos contacts de messagerie instantanée ou change l'état de celle-ci +Comment[it]=Avvia una chat con un tuo contatto di MI oppure cambia il tuo stato di MI +Comment[nb]=Start en prat med en av dine LM-kontakter eller endre din LM-status +Comment[nl]=Begin een chat met een van uw IM-contactpersonen of wijzig uw IM-status +Comment[pt]=Iniciar uma conversa com qualquer um dos seus contactos MI ou mudar o seu estado +Comment[pt_BR]=Inicia um bate-papo com um dos seus contatos de MI ou altera o seu status +Comment[sk]=Spustiť rozhovor s nejakým z vašich IM kontaktov alebo zmeniť váš IM stav +Comment[sl]=Začnite klepet s katerimkoli izmed vaših stikov hipnega sporočanja ali spremenite vaše stanje +Comment[sr]=Започните ћаскање преко ИМ контакта или измените своје ИМ стање +Comment[sr@ijekavian]=Започните ћаскање преко ИМ контакта или измените своје ИМ стање +Comment[sr@ijekavianlatin]=Započnite ćaskanje preko IM kontakta ili izmenite svoje IM stanje +Comment[sr@latin]=Započnite ćaskanje preko IM kontakta ili izmenite svoje IM stanje +Comment[sv]=Börja chatta med någon direktmeddelandekontakt eller ändra din direktmeddelandestatus +Comment[uk]=Почати спілкування з будь-яким з ваших контактів або змінити ваш запис стану у системах обміну повідомленнями +Comment[x-test]=xxStart a chat with any of your IM contacts or change your IM statusxx +Comment[zh_TW]=與您的即時訊息聯絡人開始聊天,或是變更您的即時訊息狀態 Icon=user-online X-KDE-ServiceTypes=Plasma/Runner diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-contact-runner-0.6.3/src/contactrunner.cpp new/ktp-contact-runner-0.6.80/src/contactrunner.cpp --- old/ktp-contact-runner-0.6.3/src/contactrunner.cpp 2013-08-06 03:17:34.000000000 +0200 +++ new/ktp-contact-runner-0.6.80/src/contactrunner.cpp 2013-09-23 23:18:12.000000000 +0200 @@ -337,9 +337,22 @@ continue; } - const QString &name = contact->alias(); - if (!name.contains(contactQuery, Qt::CaseInsensitive)) { - continue; + const QString &normalized = contact->alias().normalized(QString::NormalizationForm_D); + QString t; + // Strip diacritics, umlauts etc + Q_FOREACH (const QChar &c, normalized) { + if (c.category() != QChar::Mark_NonSpacing + && c.category() != QChar::Mark_SpacingCombining + && c.category() != QChar::Mark_Enclosing) { + t.append(c); + } + } + + if (!t.contains(contactQuery, Qt::CaseInsensitive)) { + const QString &id = contact->id(); + if (!id.contains(contactQuery, Qt::CaseInsensitive)) { + continue; + } } MatchInfo data; @@ -347,7 +360,7 @@ data.contact = contact; match.setData(qVariantFromValue(data)); - match.setText(name + QLatin1String(" (") + account->displayName() + ')'); + match.setText(contact->alias() + QLatin1String(" (") + account->displayName() + ')'); match.setType(Plasma::QueryMatch::ExactMatch); KTp::Presence presence(contact->presence()); @@ -377,7 +390,7 @@ if (!iconFile.isEmpty() && QFile::exists(iconFile)) { match.setIcon(QIcon(iconFile)); } else { - match.setIcon(presence.icon()); + match.setIcon(QIcon::fromTheme(QLatin1String("im-user"))); } if (!presence.statusMessage().isEmpty()) { -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org