Hello community, here is the log from the commit of package ktp-approver for openSUSE:Factory checked in at 2013-10-08 10:53:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ktp-approver (Old) and /work/SRC/openSUSE:Factory/.ktp-approver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktp-approver" Changes: -------- --- /work/SRC/openSUSE:Factory/ktp-approver/ktp-approver.changes 2013-09-25 14:31:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ktp-approver.new/ktp-approver.changes 2013-10-08 10:53:42.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 26 22:02:09 UTC 2013 - [email protected] + +- Update to version 0.6.80 + * New feature release, please see http://www.sharpley.org.uk/blog/ktp-0.7-beta + +------------------------------------------------------------------- Old: ---- ktp-approver-0.6.3.tar.bz2 New: ---- ktp-approver-0.6.80.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ktp-approver.spec ++++++ --- /var/tmp/diff_new_pack.R8Q2ZM/_old 2013-10-08 10:53:49.000000000 +0200 +++ /var/tmp/diff_new_pack.R8Q2ZM/_new 2013-10-08 10:53:49.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ktp-approver # -# 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,18 +11,19 @@ # 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-approver -Version: 0.6.3 -Release: 1 -License: LGPL-2.1+ +Version: 0.6.80 +Release: 0 Summary: KDE Channel Approver for Telepathy -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: telepathy-qt4-devel >= 0.8.9 ++++++ ktp-approver-0.6.3.tar.bz2 -> ktp-approver-0.6.80.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-approver-0.6.3/CMakeLists.txt new/ktp-approver-0.6.80/CMakeLists.txt --- old/ktp-approver-0.6.3/CMakeLists.txt 2013-08-06 03:00:04.000000000 +0200 +++ new/ktp-approver-0.6.80/CMakeLists.txt 2013-09-23 23:01:35.000000000 +0200 @@ -1,6 +1,6 @@ project(ktp-approver) -set(KTP_APPROVER_VERSION "0.6.3") +set(KTP_APPROVER_VERSION "0.6.80") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) cmake_policy(SET CMP0002 OLD) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-approver-0.6.3/po/nb/kded_ktp_approver.po new/ktp-approver-0.6.80/po/nb/kded_ktp_approver.po --- old/ktp-approver-0.6.3/po/nb/kded_ktp_approver.po 2013-08-06 02:59:38.000000000 +0200 +++ new/ktp-approver-0.6.80/po/nb/kded_ktp_approver.po 2013-09-23 23:01:00.000000000 +0200 @@ -1,12 +1,12 @@ # Translation of kded_ktp_approver to Norwegian Bokmål # -# Bjørn Steensrud <[email protected]>, 2012. +# Bjørn Steensrud <[email protected]>, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2013-07-15 05:14+0000\n" -"PO-Revision-Date: 2012-10-16 12:15+0200\n" +"PO-Revision-Date: 2013-09-17 20:37+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" "Language: nb\n" @@ -14,7 +14,7 @@ "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.4\n" +"X-Generator: Lokalize 1.5\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -82,17 +82,17 @@ #: tubechannelapprover.cpp:72 msgid "Unknown Incoming Connection" -msgstr "" +msgstr "Ukjent innkommende tilkobling" #: tubechannelapprover.cpp:73 #, kde-format msgid "%1 wants to start an unknown service with you" -msgstr "" +msgstr "%1 vil starte en ukjent tjeneste med deg " #: tubechannelapprover.cpp:126 #, kde-format msgid "Incoming %1 request from %2" -msgstr "" +msgstr "Innkommende forespørsel om %1 fra %2" #: tubechannelapprover.cpp:142 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-approver-0.6.3/src/dispatchoperation.cpp new/ktp-approver-0.6.80/src/dispatchoperation.cpp --- old/ktp-approver-0.6.3/src/dispatchoperation.cpp 2013-08-06 02:59:05.000000000 +0200 +++ new/ktp-approver-0.6.80/src/dispatchoperation.cpp 2013-09-23 23:00:01.000000000 +0200 @@ -21,6 +21,9 @@ #include <KDebug> #include <TelepathyQt/PendingOperation> +#include <TelepathyQt/TextChannel> +#include <TelepathyQt/ReceivedMessage> + DispatchOperation::DispatchOperation(const Tp::ChannelDispatchOperationPtr & dispatchOperation, QObject *parent) : QObject(parent), m_dispatchOperation(dispatchOperation) @@ -78,6 +81,14 @@ Tp::PendingOperation *operation = m_dispatchOperation->claim(); connect(operation, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onClaimFinished(Tp::PendingOperation*))); + Q_FOREACH(const Tp::ChannelPtr &channel, m_dispatchOperation->channels()) { + Tp::TextChannelPtr textChannel = Tp::TextChannelPtr::dynamicCast(channel); + if (textChannel) { + //ack everything before we close the channel. Otherwise it will reappear + textChannel->acknowledge(textChannel->messageQueue()); + } + channel->requestClose(); + } } void DispatchOperation::onClaimFinished(Tp::PendingOperation *operation) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-approver-0.6.3/src/filetransferchannelapprover.cpp new/ktp-approver-0.6.80/src/filetransferchannelapprover.cpp --- old/ktp-approver-0.6.3/src/filetransferchannelapprover.cpp 2013-08-06 02:59:05.000000000 +0200 +++ new/ktp-approver-0.6.80/src/filetransferchannelapprover.cpp 2013-09-23 23:00:01.000000000 +0200 @@ -68,6 +68,8 @@ m_notifierItem->setToolTip(QLatin1String("document-save"), i18n("Incoming file transfer from %1", sender->alias()), QString()); + + m_notifierItem->contextMenu()->clear(); //calling clear removes the pointless title m_notifierItem->contextMenu()->addAction(i18n("Accept"), this, SIGNAL(channelAccepted())); m_notifierItem->contextMenu()->addAction(i18n("Reject"), this, SIGNAL(channelRejected())); connect(m_notifierItem, SIGNAL(activateRequested(bool,QPoint)), SIGNAL(channelAccepted())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-approver-0.6.3/src/ktp_approver.desktop new/ktp-approver-0.6.80/src/ktp_approver.desktop --- old/ktp-approver-0.6.3/src/ktp_approver.desktop 2013-08-06 02:59:05.000000000 +0200 +++ new/ktp-approver-0.6.80/src/ktp_approver.desktop 2013-09-23 23:00:01.000000000 +0200 @@ -22,6 +22,7 @@ Name[mr]=त्वरित संदेश प्रमाणित करणारा Name[nb]=Godkjenner for lynmelding Name[nl]=Goedkeuringgever van Instant Messaging +Name[pa]=ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਮਨਜ਼ੂਰਕਰਤਾ Name[pl]=Program zatwierdzający dla komunikatorów internetowych Name[pt]=Aprovação das Mensagens Instantâneas Name[pt_BR]=Aprovação das mensagens instantâneas @@ -35,6 +36,7 @@ Name[sr@latin]=Brzoglasnički odobravač Name[sv]=Godkännande av direktmeddelanden Name[tr]=Anında Mesajlaşma Onaylayıcı +Name[ug]=مۇڭداشقۇ تەستىقلىغۇچ Name[uk]=Підтверджувач обміну повідомленнями Name[wa]=Asprouveu di messaedjreye sol moumint Name[x-test]=xxInstant Messaging Approverxx @@ -67,7 +69,7 @@ Comment[ro]=Arată notificări pentru apelurile și mesajele de intrare și vă permite să deschideți un manipulant pentru a răspunde Comment[ru]=Уведомления о входящих запросах системы обмена сообщениями Comment[sk]=Zobrazí upozornenia pre prichádzajúce požiadavky IM/hovorov a umožní vám otvoriť spracovač na odpoveď -Comment[sl]=Prikaže obvestila za dohodne zahtevke hipnega sporočanja/klicev in vam dovoli, da odprete ročnik za odgovor +Comment[sl]=Prikaže obvestila za dohodne zahteve hipnega sporočanja/klicev in vam dovoli, da odprete ročnik za odgovor Comment[sr]=Приказује обавештења за долазне ИМ/позивне захтеве и омогућава вам да отворите руковаоца за одговор Comment[sr@ijekavian]=Приказује обавјештења за долазне ИМ/позивне захтјеве и омогућава вам да отворите руковаоца за одговор Comment[sr@ijekavianlatin]=Prikazuje obavještenja za dolazne IM/pozivne zahtjeve i omogućava vam da otvorite rukovaoca za odgovor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-approver-0.6.3/src/textchannelapprover.cpp new/ktp-approver-0.6.80/src/textchannelapprover.cpp --- old/ktp-approver-0.6.3/src/textchannelapprover.cpp 2013-08-06 02:59:05.000000000 +0200 +++ new/ktp-approver-0.6.80/src/textchannelapprover.cpp 2013-09-23 23:00:01.000000000 +0200 @@ -23,6 +23,8 @@ #include <KGlobal> #include <KDebug> #include <KAboutData> +#include <KMenu> + #include <TelepathyQt/ReceivedMessage> #include <TelepathyQt/AvatarData> #include <TelepathyQt/ContactManager> @@ -79,6 +81,10 @@ connect(m_notification.data(), SIGNAL(action1Activated()), SIGNAL(channelAccepted())); } + m_notifierItem.data()->contextMenu()->clear(); //calling clear removes the pointless title + m_notifierItem.data()->contextMenu()->addAction(i18n("Accept"), this, SIGNAL(channelAccepted())); + m_notifierItem.data()->contextMenu()->addAction(i18n("Close"), this, SIGNAL(channelRejected())); + m_notification.data()->setText(msg.text().simplified()); m_notification.data()->sendEvent(); } @@ -97,6 +103,7 @@ notifierItem->setAttentionIconByName(QLatin1String("mail-unread-new")); notifierItem->setStandardActionsEnabled(false); notifierItem->setProperty("approver_new_channels_count", 0U); + *s_notifierItem = notifierItem; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ktp-approver-0.6.3/src/tubechannelapprover.cpp new/ktp-approver-0.6.80/src/tubechannelapprover.cpp --- old/ktp-approver-0.6.3/src/tubechannelapprover.cpp 2013-08-06 02:59:05.000000000 +0200 +++ new/ktp-approver-0.6.80/src/tubechannelapprover.cpp 2013-09-23 23:00:01.000000000 +0200 @@ -39,7 +39,7 @@ { Q_UNUSED(parent); - kDebug() << "Incomming tube channel"; + kDebug() << "Incoming tube channel"; kDebug() << "\tTube Type:" << channel->channelType(); connect(m_channel.data(), SIGNAL(invalidated(Tp::DBusProxy*,QString,QString)), SLOT(onChannelInvalidated())); @@ -125,6 +125,8 @@ m_notifierItem.data()->setToolTip(QLatin1String("document-save"), i18n("Incoming %1 request from %2", title, sender->alias()), QString()); + + m_notifierItem.data()->contextMenu()->clear(); //calling clear removes the pointless title m_notifierItem.data()->contextMenu()->addAction(i18n("Accept"), this, SIGNAL(channelAccepted())); m_notifierItem.data()->contextMenu()->addAction(i18n("Reject"), this, SIGNAL(channelRejected())); connect(this, SIGNAL(channelAccepted()), SLOT(onChannelAccepted())); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
