[SCM] ktp-accounts-kcm packaging branch, upstream, updated. upstream/0.8.80-8-gb8cb7f3

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=070b4d4

The following commit has been merged in the upstream branch:
commit 070b4d4dd4c89456f0e1c6c2870d8b5e8f64ab8e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Nov 9 09:37:36 2015 +0100

    Imported Upstream version 15.08.3
---
 CMakeLists.txt                                                | 2 +-
 plugins/kaccounts/kaccounts-ui-provider.cpp                   | 7 ++++---
 plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake       | 1 +
 plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a6f96de..7f5ab93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ find_package(KF5 5.11 REQUIRED KCMUtils KIO I18n WidgetsAddons Codecs CoreAddons
 # KDE Application Version, managed by release script
 set (KDE_APPLICATIONS_VERSION_MAJOR "15")
 set (KDE_APPLICATIONS_VERSION_MINOR "08")
-set (KDE_APPLICATIONS_VERSION_MICRO "2")
+set (KDE_APPLICATIONS_VERSION_MICRO "3")
 
 set(KTP_ACCOUNTS_KCM_SONUMBER "9")
 set(KTP_ACCOUNTS_KCM_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
diff --git a/plugins/kaccounts/kaccounts-ui-provider.cpp b/plugins/kaccounts/kaccounts-ui-provider.cpp
index d48c41d..e1a15e3 100644
--- a/plugins/kaccounts/kaccounts-ui-provider.cpp
+++ b/plugins/kaccounts/kaccounts-ui-provider.cpp
@@ -106,10 +106,10 @@ void KAccountsUiProvider::init(KAccountsUiPlugin::UiType type)
 
     if (d->type == KAccountsUiPlugin::ConfigureAccountDialog) {
         if (d->accountManager->isReady()) {
-            Q_EMIT uiReady();
+            Q_EMIT configUiReady();
         } else {
             // let's wait for AM to become ready first
-            connect(d->accountManager->becomeReady(), &Tp::PendingOperation::finished, this, &KAccountsUiProvider::uiReady);
+            connect(d->accountManager->becomeReady(), &Tp::PendingOperation::finished, this, &KAccountsUiProvider::configUiReady);
         }
     }
 }
@@ -338,6 +338,7 @@ void KAccountsUiProvider::onCreateAccountDialogAccepted()
         properties.insert(QLatin1String("org.freedesktop.Telepathy.Account.Enabled"), true);
     }
 
+    const QString password = values[QStringLiteral("password")].toString();
     //remove password values from being sent. These are stored by Accounts SSO instead
 
     //FIXME: This is a hack for jabber registration, we don't remove passwords - see Telepathy ML thread "Storing passwords in MC and regsitering new accounts"
@@ -347,7 +348,7 @@ void KAccountsUiProvider::onCreateAccountDialogAccepted()
     }
 
     //TODO: prefix all the values with telepathy or some mc-key
-    Q_EMIT success(values[QStringLiteral("account")].toString(), values[QStringLiteral("password")].toString(), values);
+    Q_EMIT success(values[QStringLiteral("account")].toString(), password, values);
 
     d->dialog->accept();
 }
diff --git a/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake b/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake
index 30885e9..e009ae5 100644
--- a/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake
+++ b/plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake
@@ -4,6 +4,7 @@ Comment=Custom account configuration user interface for accounts using the Morse
 Comment[ast]=Interfaz d'usuariu de configuración de cuenta personalizada pa cuentes qu'usen el xestor de conexones Morse.
 Comment[bs]=Korisnički interfejs konfiguratora prilagođenih korisničkih naloga koji koristi Morse menadžer konekcija.
 Comment[ca]=Interfície d'usuari de configuració de compte personalitzat per comptes que utilitzen el gestor de connexions Morse.
+Comment[ca at valencia]=Interfície d'usuari de configuració de compte personalitzat per comptes que utilitzen el gestor de connexions Morse.
 Comment[cs]=Vlastní uživatelské rozhraní nastavení účtů pro účty používající správce spojení Morse.
 Comment[da]=Brugerflade til brugertilpasset kontokonfiguration til konti der bruger forbindelseshåndteringen Morse.
 Comment[de]=Eigene Benutzeroberfläche zum Einrichten von Zugängen, die die Morse-Verbindungsverwaltung verwenden.
diff --git a/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake b/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake
index 2ce3c91..ff45dc9 100644
--- a/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake
+++ b/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake
@@ -4,7 +4,7 @@ Comment=Custom account configuration user interface for Gadu-Gadu accounts using
 Comment[ast]=Interfaz d'usuariu de configuración de cuenta personalizada pa cuentes Gadu-Gadu qu'usen el xestor de conexones Sunshine.
 Comment[bs]=Korisnički interfejs za konfiguraciju Gadu-Gadu korisničkih naloga koristeći Sunshine menadžer konekcja.
 Comment[ca]=Interfície d'usuari de configuració de compte personalitzat en comptes del Gadu-Gadu que utilitzen el gestor de connexions Sunshine.
-Comment[ca at valencia]=Interfície d'usuari de configuració de compte personalitzat per comptes del Gadu-Gadu que utilitzen el gestor de connexions Sunshine.
+Comment[ca at valencia]=Interfície d'usuari de configuració de compte personalitzat en comptes del Gadu-Gadu que utilitzen el gestor de connexions Sunshine.
 Comment[cs]=Vlastní uživatelské rozhraní nastavení účtů pro účty Gadu-Gadu používající správce spojení Sunshine.
 Comment[da]=Brugerflade til brugertilpasset kontokonfiguration til Gadu-Gadu-konti der bruger forbindelseshåndteringen Sunshine.
 Comment[de]=Eigene Benutzeroberfläche zum Einrichten von Gadu-Gadu-Zugängen, die die Sunshine-Verbindungsverwaltung verwenden.

-- 
ktp-accounts-kcm packaging