[taler-anastasis-gtk] 04/05: worked on identity attributes

[gnunet]

This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a commit to branch master
in repository anastasis-gtk.

commit 1b1e36f5ef001920cd14e280e1e8e58afc9bd1bb
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Thu Sep 17 13:59:08 2020 +0200

    worked on identity attributes
---
 contrib/anastasis_gtk_main_window.glade |  1 -
 src/anastasis/anastasis-gtk_helper.c    | 33 ++++++++++++++++++++++-----------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/contrib/anastasis_gtk_main_window.glade 
b/contrib/anastasis_gtk_main_window.glade
index e9ec61d..1106192 100644
--- a/contrib/anastasis_gtk_main_window.glade
+++ b/contrib/anastasis_gtk_main_window.glade
@@ -293,7 +293,6 @@
                                     <property 
name="orientation">vertical</property>
                                     <child>
                                       <object class="GtkBox" 
id="anastasis_gtk_ia_full_name">
-                                        <property 
name="name">anastasis_gtk_id_attr_full_name</property>
                                         <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkLabel" 
id="anastasis_gtk_ia_full_name_label">
diff --git a/src/anastasis/anastasis-gtk_helper.c 
b/src/anastasis/anastasis-gtk_helper.c
index a79745a..f583972 100644
--- a/src/anastasis/anastasis-gtk_helper.c
+++ b/src/anastasis/anastasis-gtk_helper.c
@@ -563,38 +563,49 @@ anastasis_gtk_main_window_forward_clicked (GObject 
*object,
                                                                 
"anastasis_gtk_identity_vbox")));
         for (iter = children; iter != NULL; iter = g_list_next (iter))
         {
+            const char *entry_widget;
+            const char *cal_widget;
+            const char *widget = gtk_buildable_get_name (iter->data);
             json_t *id_attr = json_object ();
-            const char *widget = gtk_widget_get_name (GTK_WIDGET (iter->data));
 
-            if (strstr (widget, "_entry"))
+            GNUNET_asprintf (&entry_widget,
+                             "%s_entry",
+                             widget);
+            GNUNET_asprintf (&cal_widget,
+                             "%s_cal",
+                             widget);
+
+            if (GCG_get_main_window_object (entry_widget))
             {
-                const char *value = gtk_entry_get_text (GTK_ENTRY 
(iter->data));
+                const char *value = gtk_entry_get_text (GTK_ENTRY 
(GCG_get_main_window_object (entry_widget)));
                 json_object_set_new (id_attr, "type", json_string ("string"));
                 json_object_set_new (id_attr, "value", json_string (value));
+                json_object_set_new (id_attr, "widget", json_string 
(entry_widget));
             }
-            if (strstr (widget, "_cal"))
+            if (GCG_get_main_window_object (cal_widget))
             {
                 guint day;
                 guint month;
                 guint year;
 
                 json_object_set_new (id_attr, "type", json_string ("date"));
-                gtk_calendar_get_date (GTK_CALENDAR (iter->data),
+                gtk_calendar_get_date (GTK_CALENDAR 
(GCG_get_main_window_object (cal_widget)),
                                        &year,
                                        &month,
                                        &day);
-                json_object_set_new (id_attr, "year", json_strin (year));
-                json_object_set_new (id_attr, "month", json_strin (month));
-                json_object_set_new (id_attr, "day", json_strin (day));
+                json_object_set_new (id_attr, "year", json_integer (year));
+                json_object_set_new (id_attr, "month", json_integer (month));
+                json_object_set_new (id_attr, "day", json_integer (day));
+                json_object_set_new (id_attr, "widget", json_string 
(cal_widget));
             }
-
-            json_object_set_new (id_attr, "widget", json_string (widget));
             json_array_append_new (attributes, id_attr);
+            GNUNET_free (entry_widget);
+            GNUNET_free (cal_widget);
         }
         json_object_set_new (arguments, "identity", attributes);
 
         ANASTASIS_backup_action (redux_state,
-                                 "selection_country",
+                                 "entering_user_attributes",
                                  arguments,
                                  &action_cb,
                                  NULL);

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