aboutsummaryrefslogtreecommitdiff
path: root/src/anastasis/anastasis-gtk_action.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/anastasis/anastasis-gtk_action.c')
-rw-r--r--src/anastasis/anastasis-gtk_action.c66
1 files changed, 33 insertions, 33 deletions
diff --git a/src/anastasis/anastasis-gtk_action.c b/src/anastasis/anastasis-gtk_action.c
index f0c28c3..0e929f9 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -844,7 +844,7 @@ lookup_recovery_cost (const char *provider,
const char *mtype;
struct GNUNET_JSON_Specification spec[] = {
TALER_JSON_spec_amount_any ("usage_fee",
- &fee),
+ &fee),
GNUNET_JSON_spec_string ("type",
&mtype),
GNUNET_JSON_spec_end ()
@@ -1137,7 +1137,7 @@ action_secret_editing (void)
{
struct GNUNET_JSON_Specification spec[] = {
TALER_JSON_spec_amount_any ("fee",
- &a),
+ &a),
GNUNET_JSON_spec_end ()
};
char *tmp;
@@ -1174,16 +1174,16 @@ action_secret_editing (void)
if (is_free)
GNUNET_assert (sizeof (estr) >
- strftime (estr,
- sizeof (estr),
- "%d %B %Y",
- &tv));
+ strftime (estr,
+ sizeof (estr),
+ "%d %B %Y",
+ &tv));
else
GNUNET_assert (sizeof (estr) >
- strftime (estr,
- sizeof (estr),
- "%d %B",
- &tv));
+ strftime (estr,
+ sizeof (estr),
+ "%d %B",
+ &tv));
update_label ("expiration_date_without_year_label",
estr);
}
@@ -1516,9 +1516,9 @@ action_truths_paying (void)
timeout = GNUNET_TIME_UNIT_MINUTES;
GNUNET_assert (NULL == AG_ra);
- args = json_pack ("{s:o}",
- "timeout",
- GNUNET_JSON_from_time_rel (timeout));
+ args = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_time_rel ("timeout",
+ timeout));
AG_ra = ANASTASIS_redux_action (AG_redux_state,
"pay",
args,
@@ -1599,9 +1599,9 @@ action_policies_paying (void)
timeout = GNUNET_TIME_UNIT_MINUTES;
GNUNET_assert (NULL == AG_ra);
- args = json_pack ("{s:o}",
- "timeout",
- GNUNET_JSON_from_time_rel (timeout));
+ args = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_time_rel ("timeout",
+ timeout));
AG_ra = ANASTASIS_redux_action (AG_redux_state,
"pay",
args,
@@ -1685,7 +1685,7 @@ action_backup_finished (void)
/* be more conservative in what we show */
mexp = GNUNET_TIME_absolute_subtract (mexp,
- GNUNET_TIME_UNIT_DAYS);
+ GNUNET_TIME_UNIT_DAYS);
t = mexp.abs_value_us / GNUNET_TIME_UNIT_SECONDS.rel_value_us;
GNUNET_assert (NULL !=
localtime_r (&t,
@@ -1696,7 +1696,7 @@ action_backup_finished (void)
"%d %B %Y",
&tv));
update_label ("backup_expiration_date_label",
- GNUNET_STRINGS_absolute_time_to_string (mexp));
+ GNUNET_STRINGS_absolute_time_to_string (mexp));
}
AG_hide ("anastasis_gtk_progress_vbox");
AG_hide ("anastasis_gtk_backup_progress_scrolled_window");
@@ -2282,7 +2282,7 @@ action_challenge_selecting (void)
AG_CSM_NOT_SOLVED, true,
AG_CSM_TYPE, type,
AG_CSM_INSTRUCTIONS, instructions,
- AG_CSM_PROVIDER_URL, provider,
+ AG_CSM_PROVIDER_URL, provider,
-1);
}
}
@@ -2328,7 +2328,7 @@ action_challenge_selecting (void)
const char *type;
const char *provider;
const char *instructions;
- bool solved = false;
+ bool solved = false;
struct GNUNET_JSON_Specification cspec[] = {
GNUNET_JSON_spec_string ("type",
&type),
@@ -2336,9 +2336,9 @@ action_challenge_selecting (void)
&provider),
GNUNET_JSON_spec_string ("instructions",
&instructions),
- GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_mark_optional (
GNUNET_JSON_spec_bool ("solved",
- &solved)),
+ &solved)),
GNUNET_JSON_spec_end ()
};
struct TALER_Amount recovery_cost;
@@ -2382,8 +2382,8 @@ action_challenge_selecting (void)
TALER_amount2s (&recovery_cost),
AG_PRMC_PROVIDER_URL,
provider,
- AG_PRMC_WAS_SOLVED,
- solved,
+ AG_PRMC_WAS_SOLVED,
+ solved,
-1);
if (NULL == summary)
{
@@ -2511,11 +2511,11 @@ action_challenge_paying (void)
timeout = GNUNET_TIME_UNIT_MINUTES;
GNUNET_assert (NULL == AG_ra);
- args = json_pack ("{s:o, s:s}",
- "timeout",
- GNUNET_JSON_from_time_rel (timeout),
- "payment_secret",
- ps);
+ args = GNUNET_JSON_PACK (
+ GNUNET_JSON_pack_time_rel ("timeout",
+ timeout),
+ GNUNET_JSON_pack_string ("payment_secret",
+ ps));
AG_ra = ANASTASIS_redux_action (AG_redux_state,
"pay",
args,
@@ -2915,8 +2915,8 @@ action_recovery_finished (void)
AG_hide_all_frames ();
name = json_string_value (json_object_get (json_object_get (AG_redux_state,
- "recovery_information"),
- "secret_name"));
+ "recovery_information"),
+ "secret_name"));
cs = json_object_get (AG_redux_state,
"core_secret");
@@ -2931,10 +2931,10 @@ action_recovery_finished (void)
if ( (NULL != name) &&
(0 != strlen (name)) )
update_label ("recovery_secret_name_value_label",
- name);
+ name);
else
update_label ("recovery_secret_name_value_label",
- _("You did not name this secret"));
+ _ ("You did not name this secret"));
if ( (0 == strncasecmp (mime,
"text/",
strlen ("text/"))) ||