diff options
| author | Szymon Kłos <eszkadev@gmail.com> | 2016-05-15 00:52:50 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-05-16 07:24:23 +0000 |
| commit | 511db54e95d02292417d7cd076e4bd6d50956d64 (patch) | |
| tree | ab8b4d46a35b1c9cc52679e966e0786bd18ca916 /uui | |
| parent | 5e54d9e9bc856520808a446f20575e29a50d017b (diff) | |
tdf#87938 libcmis: Google 2FA implementation
2 Factor Authentication for Google Drive, changes:
+ parsing additional page with challenge - pin code verification
+ calling the interaction dialog requesting the code
+ dialog title changed to more general: Authentication Code
+ dialog shows url field only if not empty
Change-Id: Idb3ebbad6a12849b9e50af87b46324bfbe966bab
Reviewed-on: https://gerrit.libreoffice.org/25002
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/authfallbackdlg.cxx | 5 | ||||
| -rw-r--r-- | uui/uiconfig/ui/authfallback.ui | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx index 70ed1e7396d9..a6383d1e4e21 100644 --- a/uui/source/authfallbackdlg.cxx +++ b/uui/source/authfallbackdlg.cxx @@ -29,7 +29,10 @@ AuthFallbackDlg::AuthFallbackDlg(Window* pParent, const OUString& instructions, m_pBTOk->Enable(); m_pTVInstructions->SetText( instructions ); - m_pEDUrl->SetText( url ); + if( url.isEmpty() ) + m_pEDUrl->Hide(); + else + m_pEDUrl->SetText( url ); } AuthFallbackDlg::~AuthFallbackDlg() diff --git a/uui/uiconfig/ui/authfallback.ui b/uui/uiconfig/ui/authfallback.ui index a947ad4e24f2..6c99edfe04cb 100644 --- a/uui/uiconfig/ui/authfallback.ui +++ b/uui/uiconfig/ui/authfallback.ui @@ -5,7 +5,7 @@ <object class="GtkDialog" id="AuthFallbackDlg"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">OneDrive Authentication Code</property> + <property name="title" translatable="yes">Authentication Code</property> <property name="default_width">400</property> <property name="default_height">270</property> <property name="type_hint">dialog</property> |