[taler-anastasis-gtk] 04/07: fix change continent

[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 f5a4ed7e014b1f1cd53e7a1ca8ab7f6ae99249e7
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Thu Oct 8 12:00:34 2020 +0200

    fix change continent
---
 contrib/anastasis_gtk_main_window.glade |  2 +-
 src/anastasis/anastasis-gtk.c           | 54 ++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/contrib/anastasis_gtk_main_window.glade 
b/contrib/anastasis_gtk_main_window.glade
index 00a2901..de704ac 100644
--- a/contrib/anastasis_gtk_main_window.glade
+++ b/contrib/anastasis_gtk_main_window.glade
@@ -1017,7 +1017,7 @@
       <row>
         <col id="0" translatable="yes">Germany</col>
         <col id="1" translatable="yes">de</col>
-        <col id="2" translatable="yes"/>
+        <col id="2" translatable="yes">EUR</col>
       </row>
     </data>
   </object>
diff --git a/src/anastasis/anastasis-gtk.c b/src/anastasis/anastasis-gtk.c
index 3fa9e27..9035c5a 100644
--- a/src/anastasis/anastasis-gtk.c
+++ b/src/anastasis/anastasis-gtk.c
@@ -225,30 +225,29 @@ anastasis_gtk_continent_activated (GtkTreeView *tree_view,
                                    GtkTreeViewColumn *column,
                                    gpointer user_data)
 {
-        GtkTreeIter iter;
-        GtkTreeModel *model= gtk_tree_view_get_model (tree_view);
-
-        if (gtk_tree_model_get_iter(model, &iter, path))
-        {
-            gchar *continent_name;
-            json_t *arguments = json_object ();
-
-            if (NULL == arguments)
-            {
-                GNUNET_break (0);
-            }
-            gtk_tree_model_get (model, &iter, 0, &continent_name, -1);
-            json_object_set (arguments, "continent", json_string 
(continent_name));
+    GtkTreeIter iter;
+    GtkTreeModel *model = gtk_tree_view_get_model (tree_view);
+    GtkListStore *country_liststore = GTK_LIST_STORE 
(GCG_get_main_window_object ("country_liststore"));
+    
+    gtk_list_store_clear (country_liststore);
+    gtk_widget_set_sensitive (GTK_WIDGET (GCG_get_main_window_object (
+                                    
"anastasis_gtk_main_window_forward_button")), false);
 
-            if (check_state (redux_state, "ContinentSelectionState"))
-                redux_state = ANASTASIS_backup_start (cfg);
-            ANASTASIS_redux_action (redux_state,
-                                    "select_continent",
-                                    arguments,
-                                    &action_cb,
-                                    NULL);
-            g_free(continent_name);
-        }
+    if (gtk_tree_model_get_iter(model, &iter, path))
+    {
+        gchar *continent_name;
+        json_t *arguments = json_object ();
+        GNUNET_assert (NULL != arguments);
+        gtk_tree_model_get (model, &iter, 0, &continent_name, -1);
+        json_object_set (arguments, "continent", json_string (continent_name));
+
+        ANASTASIS_redux_action (redux_state,
+                                "select_continent",
+                                arguments,
+                                &action_cb,
+                                NULL);
+        g_free(continent_name);
+    }
 }
 
 
@@ -295,6 +294,13 @@ anastasis_gtk_country_activated (GtkTreeView *tree_view,
                                         arguments,
                                         &action_cb,
                                         NULL);
+
+            if (check_state (redux_state, "UserAttributesCollectionState"))
+                ANASTASIS_redux_action (redux_state,
+                                        "select_country",
+                                        arguments,
+                                        &action_cb,
+                                        NULL);
                 
             g_free(country_name);
             g_free(country_code);
@@ -363,7 +369,7 @@ anastasis_gtk_main_window_forward_clicked (GObject *object,
                                            gpointer user_data)
 {
     //show identity frame, hide continent frame
-    if (check_state (redux_state, "ReduxCountrySelectedState") &&
+    if (check_state (redux_state, "UserAttributesCollectionState") &&
             gtk_widget_is_visible (GTK_WIDGET (GCG_get_main_window_object (
                                         "anastasis_gtk_continent_frame"))))
     {

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