[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis-gtk] branch master updated: add auto-abort case for cha
|
From: |
gnunet |
|
Subject: |
[taler-anastasis-gtk] branch master updated: add auto-abort case for challenge handling |
|
Date: |
Mon, 29 Mar 2021 10:23:40 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis-gtk.
The following commit(s) were added to refs/heads/master by this push:
new 4ec5ed1 add auto-abort case for challenge handling
4ec5ed1 is described below
commit 4ec5ed19db3bcc10f040d406c8ac71c48c83fd32
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Mar 29 10:23:33 2021 +0200
add auto-abort case for challenge handling
---
contrib/anastasis_gtk_auth_add_email.glade | 12 +++++++-----
contrib/anastasis_gtk_auth_add_post.glade | 20 ++++++++++++++++----
contrib/anastasis_gtk_auth_add_question.glade | 10 +++++++---
contrib/anastasis_gtk_auth_add_sms.glade | 13 ++++++++-----
contrib/anastasis_gtk_auth_add_video.glade | 7 ++++++-
src/anastasis/anastasis-gtk_action.c | 18 ++++++++++++++----
6 files changed, 58 insertions(+), 22 deletions(-)
diff --git a/contrib/anastasis_gtk_auth_add_email.glade
b/contrib/anastasis_gtk_auth_add_email.glade
index 1a19e2b..c7aa9e0 100644
--- a/contrib/anastasis_gtk_auth_add_email.glade
+++ b/contrib/anastasis_gtk_auth_add_email.glade
@@ -19,8 +19,8 @@
<object class="GtkButton"
id="anastasis_gtk_b_email_dialog_btn_cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can-focus">False</property>
+ <property name="receives-default">False</property>
<property name="use-stock">True</property>
</object>
<packing>
@@ -34,11 +34,10 @@
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="can-focus">True</property>
- <property name="has-focus">True</property>
+ <property name="can-focus">False</property>
<property name="can-default">True</property>
<property name="has-default">True</property>
- <property name="receives-default">True</property>
+ <property name="receives-default">False</property>
<property name="use-stock">True</property>
</object>
<packing>
@@ -66,6 +65,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Email
address:</property>
</object>
@@ -80,7 +80,9 @@
<object class="GtkEntry"
id="anastasis_gtk_b_email_dialog_mailaddress_entry">
<property name="visible">True</property>
<property name="can-focus">True</property>
+ <property name="has-focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates-default">True</property>
<property name="width-chars">36</property>
<property
name="primary-icon-stock">gtk-dialog-authentication</property>
<property name="input-purpose">email</property>
diff --git a/contrib/anastasis_gtk_auth_add_post.glade
b/contrib/anastasis_gtk_auth_add_post.glade
index 626071d..303bc3f 100644
--- a/contrib/anastasis_gtk_auth_add_post.glade
+++ b/contrib/anastasis_gtk_auth_add_post.glade
@@ -19,8 +19,8 @@
<object class="GtkButton"
id="anastasis_gtk_b_post_dialog_btn_cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can-focus">False</property>
+ <property name="receives-default">False</property>
<property name="use-stock">True</property>
</object>
<packing>
@@ -34,8 +34,10 @@
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can-focus">False</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">False</property>
<property name="use-stock">True</property>
</object>
<packing>
@@ -75,6 +77,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">_Full
name:</property>
<property name="use-underline">True</property>
@@ -92,6 +95,7 @@
<property name="can-focus">True</property>
<property name="has-focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates-default">True</property>
<signal name="changed"
handler="anastasis_gtk_b_post_dialog_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -115,6 +119,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label"
translatable="yes">_Street:</property>
<property name="use-underline">True</property>
@@ -131,6 +136,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates-default">True</property>
<signal name="changed"
handler="anastasis_gtk_b_post_dialog_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -154,6 +160,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">_City:</property>
<property name="use-underline">True</property>
@@ -170,6 +177,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates-default">True</property>
<signal name="changed"
handler="anastasis_gtk_b_post_dialog_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -193,6 +201,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label"
translatable="yes">_Postcode:</property>
<property name="use-underline">True</property>
@@ -209,6 +218,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates-default">True</property>
<signal name="changed"
handler="anastasis_gtk_b_post_dialog_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -232,6 +242,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label"
translatable="yes">Countr_y:</property>
<property name="use-underline">True</property>
@@ -248,6 +259,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates-default">True</property>
<signal name="changed"
handler="anastasis_gtk_b_post_dialog_entry_changed_cb" swapped="no"/>
</object>
<packing>
diff --git a/contrib/anastasis_gtk_auth_add_question.glade
b/contrib/anastasis_gtk_auth_add_question.glade
index adc8d02..890b37e 100644
--- a/contrib/anastasis_gtk_auth_add_question.glade
+++ b/contrib/anastasis_gtk_auth_add_question.glade
@@ -19,8 +19,8 @@
<object class="GtkButton"
id="anastasis_gtk_b_question_dialog_btn_cancel">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can-focus">False</property>
+ <property name="receives-default">False</property>
</object>
<packing>
<property name="expand">True</property>
@@ -36,7 +36,7 @@
<property name="can-focus">False</property>
<property name="can-default">True</property>
<property name="has-default">True</property>
- <property name="receives-default">True</property>
+ <property name="receives-default">False</property>
</object>
<packing>
<property name="expand">True</property>
@@ -74,6 +74,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Security
question:</property>
</object>
@@ -89,6 +90,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates-default">True</property>
<property name="width-chars">60</property>
<property
name="primary-icon-stock">gtk-dialog-question</property>
<signal name="changed"
handler="anastasis_gtk_b_question_dialog_question_entry_changed_cb"
swapped="no"/>
@@ -133,6 +135,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Answer:</property>
</object>
@@ -148,6 +151,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates-default">True</property>
<property name="width-chars">60</property>
<property
name="primary-icon-stock">gtk-dialog-authentication</property>
<signal name="changed"
handler="anastasis_gtk_b_question_dialog_answer_entry_changed_cb" swapped="no"/>
diff --git a/contrib/anastasis_gtk_auth_add_sms.glade
b/contrib/anastasis_gtk_auth_add_sms.glade
index e170255..412f60f 100644
--- a/contrib/anastasis_gtk_auth_add_sms.glade
+++ b/contrib/anastasis_gtk_auth_add_sms.glade
@@ -19,9 +19,8 @@
<object class="GtkButton"
id="anastasis_gtk_b_sms_dialog_btn_cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="has-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can-focus">False</property>
+ <property name="receives-default">False</property>
<property name="use-stock">True</property>
</object>
<packing>
@@ -35,8 +34,10 @@
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="can-focus">True</property>
- <property name="receives-default">True</property>
+ <property name="can-focus">False</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">False</property>
<property name="use-stock">True</property>
</object>
<packing>
@@ -64,6 +65,7 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Phone
number:</property>
</object>
@@ -79,6 +81,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates-default">True</property>
<property name="width-chars">24</property>
<property
name="primary-icon-stock">gtk-dialog-authentication</property>
<property name="placeholder-text"
translatable="yes">+41123456789</property>
diff --git a/contrib/anastasis_gtk_auth_add_video.glade
b/contrib/anastasis_gtk_auth_add_video.glade
index a05b35f..ea3e661 100644
--- a/contrib/anastasis_gtk_auth_add_video.glade
+++ b/contrib/anastasis_gtk_auth_add_video.glade
@@ -19,6 +19,8 @@
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
<property name="receives-default">True</property>
<property name="use-stock">True</property>
<signal name="clicked"
handler="anastasis_gtk_b_video_dialog_btn_cancel_clicked_cb" swapped="no"/>
@@ -35,6 +37,8 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
<property name="receives-default">True</property>
<property name="use-stock">True</property>
</object>
@@ -82,7 +86,8 @@
<child>
<object class="GtkFileChooserButton">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
+ <property name="has-focus">True</property>
<property name="title" translatable="yes"/>
</object>
<packing>
diff --git a/src/anastasis/anastasis-gtk_action.c
b/src/anastasis/anastasis-gtk_action.c
index bc5ca96..5c47574 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -1029,7 +1029,7 @@ setup_qrcode (const char *widget,
scale = 3;
else
scale = 2;
- return create_qrcode (scale,
+ return create_qrcode (3 * scale,
text,
text_size);
}
@@ -2183,9 +2183,9 @@ AG_action_cb (void *cls,
#endif
if (TALER_EC_NONE != error_code)
{
- AG_error ("Error: %s (%d)\n",
- TALER_ErrorCode_get_hint (error_code),
- error_code);
+ AG_error ("Error #%d: %s\n",
+ (int) error_code,
+ TALER_ErrorCode_get_hint (error_code));
if (in_action)
{
GNUNET_break (0);
@@ -2197,6 +2197,16 @@ AG_action_cb (void *cls,
json_decref (AG_redux_state);
AG_redux_state = json_incref (response);
}
+ if ( (TALER_EC_ANASTASIS_TRUTH_UNKNOWN == error_code) ||
+ (TALER_EC_ANASTASIS_TRUTH_RATE_LIMITED == error_code) )
+ {
+ /* special case: do not remain in previous (challenge selected)
+ state but rever to challenge selecting */
+ GNUNET_assert (0 ==
+ json_object_set_new (AG_redux_state,
+ "recovery_state",
+ json_string ("CHALLENGE_SELECTING")));
+ }
in_action = true;
if (GNUNET_OK ==
AG_dispatch (actions))
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis-gtk] branch master updated: add auto-abort case for challenge handling,
gnunet <=