gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-anastasis-gtk] branch master updated: fix rendering of expiration


From: gnunet
Subject: [taler-anastasis-gtk] branch master updated: fix rendering of expiration time for free services as discussed with Belen
Date: Mon, 26 Jul 2021 18:32:34 +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 ccb30c2  fix rendering of expiration time for free services as 
discussed with Belen
ccb30c2 is described below

commit ccb30c2be99b85fa6d86e002c7b71772657caded
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Mon Jul 26 18:32:32 2021 +0200

    fix rendering of expiration time for free services as discussed with Belen
---
 src/anastasis/anastasis-gtk_action.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/anastasis/anastasis-gtk_action.c 
b/src/anastasis/anastasis-gtk_action.c
index 0e605cf..0b0f194 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -1093,6 +1093,7 @@ action_secret_editing (void)
     GNUNET_JSON_spec_end ()
   };
   struct tm tv;
+  bool is_free = false;
 
   AG_hide_all_frames ();
   if (GNUNET_OK !=
@@ -1124,6 +1125,7 @@ action_secret_editing (void)
       update_label ("backup_fee_value_label",
                     _ (/* in the sense of gratis */
                       "free"));
+      is_free = true;
     }
     else
     {
@@ -1171,11 +1173,18 @@ action_secret_editing (void)
   {
     char estr[128];
 
-    GNUNET_assert (sizeof (estr) >
-                   strftime (estr,
-                             sizeof (estr),
-                             "%d %B",
-                             &tv));
+    if (is_free)
+      GNUNET_assert (sizeof (estr) >
+                    strftime (estr,
+                              sizeof (estr),
+                              "%d %B %Y",
+                              &tv));
+    else
+      GNUNET_assert (sizeof (estr) >
+                    strftime (estr,
+                              sizeof (estr),
+                              "%d %B",
+                              &tv));
     update_label ("expiration_date_without_year_label",
                   estr);
   }
@@ -1187,6 +1196,10 @@ action_secret_editing (void)
 
     sb = GTK_SPIN_BUTTON (GCG_get_main_window_object (
                             "expiration_year_spin_button"));
+    if (is_free)
+      gtk_widget_hide (GTK_WIDGET (sb));
+    else
+      gtk_widget_show (GTK_WIDGET (sb));
     this_year = GNUNET_TIME_get_current_year ();
     /* We allow at most 5 years into the future */
     gtk_spin_button_set_range (sb,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]