[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 3682572e31b48e4e4dd387126fbc959ca4317710
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Feb 3 13:53:49 2015 +0100

    Disable editing the Google account credentials
    
    These cannot be changed as it's using Google's OAuth mechanism for
    authenticating and that is tied to the username and password entered in
    the webview while obtaining the OAuth token
---
 plugins/gabble/main-options-widget-googletalk.cpp |  1 -
 plugins/gabble/main-options-widget-googletalk.ui  | 19 +++----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/plugins/gabble/main-options-widget-googletalk.cpp b/plugins/gabble/main-options-widget-googletalk.cpp
index 035e785..c902bd4 100644
--- a/plugins/gabble/main-options-widget-googletalk.cpp
+++ b/plugins/gabble/main-options-widget-googletalk.cpp
@@ -29,7 +29,6 @@ MainOptionsWidgetGoogleTalk::MainOptionsWidgetGoogleTalk(ParameterEditModel *mod
     m_ui->setupUi(this);
 
     handleParameter(QLatin1String("account"), QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
-    handleParameter(QLatin1String("password"), QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
     QTimer::singleShot(0, m_ui->accountLineEdit, SLOT(setFocus()));
 }
 
diff --git a/plugins/gabble/main-options-widget-googletalk.ui b/plugins/gabble/main-options-widget-googletalk.ui
index df0305a..1ba9313 100644
--- a/plugins/gabble/main-options-widget-googletalk.ui
+++ b/plugins/gabble/main-options-widget-googletalk.ui
@@ -17,12 +17,9 @@
    <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="1">
-      <widget class="QLineEdit" name="accountLineEdit"/>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLineEdit" name="passwordLineEdit">
-       <property name="echoMode">
-        <enum>QLineEdit::Password</enum>
+      <widget class="QLineEdit" name="accountLineEdit">
+       <property name="disabled">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -36,16 +33,6 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="passwordLabel">
-       <property name="text">
-        <string>Password:</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>

-- 
ktp-accounts-kcm packaging