[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:28:58 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=817fcbc
The following commit has been merged in the master branch:
commit 817fcbc9d635f7c9fc11f2d77fe6091808696b59
Merge: 0ab80568b75f6c546bed128bcdef528d9e61c57d d58f6314fe18a57e92a0b41f31ca32444d4402b4
Author: Aleix Pol <aleixpol at kde.org>
Date: Tue Sep 8 10:51:41 2015 +0200
Merge branch 'stable'
core/backends/lan/downloadjob.h | 2 +-
core/backends/lan/landevicelink.h | 4 ++--
core/backends/lan/lanlinkprovider.h | 10 +++++-----
core/backends/lan/socketlinereader.h | 2 +-
core/backends/lan/uploadjob.cpp | 2 +-
core/backends/lan/uploadjob.h | 2 +-
core/backends/loopback/loopbackdevicelink.h | 4 ++--
core/backends/loopback/loopbacklinkprovider.h | 10 +++++-----
core/kdeconnectplugin.cpp | 2 +-
daemon/kdeconnectd.cpp | 4 ++--
fileitemactionplugin/sendfileitemaction.h | 2 +-
interfaces/dbusinterfaces.h | 18 +++++++++---------
interfaces/devicesmodel.cpp | 2 +-
interfaces/devicesmodel.h | 8 ++++----
interfaces/devicessortproxymodel.h | 6 +++---
interfaces/notificationsmodel.cpp | 6 +++---
interfaces/notificationsmodel.h | 8 ++++----
kcm/kcm.cpp | 8 ++++----
kio/kiokdeconnect.h | 8 ++++----
.../declarativeplugin/kdeconnectdeclarativeplugin.h | 4 ++--
plasmoid/declarativeplugin/objectfactory.h | 12 ++++++------
plasmoid/declarativeplugin/processrunner.h | 2 +-
plasmoid/declarativeplugin/responsewaiter.cpp | 4 ++--
plasmoid/declarativeplugin/responsewaiter.h | 2 +-
plugins/battery/batteryplugin.h | 4 ++--
plugins/clipboard/clipboardplugin.h | 4 ++--
plugins/mousepad/mousepadplugin.cpp | 4 ++--
plugins/mousepad/mousepadplugin.h | 4 ++--
plugins/mpriscontrol/mpriscontrolplugin.h | 4 ++--
plugins/notifications/notificationsplugin.h | 4 ++--
plugins/pausemusic/pausemusic_config.h | 6 +++---
plugins/pausemusic/pausemusicplugin.h | 4 ++--
plugins/ping/pingplugin.h | 4 ++--
.../screensaver-inhibit/screensaverinhibitplugin.cpp | 2 +-
plugins/screensaver-inhibit/screensaverinhibitplugin.h | 4 ++--
plugins/sftp/mounter.cpp | 2 +-
plugins/sftp/sftpplugin.cpp | 6 +++---
plugins/sftp/sftpplugin.h | 4 ++--
plugins/share/share_config.h | 6 +++---
plugins/share/shareplugin.h | 4 ++--
plugins/telephony/telephonyplugin.cpp | 7 ++++---
plugins/telephony/telephonyplugin.h | 4 ++--
tests/testsocketlinereader.cpp | 2 +-
43 files changed, 106 insertions(+), 105 deletions(-)
diff --cc core/backends/loopback/loopbacklinkprovider.h
index b4190d1,8266050..6a2fc82
--- a/core/backends/loopback/loopbacklinkprovider.h
+++ b/core/backends/loopback/loopbacklinkprovider.h
@@@ -33,15 -32,15 +33,15 @@@ public
LoopbackLinkProvider();
~LoopbackLinkProvider();
- QString name() { return "LoopbackLinkProvider"; }
- int priority() { return PRIORITY_LOW; }
+ QString name() override { return "LoopbackLinkProvider"; }
+ int priority() override { return PRIORITY_LOW; }
- virtual void onStart();
- virtual void onStop();
- virtual void onNetworkChange();
+ virtual void onStart() override;
+ virtual void onStop() override;
+ virtual void onNetworkChange() override;
private:
- LoopbackDeviceLink* loopbackDeviceLink;
+ QPointer<LoopbackDeviceLink> loopbackDeviceLink;
NetworkPackage identityPackage;
};
diff --cc plugins/telephony/telephonyplugin.cpp
index d4f8793,ea807a7..6463869
--- a/plugins/telephony/telephonyplugin.cpp
+++ b/plugins/telephony/telephonyplugin.cpp
@@@ -62,13 -61,13 +62,13 @@@ KNotification* TelephonyPlugin::createN
type = QStringLiteral("smsReceived");
icon = QStringLiteral("mail-receive");
QString messageBody = np.get<QString>("messageBody","");
- content = i18n("SMS from %1<br>%2", phoneNumber, messageBody);
- flags = KNotification::Persistent;
+ content = i18n("SMS from %1<br>%2", contactName, messageBody);
+ flags |= KNotification::Persistent;
} else if (event == "talking") {
- return NULL;
+ return nullptr;
} else {
#ifndef NDEBUG
- return NULL;
+ return nullptr;
#else
type = QStringLiteral("callReceived");
icon = QStringLiteral("phone");
@@@ -103,11 -96,15 +103,12 @@@ bool TelephonyPlugin::receivePackage(co
{
if (np.get<bool>("isCancel")) {
- //It would be awesome to remove the old notification from the system tray here, but there is no way to do it :(
- //Now I realize why at the end of the day I have hundreds of notifications from facebook messages that I HAVE ALREADY READ,
- //...it's just because the telepathy client has no way to remove them! even when it knows that I have read those messages!
+ //TODO: Clear the old notification
} else {
-
KNotification* n = createNotification(np);
- if (n != NULL) n->sendEvent();
+ if (n != nullptr) n->sendEvent();
+
}
return true;
diff --cc plugins/telephony/telephonyplugin.h
index 520b991,2898f22..c2a65a1
--- a/plugins/telephony/telephonyplugin.h
+++ b/plugins/telephony/telephonyplugin.h
@@@ -40,14 -40,10 +40,14 @@@ public
explicit TelephonyPlugin(QObject *parent, const QVariantList &args);
public Q_SLOTS:
- virtual bool receivePackage(const NetworkPackage& np);
- virtual void connected() { }
+ virtual bool receivePackage(const NetworkPackage& np) override;
+ virtual void connected() override { }
void sendMutePackage();
+private Q_SLOTS:
+ void sendSms(const QString& phoneNumber, const QString& messageBody);
+ void showSendSmsDialog();
+
private:
KNotification* createNotification(const NetworkPackage& np);
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list