Hello community, here is the log from the commit of package ktp-text-ui for openSUSE:Factory checked in at 2016-01-28 17:22:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktp-text-ui (Old) and /work/SRC/openSUSE:Factory/.ktp-text-ui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktp-text-ui" Changes: -------- --- /work/SRC/openSUSE:Factory/ktp-text-ui/ktp-text-ui.changes 2016-01-10 13:06:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ktp-text-ui.new/ktp-text-ui.changes 2016-01-28 17:22:03.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Jan 9 18:31:24 UTC 2016 - [email protected] + +- Update to KDE Applications 15.12.1 + * KDE Applications 15.12.1 + * https://www.kde.org/announcements/announce-applications-15.12.1.php + * boo#961265 + + +------------------------------------------------------------------- Old: ---- ktp-text-ui-15.12.0.tar.xz New: ---- ktp-text-ui-15.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktp-text-ui.spec ++++++ --- /var/tmp/diff_new_pack.Appjuc/_old 2016-01-28 17:22:04.000000000 +0100 +++ /var/tmp/diff_new_pack.Appjuc/_new 2016-01-28 17:22:04.000000000 +0100 @@ -17,7 +17,7 @@ Name: ktp-text-ui -Version: 15.12.0 +Version: 15.12.1 Release: 0 Summary: Telepathy chat handler for KDE License: GPL-2.0+ ++++++ ktp-text-ui-15.12.0.tar.xz -> ktp-text-ui-15.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-15.12.0/CMakeLists.txt new/ktp-text-ui-15.12.1/CMakeLists.txt --- old/ktp-text-ui-15.12.0/CMakeLists.txt 2015-12-08 17:08:39.000000000 +0100 +++ new/ktp-text-ui-15.12.1/CMakeLists.txt 2016-01-07 00:24:18.000000000 +0100 @@ -5,7 +5,7 @@ # KDE Application Version, managed by release script set(KDE_APPLICATIONS_VERSION_MAJOR "15") set(KDE_APPLICATIONS_VERSION_MINOR "12") -set(KDE_APPLICATIONS_VERSION_MICRO "0") +set(KDE_APPLICATIONS_VERSION_MICRO "1") set(KTP_TEXT_UI_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "5") set(IS_KTP_INTERNAL_MODULE TRUE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-15.12.0/app/chat-window.cpp new/ktp-text-ui-15.12.1/app/chat-window.cpp --- old/ktp-text-ui-15.12.0/app/chat-window.cpp 2015-12-08 17:08:39.000000000 +0100 +++ new/ktp-text-ui-15.12.1/app/chat-window.cpp 2016-01-07 00:24:18.000000000 +0100 @@ -312,7 +312,7 @@ } tab->setFocus(); - tab->updateSendMessageShortcuts(m_sendMessage->shortcut()); + tab->updateSendMessageShortcuts(m_sendMessage->shortcuts()); // block text input if key is being generated for this account if(m_proxyService->isOngoingGeneration(QDBusObjectPath(tab->account()->objectPath()))) { tab->blockTextInput(true); @@ -1341,7 +1341,7 @@ void ChatWindow::updateSendMessageShortcuts() { - QKeySequence newSendMessageShortcuts = m_sendMessage->shortcut(); + QList<QKeySequence> newSendMessageShortcuts = m_sendMessage->shortcuts(); for (int i = 0; i < m_tabWidget->count(); i++) { ChatTab* tab = qobject_cast<ChatTab*>(m_tabWidget->widget(i)); tab->updateSendMessageShortcuts(newSendMessageShortcuts); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-15.12.0/lib/chat-text-edit.cpp new/ktp-text-ui-15.12.1/lib/chat-text-edit.cpp --- old/ktp-text-ui-15.12.0/lib/chat-text-edit.cpp 2015-12-08 17:08:39.000000000 +0100 +++ new/ktp-text-ui-15.12.1/lib/chat-text-edit.cpp 2016-01-07 00:24:18.000000000 +0100 @@ -148,7 +148,7 @@ key = QKeySequence(keyEvent->modifiers() | keyEvent->key()); } - if (m_sendMessageShortcuts.matches(key) == QKeySequence::ExactMatch) { + if (m_sendMessageShortcuts.contains(key)) { // keyPressEvent() handles Control modifier wrong, so we need that thing // to be in event(). this->sendMessage(); @@ -203,7 +203,7 @@ Q_EMIT returnKeyPressed(); } -void ChatTextEdit::setSendMessageShortcuts(const QKeySequence &shortcuts) +void ChatTextEdit::setSendMessageShortcuts(const QList<QKeySequence> &shortcuts) { m_sendMessageShortcuts = shortcuts; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-15.12.0/lib/chat-text-edit.h new/ktp-text-ui-15.12.1/lib/chat-text-edit.h --- old/ktp-text-ui-15.12.0/lib/chat-text-edit.h 2015-12-08 17:08:39.000000000 +0100 +++ new/ktp-text-ui-15.12.1/lib/chat-text-edit.h 2016-01-07 00:24:18.000000000 +0100 @@ -71,7 +71,7 @@ * Updates internal message sending shortcuts. Must be called on every window * creation and every message sending shortcuts change. */ - void setSendMessageShortcuts(const QKeySequence &shortcuts); + void setSendMessageShortcuts(const QList<QKeySequence> &shortcuts); private: QStringList m_history; @@ -84,7 +84,7 @@ int m_completionPosition; bool m_continuousCompletion; - QKeySequence m_sendMessageShortcuts; + QList<QKeySequence> m_sendMessageShortcuts; }; #endif // CHATTEXTEDIT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-15.12.0/lib/chat-widget.cpp new/ktp-text-ui-15.12.1/lib/chat-widget.cpp --- old/ktp-text-ui-15.12.0/lib/chat-widget.cpp 2015-12-08 17:08:39.000000000 +0100 +++ new/ktp-text-ui-15.12.1/lib/chat-widget.cpp 2016-01-07 00:24:18.000000000 +0100 @@ -644,7 +644,7 @@ } } -void ChatWidget::updateSendMessageShortcuts(const QKeySequence &shortcuts) +void ChatWidget::updateSendMessageShortcuts(const QList<QKeySequence> &shortcuts) { d->ui.sendMessageBox->setSendMessageShortcuts(shortcuts); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-text-ui-15.12.0/lib/chat-widget.h new/ktp-text-ui-15.12.1/lib/chat-widget.h --- old/ktp-text-ui-15.12.0/lib/chat-widget.h 2015-12-08 17:08:39.000000000 +0100 +++ new/ktp-text-ui-15.12.1/lib/chat-widget.h 2016-01-07 00:24:18.000000000 +0100 @@ -134,7 +134,7 @@ */ void acknowledgeMessages(); - void updateSendMessageShortcuts(const QKeySequence &shortcuts); + void updateSendMessageShortcuts(const QList<QKeySequence> &shortcuts); void reloadTheme();
