[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis-gtk] branch master updated: fix challenge button clicki
|
From: |
gnunet |
|
Subject: |
[taler-anastasis-gtk] branch master updated: fix challenge button clicking |
|
Date: |
Sun, 14 Mar 2021 22:33:39 +0100 |
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 0b76322 fix challenge button clicking
0b76322 is described below
commit 0b7632293abfd979e8836f6e2f2e5aa7c084c239
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Sun Mar 14 22:33:36 2021 +0100
fix challenge button clicking
---
contrib/anastasis_gtk_challenge_code.glade | 65 ++++++++++++-------------
contrib/anastasis_gtk_challenge_question.glade | 67 +++++++++++++-------------
src/anastasis/anastasis-gtk_action.c | 17 ++++++-
3 files changed, 80 insertions(+), 69 deletions(-)
diff --git a/contrib/anastasis_gtk_challenge_code.glade
b/contrib/anastasis_gtk_challenge_code.glade
index 6c4981c..9aad67a 100644
--- a/contrib/anastasis_gtk_challenge_code.glade
+++ b/contrib/anastasis_gtk_challenge_code.glade
@@ -1,38 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="anastasis_gtk_c_code_dialog">
- <property name="can_focus">False</property>
- <property name="type_hint">dialog</property>
+ <property name="can-focus">False</property>
+ <property name="type-hint">dialog</property>
<signal name="response" handler="anastasis_gtk_c_code_dialog_response_cb"
swapped="no"/>
- <child type="titlebar">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Security token
challenge</property>
- </object>
- </child>
- <action-widgets>
- <action-widget
response="-6">anastasis_gtk_c_code_dialog_btn_cancel</action-widget>
- <action-widget
response="-5">anastasis_gtk_c_code_dialog_btn_ok</action-widget>
- </action-widgets>
<child internal-child="vbox">
<object class="GtkBox">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
<child>
<object class="GtkButton"
id="anastasis_gtk_c_code_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>
- <signal name="clicked"
handler="anastasis_gtk_b_question_dialog_btn_cancel_clicked_cb" swapped="no"/>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -45,8 +33,8 @@
<property name="label" translatable="yes">OK</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">False</property>
+ <property name="receives-default">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -64,12 +52,12 @@
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -80,11 +68,11 @@
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">A challenge code
has been send to:</property>
</object>
<packing>
@@ -97,7 +85,7 @@
<child>
<object class="GtkLabel" id="challenge_instructions_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">SET DYNAMICALLY
BY PROGRAM</property>
</object>
<packing>
@@ -117,7 +105,7 @@
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -135,11 +123,11 @@
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">Enter
code:</property>
</object>
<packing>
@@ -152,10 +140,10 @@
<child>
<object class="GtkEntry" id="anastasis_gtk_c_code_entry">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
- <property name="width_chars">60</property>
- <property
name="primary_icon_stock">gtk-dialog-authentication</property>
+ <property name="width-chars">60</property>
+ <property
name="primary-icon-stock">gtk-dialog-authentication</property>
<signal name="changed"
handler="anastasis_gtk_c_code_dialog_answer_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -179,5 +167,16 @@
<action-widget
response="-6">anastasis_gtk_c_code_dialog_btn_cancel</action-widget>
<action-widget
response="-5">anastasis_gtk_c_code_dialog_btn_ok</action-widget>
</action-widgets>
+ <child type="titlebar">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">Security token
challenge</property>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget
response="-6">anastasis_gtk_c_code_dialog_btn_cancel</action-widget>
+ <action-widget
response="-5">anastasis_gtk_c_code_dialog_btn_ok</action-widget>
+ </action-widgets>
</object>
</interface>
diff --git a/contrib/anastasis_gtk_challenge_question.glade
b/contrib/anastasis_gtk_challenge_question.glade
index d36e862..f10d0a3 100644
--- a/contrib/anastasis_gtk_challenge_question.glade
+++ b/contrib/anastasis_gtk_challenge_question.glade
@@ -1,38 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="anastasis_gtk_c_question_dialog">
- <property name="can_focus">False</property>
- <property name="type_hint">dialog</property>
+ <property name="can-focus">False</property>
+ <property name="type-hint">dialog</property>
<signal name="response"
handler="anastasis_gtk_c_question_dialog_response_cb" swapped="no"/>
- <child type="titlebar">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Solve secuity question
challenge</property>
- </object>
- </child>
- <action-widgets>
- <action-widget
response="-6">anastasis_gtk_b_question_dialog_btn_cancel</action-widget>
- <action-widget
response="-5">anastasis_gtk_c_question_dialog_btn_ok</action-widget>
- </action-widgets>
<child internal-child="vbox">
<object class="GtkBox">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
<child>
<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>
- <signal name="clicked"
handler="anastasis_gtk_b_question_dialog_btn_cancel_clicked_cb" swapped="no"/>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -45,8 +33,8 @@
<property name="label" translatable="yes">OK</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="can_focus">False</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">False</property>
+ <property name="receives-default">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -64,12 +52,12 @@
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -80,11 +68,11 @@
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">Security
question:</property>
</object>
<packing>
@@ -97,7 +85,7 @@
<child>
<object class="GtkLabel" id="security_question_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">SET DYNAMICALLY
BY PROGRAM</property>
</object>
<packing>
@@ -117,7 +105,7 @@
<child>
<object class="GtkSeparator">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -135,11 +123,11 @@
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes">Answer:</property>
</object>
<packing>
@@ -152,11 +140,11 @@
<child>
<object class="GtkEntry"
id="anastasis_gtk_c_question_dialog_answer_entry">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">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"/>
+ <property name="width-chars">60</property>
+ <property
name="primary-icon-stock">gtk-dialog-authentication</property>
+ <signal name="changed"
handler="anastasis_gtk_c_question_dialog_answer_entry_changed_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -179,5 +167,16 @@
<action-widget
response="-6">anastasis_gtk_b_question_dialog_btn_cancel</action-widget>
<action-widget
response="-5">anastasis_gtk_c_question_dialog_btn_ok</action-widget>
</action-widgets>
+ <child type="titlebar">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes">Solve secuity question
challenge</property>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget
response="-6">anastasis_gtk_b_question_dialog_btn_cancel</action-widget>
+ <action-widget
response="-5">anastasis_gtk_c_question_dialog_btn_ok</action-widget>
+ </action-widgets>
</object>
</interface>
diff --git a/src/anastasis/anastasis-gtk_action.c
b/src/anastasis/anastasis-gtk_action.c
index b950cf4..6e65f91 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -1621,9 +1621,22 @@ action_challenge_solving (void)
};
const char *type;
GtkDialog *diag;
- json_t *challenge = NULL; // FIXME...
+ const char *uuid;
+ const json_t *challenge;
- GNUNET_break (0);
+ uuid = json_string_value (json_object_get (redux_state,
+ "selected_challenge_uuid"));
+ if (NULL == uuid)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ challenge = find_challenge_by_uuid (uuid);
+ if (NULL == challenge)
+ {
+ GNUNET_break (0);
+ return;
+ }
type = json_string_value (json_object_get (challenge,
"type"));
if (NULL == type)
--
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: fix challenge button clicking,
gnunet <=