[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=7d3fe62

The following commit has been merged in the master branch:
commit 7d3fe6239c254f9714c6cb4398d6d326344d4bfa
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sun Nov 9 20:35:47 2014 -0800

    Updating .notifyrc file
---
 core/device.cpp                       |  2 +-
 kded/CMakeLists.txt                   |  2 --
 plugins/CMakeLists.txt                |  2 ++
 {kded => plugins}/kdeconnect.notifyrc | 60 +++++++----------------------------
 plugins/share/shareplugin.cpp         |  2 +-
 plugins/telephony/telephonyplugin.cpp |  2 +-
 6 files changed, 16 insertions(+), 54 deletions(-)

diff --git a/core/device.cpp b/core/device.cpp
index e0f9178..c404318 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -369,7 +369,7 @@ void Device::privateReceivedPackage(const NetworkPackage& np)
 
                 kDebug(debugArea()) << "Pair request";
 
-                KNotification* notification = new KNotification("pingReceived"); //KNotification::Persistent
+                KNotification* notification = new KNotification("pairingRequest");
                 notification->setPixmap(KIcon("dialog-information").pixmap(48, 48));
                 notification->setComponentData(KComponentData("kdeconnect", "kdeconnect"));
                 notification->setTitle("KDE Connect");
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 73cf45b..d429dce 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -11,6 +11,4 @@ install(TARGETS kdeconnectd DESTINATION ${LIBEXEC_INSTALL_DIR})
 install(TARGETS kded_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
 
-#TODO: Split this into several files for core and for each plugin
-install(FILES kdeconnect.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kdeconnect)
 
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index f50335a..de1131d 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -12,3 +12,5 @@ add_subdirectory(share)
 add_subdirectory(notifications)
 add_subdirectory(sftp)
 
+#FIXME: If we split notifications in several files, they won't appear in the same group in the Notifications KCM
+install(FILES kdeconnect.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kdeconnect)
diff --git a/kded/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
similarity index 86%
rename from kded/kdeconnect.notifyrc
rename to plugins/kdeconnect.notifyrc
index 37d5fa2..a026450 100644
--- a/kded/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -49,6 +49,11 @@ Comment[tr]=Cihazınızdan bildirimler
 Comment[uk]=Сповіщення з вашого пристрою
 Comment[x-test]=xxNotifications from your devicesxx
 
+[Event/pairingRequest]
+Name=Pairing Request
+Comment=Pairing request received from a devices
+Action=Popup
+
 [Event/callReceived]
 Name=Calling
 Name[bg]=Позвъняване
@@ -355,53 +360,10 @@ Comment[uk]=Отримано сповіщення
 Comment[x-test]=xxNotification receivedxx
 Action=Popup
 
-[Event/unknownEvent]
-Name=Unknown
-Name[bg]=Неизвестно
-Name[bs]=Nepoznato
-Name[ca]=Desconeguda
-Name[cs]=Neznámý
-Name[da]=Ukendt
-Name[de]=Unbekannt
-Name[es]=Desconocido
-Name[fi]=Tuntematon
-Name[fr]=Inconnu
-Name[hu]=Ismeretlen
-Name[it]=Sconsciuto
-Name[ko]=알 수 없음
-Name[nl]=Onbekend
-Name[pl]=Nieznana
-Name[pt]=Desconhecido
-Name[pt_BR]=Desconhecido
-Name[ro]=Necunoscut
-Name[ru]=Неизвестно
-Name[sk]=Neznáme
-Name[sv]=Okänt
-Name[tr]=Bilinmeyen
-Name[uk]=Невідомо
-Name[x-test]=xxUnknownxx
-Comment=Something unknown happened
-Comment[bg]=Случи се нещо неизвестно
-Comment[bs]=Nešto se nepoznato dogodilo
-Comment[ca]=Ha succeït quelcom desconegut
-Comment[cs]=Stalo se něco neznámého
-Comment[da]=Der skete noget ukendt
-Comment[de]=Etwas unbekanntes ist aufgetreten
-Comment[es]=Ha ocurrido algo desconocido
-Comment[fi]=Jotakin outoa sattui
-Comment[fr]=Un évènement inconnu est survenu
-Comment[hu]=Valami ismeretlen történt
-Comment[it]=Errore imprevisto
-Comment[ko]=알 수 없는 일이 일어남
-Comment[nl]=Er is iets onbekends gebeurd
-Comment[pl]=Stało się coś nieznanego
-Comment[pt]=Algo de inesperado aconteceu
-Comment[pt_BR]=Ocorreu algo inesperado
-Comment[ro]=S-a întîmplat ceva necunoscut
-Comment[ru]=Произошло неизвестное событие
-Comment[sk]=Stalo sa niečo neznáme
-Comment[sv]=Någonting okänt inträffade
-Comment[tr]=Bilinmeyen bir durum oluştu
-Comment[uk]=Сталося щось невідоме програмі
-Comment[x-test]=xxSomething unknown happenedxx
+[Event/transferReceived]
+Name=Pairing Request
+Comment=Pairing request received from a devices
 Action=Popup
+
+
+
diff --git a/plugins/share/shareplugin.cpp b/plugins/share/shareplugin.cpp
index ba2559d..2c7c815 100644
--- a/plugins/share/shareplugin.cpp
+++ b/plugins/share/shareplugin.cpp
@@ -129,7 +129,7 @@ void SharePlugin::finished(KJob* job)
     bool error = (job->error() != 0);
 
     FileTransferJob* transferJob = (FileTransferJob*)job;
-    KNotification* notification = new KNotification("pingReceived"); //KNotification::Persistent
+    KNotification* notification = new KNotification("transferReceived");
     notification->setPixmap(KIcon(error? "edit-delete" : "dialog-ok").pixmap(48, 48));
     notification->setComponentData(KComponentData("kdeconnect", "kdeconnect-kded"));
     notification->setTitle(i18n("Transfer finished"));
diff --git a/plugins/telephony/telephonyplugin.cpp b/plugins/telephony/telephonyplugin.cpp
index 491c1f7..4e1c0a1 100644
--- a/plugins/telephony/telephonyplugin.cpp
+++ b/plugins/telephony/telephonyplugin.cpp
@@ -63,7 +63,7 @@ KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np)
 #ifdef NDEBUG
         return NULL;
 #else
-        type = "unknownEvent";
+        type = "callReceived";
         icon = "pda";
         content = i18n("Unknown telephony event: %2", event);
 #endif

-- 
kdeconnect packaging