[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis-gtk] branch master updated: fix re-renames
|
From: |
gnunet |
|
Subject: |
[taler-anastasis-gtk] branch master updated: fix re-renames |
|
Date: |
Sun, 28 Mar 2021 23:39:13 +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 4e8961f fix re-renames
4e8961f is described below
commit 4e8961f35314617fd816e1e17f429e8c6bf7ae7f
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Mar 28 23:39:04 2021 +0200
fix re-renames
---
src/anastasis/anastasis-gtk.c | 2 +-
src/anastasis/anastasis-gtk.h | 4 +-
src/anastasis/anastasis-gtk_action.c | 233 ++++++++++++++++++---
src/anastasis/anastasis-gtk_attributes.c | 2 +-
src/anastasis/anastasis-gtk_backup.c | 2 +-
src/anastasis/anastasis-gtk_dispatch.c | 2 +-
src/anastasis/anastasis-gtk_dispatch.h | 2 +-
...astasis-gtk_handle-auth-delete-button-clicked.c | 2 +-
...astasis-gtk_handle-auth-edit-provider-clicked.c | 6 +-
.../anastasis-gtk_handle-challenge-code.c | 4 +-
.../anastasis-gtk_handle-challenge-question.c | 4 +-
.../anastasis-gtk_handle-continent-activated.c | 2 +-
.../anastasis-gtk_handle-continent-unselected.c | 2 +-
.../anastasis-gtk_handle-identity-changed.c | 2 +-
...anastasis-gtk_handle-main-window-back-clicked.c | 2 +-
...stasis-gtk_handle-main-window-forward-clicked.c | 10 +-
src/anastasis/anastasis-gtk_handle-method-email.c | 2 +-
src/anastasis/anastasis-gtk_handle-method-post.c | 2 +-
.../anastasis-gtk_handle-method-question.c | 2 +-
src/anastasis/anastasis-gtk_handle-method-sms.c | 2 +-
src/anastasis/anastasis-gtk_handle-method-video.c | 2 +-
.../anastasis-gtk_handle-policy-version-changed.c | 2 +-
.../anastasis-gtk_handle-secret-buttons.c | 6 +-
src/anastasis/anastasis-gtk_io.c | 6 +-
24 files changed, 235 insertions(+), 70 deletions(-)
diff --git a/src/anastasis/anastasis-gtk.c b/src/anastasis/anastasis-gtk.c
index 61ce06d..49e6cc3 100644
--- a/src/anastasis/anastasis-gtk.c
+++ b/src/anastasis/anastasis-gtk.c
@@ -63,7 +63,7 @@ struct ANASTASIS_ReduxAction *AG_ra;
/**
* Actual state.
*/
-json_t *AG_AG_redux_state;
+json_t *AG_redux_state;
/**
diff --git a/src/anastasis/anastasis-gtk.h b/src/anastasis/anastasis-gtk.h
index e6df970..a4672a8 100644
--- a/src/anastasis/anastasis-gtk.h
+++ b/src/anastasis/anastasis-gtk.h
@@ -49,7 +49,7 @@ extern struct GNUNET_CONTAINER_MultiHashMap
*AG_entry_attributes;
/**
* Actual state.
*/
-extern json_t *AG_AG_redux_state;
+extern json_t *AG_redux_state;
/**
* Handle to an ongoing action.
@@ -58,7 +58,7 @@ extern struct ANASTASIS_ReduxAction *AG_ra;
/**
- * Load #AG_AG_redux_state from @a filename.
+ * Load #AG_redux_state from @a filename.
*
* @param filename to load
*/
diff --git a/src/anastasis/anastasis-gtk_action.c
b/src/anastasis/anastasis-gtk_action.c
index f286683..bc5ca96 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -58,7 +58,7 @@ action_continent_selecting (void)
= GTK_LIST_STORE (
GCG_get_main_window_object ("continent_liststore"));
gtk_list_store_clear (continent_liststore);
- continents = json_object_get (AG_AG_redux_state,
+ continents = json_object_get (AG_redux_state,
"continents");
if (NULL != continents)
{
@@ -100,10 +100,10 @@ action_country_selecting (void)
const char *selected_country;
AG_hide_all_frames ();
- countries = json_object_get (AG_AG_redux_state,
+ countries = json_object_get (AG_redux_state,
"countries");
selected_country
- = json_string_value (json_object_get (AG_AG_redux_state,
+ = json_string_value (json_object_get (AG_redux_state,
"selected_country"));
country_liststore = GTK_LIST_STORE (
GCG_get_main_window_object ("country_liststore"));
@@ -339,7 +339,7 @@ action_user_attributes_collecting (void)
const json_t *id_attributes;
AG_hide_all_frames ();
- id_attributes = json_object_get (AG_AG_redux_state,
+ id_attributes = json_object_get (AG_redux_state,
"required_attributes");
GNUNET_assert (NULL != id_attributes);
AG_hide_children ("anastasis_gtk_identity_vbox");
@@ -462,7 +462,7 @@ action_user_attributes_collecting (void)
json_t *ia;
json_t *val;
- ia = json_object_get (AG_AG_redux_state,
+ ia = json_object_get (AG_redux_state,
"identity_attributes");
val = json_object_get (ia,
attr_name);
@@ -532,7 +532,7 @@ action_authentications_editing (void)
AG_hide_all_frames ();
AG_insensitive_children ("anastasis_gtk_add_auth_button_box");
- aps = json_object_get (AG_AG_redux_state,
+ aps = json_object_get (AG_redux_state,
"authentication_providers");
{
const json_t *ap;
@@ -599,7 +599,7 @@ action_authentications_editing (void)
ls = GTK_LIST_STORE (GCG_get_main_window_object (
"authentication_methods_liststore"));
gtk_list_store_clear (ls);
- ams = json_object_get (AG_AG_redux_state,
+ ams = json_object_get (AG_redux_state,
"authentication_methods");
json_array_foreach (ams,
index,
@@ -646,7 +646,7 @@ action_authentications_editing (void)
/**
* Lookup @a method_cost of authentication method @a type at @a provider in our
- * #AG_AG_redux_state.
+ * #AG_redux_state.
*
* @param provider URL of provider
* @param type authentication method to look for
@@ -666,7 +666,7 @@ lookup_recovery_cost (const char *provider,
memset (method_cost,
0,
sizeof (struct TALER_Amount));
- aps = json_object_get (AG_AG_redux_state,
+ aps = json_object_get (AG_redux_state,
"authentication_providers");
GNUNET_assert (NULL != aps);
ap = json_object_get (aps,
@@ -720,7 +720,7 @@ action_policies_reviewing (void)
AG_hide_all_frames ();
ts = GTK_TREE_STORE (GCG_get_main_window_object ("policy_review_treestore"));
gtk_tree_store_clear (ts);
- policies = json_object_get (AG_AG_redux_state,
+ policies = json_object_get (AG_redux_state,
"policies");
GNUNET_assert (NULL != policies);
json_array_foreach (policies, pindex, policy)
@@ -781,7 +781,7 @@ action_policies_reviewing (void)
GNUNET_break (0);
continue;
}
- jmethods = json_object_get (AG_AG_redux_state,
+ jmethods = json_object_get (AG_redux_state,
"authentication_methods");
jmethod = json_array_get (jmethods,
imethod);
@@ -875,7 +875,7 @@ action_secret_editing (void)
entry = GTK_ENTRY (GCG_get_main_window_object (
"anastasis_gtk_enter_secret_entry"));
if ( (GNUNET_OK ==
- GNUNET_JSON_parse (AG_AG_redux_state,
+ GNUNET_JSON_parse (AG_redux_state,
spec,
NULL, NULL)) &&
(0 < strlen (secret)) )
@@ -1047,7 +1047,7 @@ action_truths_paying (void)
ls = GTK_LIST_STORE (GCG_get_main_window_object (
"unpaid_qrcodes_liststore"));
gtk_list_store_clear (ls);
- pprs = json_object_get (AG_AG_redux_state,
+ pprs = json_object_get (AG_redux_state,
"payments");
json_array_foreach (pprs, index, pt)
{
@@ -1089,7 +1089,7 @@ action_truths_paying (void)
args = json_pack ("{s:o}",
"timeout",
GNUNET_JSON_from_time_rel (timeout));
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"pay",
args,
&AG_action_cb,
@@ -1116,7 +1116,7 @@ action_policies_paying (void)
ls = GTK_LIST_STORE (GCG_get_main_window_object (
"unpaid_qrcodes_liststore"));
gtk_list_store_clear (ls);
- pprs = json_object_get (AG_AG_redux_state,
+ pprs = json_object_get (AG_redux_state,
"policy_payment_requests");
json_array_foreach (pprs, index, ppr)
{
@@ -1168,7 +1168,7 @@ action_policies_paying (void)
args = json_pack ("{s:o}",
"timeout",
GNUNET_JSON_from_time_rel (timeout));
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"pay",
args,
&AG_action_cb,
@@ -1192,7 +1192,7 @@ action_backup_finished (void)
GtkListStore *ls;
AG_hide_all_frames ();
- arr = json_object_get (AG_AG_redux_state,
+ arr = json_object_get (AG_redux_state,
"success_details");
ls = GTK_LIST_STORE (GCG_get_main_window_object (
"backup_provider_liststore"));
@@ -1259,7 +1259,7 @@ challenge_button_clicked_cb (GtkButton *button,
GNUNET_assert (NULL != uuid);
GNUNET_assert (NULL != args);
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"select_challenge",
args,
&AG_action_cb,
@@ -1293,7 +1293,7 @@ find_challenge_by_uuid (const char *uuid)
size_t index;
json_t *c;
- rd = json_object_get (AG_AG_redux_state,
+ rd = json_object_get (AG_redux_state,
"recovery_document");
cs = json_object_get (rd,
"cs");
@@ -1337,7 +1337,7 @@ action_challenge_selecting (void)
bt = GTK_COMBO_BOX_TEXT (GCG_get_main_window_object (
"anastasis_gtk_provider_url_combo_box_text"));
gtk_combo_box_text_remove_all (bt);
- aps = json_object_get (AG_AG_redux_state,
+ aps = json_object_get (AG_redux_state,
"authentication_providers");
json_object_foreach (aps,
provider_url,
@@ -1348,7 +1348,7 @@ action_challenge_selecting (void)
provider_url);
}
}
- re = json_object_get (AG_AG_redux_state,
+ re = json_object_get (AG_redux_state,
"recovery_error");
if (NULL != re)
{
@@ -1400,7 +1400,7 @@ action_challenge_selecting (void)
}
return;
}
- ri = json_object_get (AG_AG_redux_state,
+ ri = json_object_get (AG_redux_state,
"recovery_information");
{
uint64_t version;
@@ -1433,7 +1433,7 @@ action_challenge_selecting (void)
gtk_entry_set_text (ge,
provider_url);
}
- rd = json_object_get (AG_AG_redux_state,
+ rd = json_object_get (AG_redux_state,
"recovery_document");
{
GtkTreeStore *ts;
@@ -1668,7 +1668,7 @@ action_challenge_paying (void)
ls = GTK_LIST_STORE (GCG_get_main_window_object (
"unpaid_qrcodes_liststore"));
gtk_list_store_clear (ls);
- pprs = json_object_get (AG_AG_redux_state,
+ pprs = json_object_get (AG_redux_state,
"challenge_feedback");
json_object_foreach (pprs, uuid, ppr)
{
@@ -1738,7 +1738,7 @@ action_challenge_paying (void)
GNUNET_JSON_from_time_rel (timeout),
"payment_secret",
ps);
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"pay",
args,
&AG_action_cb,
@@ -1758,6 +1758,157 @@ action_challenge_paying (void)
}
+/**
+ * Render challenge feedback for challenge @a uuid_str in a dialog of
+ * @a builder in the label under @a target_widget.
+ *
+ * @param builder a builder to get widgets from
+ * @param target_widget the widget to upate
+ * @param uuid_str the UUID to render feedback for
+ * @param details the details to get feedback from
+ */
+static void
+render_feedback (GtkBuilder *builder,
+ const char *target_widget,
+ const char *uuid_str,
+ const json_t *details)
+{
+ json_t *cf;
+ json_t *cs;
+ const char *state;
+ const char *instructions = NULL;
+ uint32_t http_status;
+ struct GNUNET_JSON_Specification spec[] = {
+ GNUNET_JSON_spec_string ("state",
+ &state),
+ GNUNET_JSON_spec_uint32 ("http_status",
+ &http_status),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("instructions",
+ &instructions)),
+ GNUNET_JSON_spec_end ()
+ };
+ GtkLabel *elabel;
+ char *msg;
+
+ cf = json_object_get (AG_redux_state,
+ "challenge_feedback");
+ cs = json_object_get (cf,
+ uuid_str);
+ if (NULL == cs)
+ return;
+
+ elabel = GTK_LABEL (gtk_builder_get_object (builder,
+
"anastasis_gtk_c_code_error_label"));
+ if (GNUNET_OK !=
+ GNUNET_JSON_parse (cs,
+ spec,
+ NULL, NULL))
+ {
+ GNUNET_break (0);
+ gtk_label_set_text (elabel,
+ _ ("INTERNAL ERROR: could not parse state"));
+ gtk_widget_show (GTK_WIDGET (elabel));
+ }
+ else
+ {
+ if ( (0 == strcmp (state,
+ "instructions")) &&
+ (NULL != instructions) )
+ {
+ json_t *jdetail;
+
+ jdetail = json_loads (instructions,
+ 0,
+ NULL);
+ if (NULL == jdetail)
+ {
+ GNUNET_asprintf (&msg,
+ _ ("Hint (#%u): %s"),
+ (unsigned int) http_status,
+ instructions);
+ }
+ else
+ {
+ uint32_t code;
+ const char *hint = NULL;
+ const char *detail = NULL;
+ struct GNUNET_JSON_Specification ispec[] = {
+ GNUNET_JSON_spec_uint32 ("code",
+ &code),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("hint",
+ &hint)),
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_string ("detail",
+ &detail)),
+ GNUNET_JSON_spec_end ()
+ };
+
+ if (GNUNET_OK !=
+ GNUNET_JSON_parse (jdetail,
+ ispec,
+ NULL, NULL))
+ {
+ GNUNET_break (0);
+ msg = GNUNET_strdup (
+ _ ("ERROR: failed to parse server JSON instructions"));
+ AG_show ("anastasis_gtk_c_code_error_label");
+ }
+ else
+ {
+ const char *ihint;
+
+ ihint = TALER_ErrorCode_get_hint (code);
+ if ( (NULL != hint) &&
+ ( (NULL == ihint) ||
+ ('<' == ihint[0])) )
+ ihint = hint; /* use server hint */
+ if (NULL == detail)
+ {
+ if (NULL == ihint)
+ GNUNET_asprintf (&msg,
+ "Error #%u",
+ (unsigned int) code);
+ else
+ GNUNET_asprintf (&msg,
+ "Error #%u: %s",
+ (unsigned int) code,
+ ihint);
+ }
+ else
+ {
+ if (NULL == ihint)
+ GNUNET_asprintf (&msg,
+ "Error #%u (%s)",
+ (unsigned int) code,
+ detail);
+ else
+ GNUNET_asprintf (&msg,
+ "Error #%u: %s (%s)",
+ (unsigned int) code,
+ ihint,
+ detail);
+ }
+ }
+ json_decref (jdetail);
+ }
+ }
+ else
+ {
+ GNUNET_asprintf (&msg,
+ "ERROR: state `%s` with HTTP Status %u",
+ state,
+ (unsigned int) http_status);
+ }
+ gtk_label_set_text (elabel,
+ msg);
+ GNUNET_free (msg);
+ gtk_widget_show (GTK_WIDGET (elabel));
+ }
+}
+
+
/**
* Open dialog to allow user to answer security question.
*
@@ -1788,6 +1939,16 @@ diag_question (const json_t *details)
"instructions"));
gtk_label_set_text (label,
instructions);
+ {
+ const char *uuid_str;
+
+ uuid_str = json_string_value (json_object_get (details,
+ "uuid"));
+ render_feedback (builder,
+ "anastasis_gtk_c_question_error_label",
+ uuid_str,
+ details);
+ }
return ad;
}
@@ -1825,6 +1986,10 @@ diag_code (const json_t *details)
"uuid"));
gtk_label_set_text (clabel,
uuid_str);
+ render_feedback (builder,
+ "anastasis_gtk_c_code_error_label",
+ uuid_str,
+ details);
}
{
GtkDialog *ad;
@@ -1860,7 +2025,7 @@ action_challenge_solving (void)
const char *uuid;
const json_t *challenge;
- uuid = json_string_value (json_object_get (AG_AG_redux_state,
+ uuid = json_string_value (json_object_get (AG_redux_state,
"selected_challenge_uuid"));
if (NULL == uuid)
{
@@ -1932,7 +2097,7 @@ action_recovery_finished (void)
l = GTK_LABEL (GCG_get_main_window_object (
"anastasis_gtk_secret_value_label"));
GNUNET_assert (GNUNET_OK ==
- GNUNET_JSON_parse (AG_AG_redux_state,
+ GNUNET_JSON_parse (AG_redux_state,
spec,
NULL, NULL));
gtk_label_set_text (l,
@@ -2029,8 +2194,8 @@ AG_action_cb (void *cls,
}
else
{
- json_decref (AG_AG_redux_state);
- AG_AG_redux_state = json_incref (response);
+ json_decref (AG_redux_state);
+ AG_redux_state = json_incref (response);
}
in_action = true;
if (GNUNET_OK ==
@@ -2041,15 +2206,15 @@ AG_action_cb (void *cls,
}
in_action = false;
AG_error ("Unhandled state `%s/%s'",
- json_string_value (json_object_get (AG_AG_redux_state,
+ json_string_value (json_object_get (AG_redux_state,
"backup_state")),
- json_string_value (json_object_get (AG_AG_redux_state,
+ json_string_value (json_object_get (AG_redux_state,
"recovery_state")));
- json_dumpf (AG_AG_redux_state,
+ json_dumpf (AG_redux_state,
stderr,
JSON_INDENT (2));
- json_decref (AG_AG_redux_state);
- AG_AG_redux_state = NULL;
+ json_decref (AG_redux_state);
+ AG_redux_state = NULL;
AG_hide_all_frames ();
AG_show ("anastasis_gtk_start_frame");
}
diff --git a/src/anastasis/anastasis-gtk_attributes.c
b/src/anastasis/anastasis-gtk_attributes.c
index c41a923..a3953b1 100644
--- a/src/anastasis/anastasis-gtk_attributes.c
+++ b/src/anastasis/anastasis-gtk_attributes.c
@@ -87,7 +87,7 @@ AG_collect_attributes (bool partial)
size_t index;
json_t *id_attr;
- id_attributes = json_object_get (AG_AG_redux_state,
+ id_attributes = json_object_get (AG_redux_state,
"required_attributes");
GNUNET_assert (NULL != id_attributes);
result = json_object ();
diff --git a/src/anastasis/anastasis-gtk_backup.c
b/src/anastasis/anastasis-gtk_backup.c
index b1f2949..7296387 100644
--- a/src/anastasis/anastasis-gtk_backup.c
+++ b/src/anastasis/anastasis-gtk_backup.c
@@ -71,7 +71,7 @@ anastasis_gtk_b_video_dialog_btn_ok_clicked_cb (GObject
*object,
json_object_set_new (auth_method, "data", method_data);
json_object_set_new (arguments, "authentication_method", method_data);
- ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ ra = ANASTASIS_redux_action (AG_redux_state,
"add_authentication",
arguments,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_dispatch.c
b/src/anastasis/anastasis-gtk_dispatch.c
index a5975e2..67ff210 100644
--- a/src/anastasis/anastasis-gtk_dispatch.c
+++ b/src/anastasis/anastasis-gtk_dispatch.c
@@ -32,7 +32,7 @@ AG_dispatch (const struct DispatchItem *dt)
{
for (unsigned int i = 0; NULL != dt[i].state; i++)
{
- if (! AG_check_state (AG_AG_redux_state,
+ if (! AG_check_state (AG_redux_state,
dt[i].state))
continue;
dt[i].action ();
diff --git a/src/anastasis/anastasis-gtk_dispatch.h
b/src/anastasis/anastasis-gtk_dispatch.h
index effa1f2..06d2fb8 100644
--- a/src/anastasis/anastasis-gtk_dispatch.h
+++ b/src/anastasis/anastasis-gtk_dispatch.h
@@ -45,7 +45,7 @@ struct DispatchItem
/**
* Run actions as per the given dispatch table based on the
- * current #AG_AG_redux_state.
+ * current #AG_redux_state.
*
* @param dt dispatching table
* @return #GNUNET_OK if an action was run from @a dt
diff --git a/src/anastasis/anastasis-gtk_handle-auth-delete-button-clicked.c
b/src/anastasis/anastasis-gtk_handle-auth-delete-button-clicked.c
index a10cd49..cb23883 100644
--- a/src/anastasis/anastasis-gtk_handle-auth-delete-button-clicked.c
+++ b/src/anastasis/anastasis-gtk_handle-auth-delete-button-clicked.c
@@ -63,7 +63,7 @@ anastasis_gtk_authentication_method_delete_button_clicked_cb
(GObject *object,
args = json_pack ("{s:I}",
"auth_method_index",
index);
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"delete_authentication",
args,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c
b/src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c
index 80d2356..1c6edad 100644
--- a/src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c
+++ b/src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c
@@ -109,7 +109,7 @@ edit_provider_dialog_response_cb (GtkDialog *dialog,
GNUNET_break (0);
return;
}
- providers = json_object_get (AG_AG_redux_state,
+ providers = json_object_get (AG_redux_state,
"authentication_providers");
urls = json_array ();
if (gtk_tree_model_get_iter_first (tm,
@@ -141,7 +141,7 @@ edit_provider_dialog_response_cb (GtkDialog *dialog,
"urls",
urls);
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"add_provider",
args,
&AG_action_cb,
@@ -175,7 +175,7 @@ anastasis_gtk_edit_provider_list_clicked_cb (GtkButton
*object,
}
ls = GTK_LIST_STORE (gtk_builder_get_object (builder,
"provider_liststore"));
- providers = json_object_get (AG_AG_redux_state,
+ providers = json_object_get (AG_redux_state,
"authentication_providers");
{
const char *url;
diff --git a/src/anastasis/anastasis-gtk_handle-challenge-code.c
b/src/anastasis/anastasis-gtk_handle-challenge-code.c
index 5bf8dcb..046e29e 100644
--- a/src/anastasis/anastasis-gtk_handle-challenge-code.c
+++ b/src/anastasis/anastasis-gtk_handle-challenge-code.c
@@ -55,7 +55,7 @@ anastasis_gtk_c_code_dialog_response_cb (GtkDialog *dialog,
gtk_widget_destroy (GTK_WIDGET (dialog));
g_object_unref (G_OBJECT (builder));
GNUNET_assert (NULL == AG_ra);
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"back",
NULL,
&AG_action_cb,
@@ -82,7 +82,7 @@ anastasis_gtk_c_code_dialog_response_cb (GtkDialog *dialog,
gtk_widget_destroy (GTK_WIDGET (dialog));
g_object_unref (G_OBJECT (builder));
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"solve_challenge",
args,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-challenge-question.c
b/src/anastasis/anastasis-gtk_handle-challenge-question.c
index 8ed3c39..a947745 100644
--- a/src/anastasis/anastasis-gtk_handle-challenge-question.c
+++ b/src/anastasis/anastasis-gtk_handle-challenge-question.c
@@ -53,7 +53,7 @@ anastasis_gtk_c_question_dialog_response_cb (GtkDialog
*dialog,
gtk_widget_destroy (GTK_WIDGET (dialog));
g_object_unref (G_OBJECT (builder));
GNUNET_assert (NULL == AG_ra);
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"back",
NULL,
&AG_action_cb,
@@ -70,7 +70,7 @@ anastasis_gtk_c_question_dialog_response_cb (GtkDialog
*dialog,
g_object_unref (G_OBJECT (builder));
AG_freeze ();
GNUNET_assert (NULL == AG_ra);
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"solve_challenge",
args,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-continent-activated.c
b/src/anastasis/anastasis-gtk_handle-continent-activated.c
index 43df116..b058454 100644
--- a/src/anastasis/anastasis-gtk_handle-continent-activated.c
+++ b/src/anastasis/anastasis-gtk_handle-continent-activated.c
@@ -66,7 +66,7 @@ anastasis_gtk_continent_activated (GtkTreeView *tree_view,
GNUNET_assert (NULL != arguments);
g_free (continent_name);
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"select_continent",
arguments,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-continent-unselected.c
b/src/anastasis/anastasis-gtk_handle-continent-unselected.c
index 9e4665b..c040e11 100644
--- a/src/anastasis/anastasis-gtk_handle-continent-unselected.c
+++ b/src/anastasis/anastasis-gtk_handle-continent-unselected.c
@@ -47,7 +47,7 @@ anastasis_gtk_continent_unselected (GtkTreeSelection
*selection,
NULL))
return;
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"unselect_continent",
NULL,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-identity-changed.c
b/src/anastasis/anastasis-gtk_handle-identity-changed.c
index 4fcbf56..ea9c8b2 100644
--- a/src/anastasis/anastasis-gtk_handle-identity-changed.c
+++ b/src/anastasis/anastasis-gtk_handle-identity-changed.c
@@ -67,7 +67,7 @@ check_attributes_fullfilled (void)
if (NULL == args)
return false;
result = false;
- ta = ANASTASIS_redux_action (AG_AG_redux_state,
+ ta = ANASTASIS_redux_action (AG_redux_state,
"enter_user_attributes",
args,
&test_ok_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-main-window-back-clicked.c
b/src/anastasis/anastasis-gtk_handle-main-window-back-clicked.c
index 1742f2d..a9e028d 100644
--- a/src/anastasis/anastasis-gtk_handle-main-window-back-clicked.c
+++ b/src/anastasis/anastasis-gtk_handle-main-window-back-clicked.c
@@ -48,7 +48,7 @@ anastasis_gtk_main_window_back_clicked (GObject *object,
AG_ra = NULL;
}
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"back",
NULL,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c
b/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c
index 9367f66..db647b9 100644
--- a/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c
+++ b/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c
@@ -69,7 +69,7 @@ AG_forward_country_selecting (void)
g_free (country_code);
g_free (country_currency);
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"select_country",
arguments,
&AG_action_cb,
@@ -86,7 +86,7 @@ AG_forward_user_attributes_collecting (void)
AG_freeze ();
args = AG_collect_attributes (false);
GNUNET_assert (NULL != args);
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"enter_user_attributes",
args,
&AG_action_cb,
@@ -99,7 +99,7 @@ static void
forward_authentications_editing (void)
{
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"next",
NULL,
&AG_action_cb,
@@ -111,7 +111,7 @@ static void
forward_policies_reviewing (void)
{
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"next",
NULL,
&AG_action_cb,
@@ -134,7 +134,7 @@ forward_secret_editing (void)
GNUNET_JSON_from_data (str,
strlen (str)));
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"enter_secret",
arguments,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-method-email.c
b/src/anastasis/anastasis-gtk_handle-method-email.c
index 6a6b3bd..36e4d4d 100644
--- a/src/anastasis/anastasis-gtk_handle-method-email.c
+++ b/src/anastasis/anastasis-gtk_handle-method-email.c
@@ -195,7 +195,7 @@ anastasis_gtk_b_email_dialog_response_cb (GtkDialog *dialog,
gtk_widget_destroy (GTK_WIDGET (dialog));
g_object_unref (G_OBJECT (builder));
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"add_authentication",
args,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-method-post.c
b/src/anastasis/anastasis-gtk_handle-method-post.c
index 64fbfaf..fdf766c 100644
--- a/src/anastasis/anastasis-gtk_handle-method-post.c
+++ b/src/anastasis/anastasis-gtk_handle-method-post.c
@@ -108,7 +108,7 @@ anastasis_gtk_b_post_dialog_response_cb (GtkDialog *dialog,
gtk_widget_destroy (GTK_WIDGET (dialog));
g_object_unref (G_OBJECT (builder));
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"add_authentication",
args,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-method-question.c
b/src/anastasis/anastasis-gtk_handle-method-question.c
index c7a13cd..ea327aa 100644
--- a/src/anastasis/anastasis-gtk_handle-method-question.c
+++ b/src/anastasis/anastasis-gtk_handle-method-question.c
@@ -74,7 +74,7 @@ anastasis_gtk_b_question_dialog_response_cb (GtkDialog
*dialog,
gtk_widget_destroy (GTK_WIDGET (dialog));
g_object_unref (G_OBJECT (builder));
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"add_authentication",
args,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-method-sms.c
b/src/anastasis/anastasis-gtk_handle-method-sms.c
index c848746..026a5fc 100644
--- a/src/anastasis/anastasis-gtk_handle-method-sms.c
+++ b/src/anastasis/anastasis-gtk_handle-method-sms.c
@@ -175,7 +175,7 @@ anastasis_gtk_b_sms_dialog_response_cb (GtkDialog *dialog,
gtk_widget_destroy (GTK_WIDGET (dialog));
g_object_unref (G_OBJECT (builder));
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"add_authentication",
args,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-method-video.c
b/src/anastasis/anastasis-gtk_handle-method-video.c
index 80b632e..64841b8 100644
--- a/src/anastasis/anastasis-gtk_handle-method-video.c
+++ b/src/anastasis/anastasis-gtk_handle-method-video.c
@@ -74,7 +74,7 @@ anastasis_gtk_b_question_dialog_response_cb (GtkDialog
*dialog,
gtk_widget_destroy (GTK_WIDGET (dialog));
g_object_unref (G_OBJECT (builder));
AG_freeze ();
- ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ ra = ANASTASIS_redux_action (AG_redux_state,
"add_authentication",
args,
&AG_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-policy-version-changed.c
b/src/anastasis/anastasis-gtk_handle-policy-version-changed.c
index d4fec7c..722afd0 100644
--- a/src/anastasis/anastasis-gtk_handle-policy-version-changed.c
+++ b/src/anastasis/anastasis-gtk_handle-policy-version-changed.c
@@ -125,7 +125,7 @@ update_policy (void)
"provider_url",
provider_url);
GNUNET_assert (NULL != args);
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"change_version",
args,
&change_action_cb,
diff --git a/src/anastasis/anastasis-gtk_handle-secret-buttons.c
b/src/anastasis/anastasis-gtk_handle-secret-buttons.c
index 6b67d2c..226688c 100644
--- a/src/anastasis/anastasis-gtk_handle-secret-buttons.c
+++ b/src/anastasis/anastasis-gtk_handle-secret-buttons.c
@@ -121,7 +121,7 @@ open_secret_dialog_response_cb (GtkDialog *dialog,
data_size));
GNUNET_free (data);
AG_freeze ();
- AG_ra = ANASTASIS_redux_action (AG_AG_redux_state,
+ AG_ra = ANASTASIS_redux_action (AG_redux_state,
"enter_secret",
arguments,
&AG_action_cb,
@@ -200,7 +200,7 @@ save_secret_dialog_response_cb (GtkDialog *dialog,
g_object_unref (G_OBJECT (builder));
GNUNET_assert (GNUNET_OK ==
- GNUNET_JSON_parse (AG_AG_redux_state,
+ GNUNET_JSON_parse (AG_redux_state,
spec,
NULL, NULL));
{
@@ -287,7 +287,7 @@ anastasis_gtk_secret_copy_button_clicked_cb (GtkButton
*button,
GtkClipboard *cb;
GNUNET_assert (GNUNET_OK ==
- GNUNET_JSON_parse (AG_AG_redux_state,
+ GNUNET_JSON_parse (AG_redux_state,
spec,
NULL, NULL));
cb = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
diff --git a/src/anastasis/anastasis-gtk_io.c b/src/anastasis/anastasis-gtk_io.c
index 292e1da..5e23f94 100644
--- a/src/anastasis/anastasis-gtk_io.c
+++ b/src/anastasis/anastasis-gtk_io.c
@@ -108,7 +108,7 @@ save_user_attributes_collecting (void)
return;
}
GNUNET_break (0 ==
- json_object_set (AG_AG_redux_state,
+ json_object_set (AG_redux_state,
"identity_attributes",
json_object_get (ia,
"identity_attributes")));
@@ -129,7 +129,7 @@ save_secret_editing (void)
"anastasis_gtk_enter_secret_entry"));
str = gtk_entry_get_text (entry);
GNUNET_assert (0 ==
- json_object_set_new (AG_AG_redux_state,
+ json_object_set_new (AG_redux_state,
"core_secret",
GNUNET_JSON_from_data (str,
strlen (str))));
@@ -188,7 +188,7 @@ save_directory_dialog_response_cb (GtkDialog *dialog,
}
}
if (0 !=
- json_dump_file (AG_AG_redux_state,
+ json_dump_file (AG_redux_state,
filename,
JSON_COMPACT))
{
--
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 re-renames,
gnunet <=