[taler-anastasis-gtk] 03/07: fix

[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 606f7c5b867fd37e0915fe21e28e988ddd9488d0
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Wed Oct 7 20:30:37 2020 +0200

    fix
---
 src/anastasis/anastasis-gtk.c        | 24 ++++--------------------
 src/anastasis/anastasis-gtk_backup.c |  2 +-
 src/anastasis/anastasis-gtk_helper.c | 20 +++++++++++---------
 3 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/src/anastasis/anastasis-gtk.c b/src/anastasis/anastasis-gtk.c
index 8808e6b..3fa9e27 100644
--- a/src/anastasis/anastasis-gtk.c
+++ b/src/anastasis/anastasis-gtk.c
@@ -243,10 +243,10 @@ anastasis_gtk_continent_activated (GtkTreeView *tree_view,
             if (check_state (redux_state, "ContinentSelectionState"))
                 redux_state = ANASTASIS_backup_start (cfg);
             ANASTASIS_redux_action (redux_state,
-                                     "select_continent",
-                                     arguments,
-                                     &action_cb,
-                                     NULL);
+                                    "select_continent",
+                                    arguments,
+                                    &action_cb,
+                                    NULL);
             g_free(continent_name);
         }
 }
@@ -295,22 +295,6 @@ anastasis_gtk_country_activated (GtkTreeView *tree_view,
                                         arguments,
                                         &action_cb,
                                         NULL);
-
-            else
-                if (! (0 == strcmp (country_name, json_string_value (
-                    json_object_get (redux_state, "selected_country")))))
-                {
-                    ANASTASIS_redux_action (redux_state,
-                                             "unselect_country",
-                                             arguments,
-                                             &action_cb,
-                                             NULL);
-                    ANASTASIS_redux_action (redux_state,
-                                             "select_country",
-                                             arguments,
-                                             &action_cb,
-                                             NULL);
-                }
                 
             g_free(country_name);
             g_free(country_code);
diff --git a/src/anastasis/anastasis-gtk_backup.c 
b/src/anastasis/anastasis-gtk_backup.c
index 952f62f..62dd616 100644
--- a/src/anastasis/anastasis-gtk_backup.c
+++ b/src/anastasis/anastasis-gtk_backup.c
@@ -163,7 +163,7 @@ anastasis_gtk_backup_button_clicked (GObject *object,
  * @param user_data unused
  */
 void
-anastasis_gtk_btn_add_auth_edit_provider_clicked_cb
+anastasis_gtk_btn_add_auth_edit_provider_clicked_cb ()
 {
      gtk_widget_show (GTK_WIDGET (GCG_get_main_window_object (
                                         
"anastasis_gtk_b_edit_provider_dialog")));
diff --git a/src/anastasis/anastasis-gtk_helper.c 
b/src/anastasis/anastasis-gtk_helper.c
index 2316ed2..a9d5218 100644
--- a/src/anastasis/anastasis-gtk_helper.c
+++ b/src/anastasis/anastasis-gtk_helper.c
@@ -170,9 +170,9 @@ persist_state (json_t *state)
         char *path;
         char *mode;
 
-        if (NULL != json_object_get (state, "backup-state"))
+        if (NULL != json_object_get (state, "backup_state"))
             mode = "backup";
-        else if (NULL != json_object_get (state, "recovery-state"))
+        else if (NULL != json_object_get (state, "recovery_state"))
             mode = "recovery";
         else
         {
@@ -212,7 +212,7 @@ action_cb (void *cls,
     if (NULL != result_state)
     {
         redux_state = json_deep_copy (result_state);
-        if (check_state (redux_state, "ReduxContinentSelectedState"))
+        if (check_state (redux_state, "CountrySelectionState"))
         {
             init_country_list (redux_state, json_string_value (json_object_get 
(redux_state, "selected_continent")));
             gtk_widget_hide (GTK_WIDGET (GCG_get_main_window_object (
@@ -220,15 +220,15 @@ action_cb (void *cls,
             gtk_widget_show (GTK_WIDGET (GCG_get_main_window_object (
                                         
"anastasis_gtk_country_selection_image")));
         }
-        if (check_state (redux_state, "ReduxCountrySelectedState"))
+        if (check_state (redux_state, "UserAttributesCollectionState"))
         {
             gtk_widget_set_sensitive (GTK_WIDGET (GCG_get_main_window_object (
                                         
"anastasis_gtk_main_window_forward_button")), true);
             init_id_attr (redux_state, json_string_value (json_object_get 
(redux_state, "selected_country")));
         }
-        if (check_state (redux_state, "ReduxUserAttributesAddedState"))
+        if (check_state (redux_state, "AuthenticationsEditingState"))
         {
-            if (json_object_get (redux_state, "backup-state"))
+            if (json_object_get (redux_state, "backup_state"))
             {
                 gtk_widget_show (GTK_WIDGET (GCG_get_main_window_object (
                                         
"anastasis_gtk_b_authentication_frame")));
@@ -237,11 +237,11 @@ action_cb (void *cls,
                                                 
"anastasis_gtk_b_authentication_methods_image")));
             }
         }
-        if (check_state (redux_state, "ReduxAuthenticationAddedState")
+        if (check_state (redux_state, "PoliciesReviewingState")
                 && gtk_widget_is_visible (GTK_WIDGET 
(GCG_get_main_window_object (
                                         
"anastasis_gtk_b_authentication_frame"))))
         {
-            if (json_object_get (redux_state, "backup-state"))
+            if (json_object_get (redux_state, "backup_state"))
             {
                 gtk_widget_hide (GTK_WIDGET (GCG_get_main_window_object (
                                         
"anastasis_gtk_b_authentication_frame")));
@@ -276,7 +276,9 @@ action_cb (void *cls,
 bool
 check_state (json_t *state, char *expected_state)
 {
-    const char *state_name = json_string_value (json_object_get (state, 
"backup-state"));
+    const char *state_name = json_string_value (json_object_get (state, 
"backup_state"));
+    if (NULL == state_name)
+        state_name = json_string_value (json_object_get (state, 
"recovery_state"));
     if (0 == strcmp (state_name, expected_state))
         return true;
     else

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