gnunet-svn
[Top][All Lists]
Advanced

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

[taler-anastasis-gtk] branch master updated (f20d3f3 -> acd8844)


From: gnunet
Subject: [taler-anastasis-gtk] branch master updated (f20d3f3 -> acd8844)
Date: Sat, 24 Jul 2021 12:28:00 +0200

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

grothoff pushed a change to branch master
in repository anastasis-gtk.

    from f20d3f3  address Belen's concern about the messages being similar 
enough
     new 17b265c  add logic to name secrets
     new dc0b46c  only suggest date for backup expiration as suggested by Belen
     new 3874647  add provider URL column as suggested by Belen
     new ee29468  add provider URL column as suggested by Belen
     new acd8844  realizing more Belen UX tweaks

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/anastasis_gtk_main_window.glade | 1521 ++++++++++++++++---------------
 src/anastasis/anastasis-gtk_action.c    |   58 +-
 src/anastasis/anastasis-gtk_helper.h    |   15 +-
 3 files changed, 851 insertions(+), 743 deletions(-)

diff --git a/contrib/anastasis_gtk_main_window.glade 
b/contrib/anastasis_gtk_main_window.glade
index 4ea9bed..9ae07be 100644
--- a/contrib/anastasis_gtk_main_window.glade
+++ b/contrib/anastasis_gtk_main_window.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 
+<!-- Generated with glade 3.22.2 
 
 Copyright (C) Anastasis SARL
 
@@ -30,7 +30,7 @@ Author: Christian Grothoff, Dennis Neufeld
   <!-- interface-authors Christian Grothoff, Dennis Neufeld -->
   <object class="GtkImage" id="add_image">
     <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
     <property name="stock">gtk-add</property>
   </object>
   <object class="GtkListStore" id="anastasis_gtk_backup_progress_liststore">
@@ -129,19 +129,19 @@ Author: Christian Grothoff, Dennis Neufeld
   </object>
   <object class="GtkAdjustment" id="backup_adjustmenth">
     <property name="upper">100</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="backup_adjustmentv">
     <property name="upper">100</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkImage" id="backup_image">
     <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="margin-left">5</property>
-    <property name="margin-right">5</property>
+    <property name="can_focus">False</property>
+    <property name="margin_left">5</property>
+    <property name="margin_right">5</property>
     <property name="stock">gtk-go-up</property>
   </object>
   <object class="GtkListStore" id="backup_provider_liststore">
@@ -188,6 +188,8 @@ Author: Christian Grothoff, Dennis Neufeld
       <column type="gchararray"/>
       <!-- column-name instructions -->
       <column type="gchararray"/>
+      <!-- column-name provider_url -->
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkListStore" id="continent_liststore">
@@ -231,34 +233,34 @@ Author: Christian Grothoff, Dennis Neufeld
   </object>
   <object class="GtkImage" id="email_image">
     <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
     <property name="stock">gtk-missing-image</property>
   </object>
   <object class="GtkAdjustment" id="expiration_year_adjustment">
     <property name="upper">9999</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
     <property name="stock">gtk-yes</property>
   </object>
   <object class="GtkImage" id="image_question">
     <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
     <property name="stock">gtk-dialog-question</property>
   </object>
   <object class="GtkImage" id="open_file_image">
     <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
     <property name="stock">gtk-open</property>
   </object>
   <object class="GtkImage" id="open_image">
     <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="margin-left">5</property>
-    <property name="margin-right">5</property>
+    <property name="can_focus">False</property>
+    <property name="margin_left">5</property>
+    <property name="margin_right">5</property>
     <property name="stock">gtk-open</property>
   </object>
   <object class="GtkTreeStore" id="policy_review_treestore">
@@ -279,47 +281,49 @@ Author: Christian Grothoff, Dennis Neufeld
       <column type="gboolean"/>
       <!-- column-name method_index -->
       <column type="guint"/>
+      <!-- column-name was_solved -->
+      <column type="gboolean"/>
     </columns>
   </object>
   <object class="GtkAdjustment" id="policy_version_adjustment">
     <property name="upper">4294967295</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkEntryBuffer" id="provider_url_entrybuffer">
     <property name="text" translatable="yes">https://</property>
   </object>
   <object class="GtkAdjustment" id="recovery_adjustmenth">
     <property name="upper">100</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="recovery_adjustmentv">
     <property name="upper">100</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkImage" id="restart_image">
     <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
     <property name="stock">gtk-goto-first</property>
   </object>
   <object class="GtkImage" id="restore_image">
     <property name="visible">True</property>
-    <property name="can-focus">False</property>
-    <property name="margin-left">5</property>
-    <property name="margin-right">4</property>
+    <property name="can_focus">False</property>
+    <property name="margin_left">5</property>
+    <property name="margin_right">4</property>
     <property name="stock">gtk-go-down</property>
   </object>
   <object class="GtkAdjustment" id="secret_box_adjustmenth">
     <property name="upper">100</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="secret_box_adjustmentv">
     <property name="upper">100</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
   <object class="GtkListStore" id="unpaid_qrcodes_liststore">
     <columns>
@@ -333,42 +337,45 @@ Author: Christian Grothoff, Dennis Neufeld
   </object>
   <object class="GtkImage" id="video_image">
     <property name="visible">True</property>
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
     <property name="stock">gtk-orientation-portrait</property>
   </object>
   <object class="GtkWindow" id="anastasis_gtk_main_window">
-    <property name="can-focus">False</property>
+    <property name="can_focus">False</property>
     <property name="events">GDK_BUTTON_PRESS_MASK | 
GDK_STRUCTURE_MASK</property>
-    <property name="window-position">center</property>
-    <property name="default-width">700</property>
-    <property name="default-height">500</property>
+    <property name="window_position">center</property>
+    <property name="default_width">700</property>
+    <property name="default_height">500</property>
     <signal name="delete-event" handler="anastasis_gtk_quit_cb" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="anastasis_gtk_main_vbox">
         <property name="visible">True</property>
-        <property name="can-focus">False</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkMenuBar" id="anastasis_gtk_menubar">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkMenuItem" id="anastasis_gtk_file_menuitem">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_File</property>
-                <property name="use-underline">True</property>
+                <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="anastasis_gtk_file_menu">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" 
id="anastasis_quit_imagemenuitem">
                         <property name="label">gtk-quit</property>
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="use-underline">True</property>
-                        <property name="use-stock">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
                         <signal name="activate" 
handler="anastasis_gtk_quit_cb" swapped="no"/>
                       </object>
                     </child>
@@ -379,20 +386,20 @@ Author: Christian Grothoff, Dennis Neufeld
             <child>
               <object class="GtkMenuItem" id="anastasis_gtk_help_menuitem">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Help</property>
-                <property name="use-underline">True</property>
+                <property name="use_underline">True</property>
                 <child type="submenu">
                   <object class="GtkMenu" id="anastasis_gtk_help_menu">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" 
id="anastasis_gtk_about_imagemenuitem">
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="use-underline">True</property>
-                        <property name="use-stock">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
                         <signal name="activate" 
handler="anastasis_gtk_about_imagemenuitem_activate_cb" swapped="no"/>
                       </object>
                     </child>
@@ -400,9 +407,9 @@ Author: Christian Grothoff, Dennis Neufeld
                       <object class="GtkImageMenuItem" 
id="anastasis_gtk_animation">
                         <property name="label">Show animation</property>
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
+                        <property name="can_focus">False</property>
                         <property name="image">image1</property>
-                        <property name="use-stock">False</property>
+                        <property name="use_stock">False</property>
                         <signal name="activate" 
handler="anastasis_gtk_animation_activate_cb" swapped="no"/>
                       </object>
                     </child>
@@ -420,33 +427,33 @@ Author: Christian Grothoff, Dennis Neufeld
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkBox" id="anastasis_gtk_progress_vbox">
-                <property name="can-focus">False</property>
-                <property name="margin-right">5</property>
+                <property name="can_focus">False</property>
+                <property name="margin_right">5</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">5</property>
                 <child>
                   <object class="GtkScrolledWindow" 
id="anastasis_gtk_backup_progress_scrolled_window">
-                    <property name="can-focus">False</property>
+                    <property name="can_focus">False</property>
                     <property name="hadjustment">backup_adjustmenth</property>
                     <property name="vadjustment">backup_adjustmentv</property>
-                    <property name="window-placement-set">False</property>
-                    <property name="shadow-type">in</property>
-                    <property name="propagate-natural-width">True</property>
+                    <property name="window_placement_set">False</property>
+                    <property name="shadow_type">in</property>
+                    <property name="propagate_natural_width">True</property>
                     <child>
                       <object class="GtkTreeView" 
id="anastasis_gtk_backup_progress_treeview">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
+                        <property name="can_focus">False</property>
                         <property 
name="hadjustment">backup_adjustmenth</property>
                         <property 
name="vadjustment">backup_adjustmentv</property>
                         <property 
name="model">anastasis_gtk_backup_progress_liststore</property>
-                        <property name="headers-clickable">False</property>
-                        <property name="enable-search">False</property>
-                        <property name="search-column">0</property>
-                        <property name="show-expanders">False</property>
-                        <property name="tooltip-column">2</property>
+                        <property name="headers_clickable">False</property>
+                        <property name="enable_search">False</property>
+                        <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
+                        <property name="tooltip_column">2</property>
                         <signal name="button-press-event" 
handler="anastasis_gtk_backup_progress_treeview_button_press_event_cb" 
swapped="no"/>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" 
id="anastasis_gtk_backup_progress_tree_selection"/>
@@ -479,24 +486,24 @@ Author: Christian Grothoff, Dennis Neufeld
                 <child>
                   <object class="GtkScrolledWindow" 
id="anastasis_gtk_recovery_progress_scrolled_window">
                     <property name="visible">True</property>
-                    <property name="can-focus">True</property>
+                    <property name="can_focus">True</property>
                     <property 
name="hadjustment">recovery_adjustmenth</property>
                     <property 
name="vadjustment">recovery_adjustmentv</property>
-                    <property name="window-placement-set">False</property>
-                    <property name="shadow-type">in</property>
-                    <property name="propagate-natural-width">True</property>
+                    <property name="window_placement_set">False</property>
+                    <property name="shadow_type">in</property>
+                    <property name="propagate_natural_width">True</property>
                     <child>
                       <object class="GtkTreeView" 
id="anastasis_gtk_recovery_progress_treeview">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
+                        <property name="can_focus">False</property>
                         <property 
name="hadjustment">recovery_adjustmenth</property>
                         <property 
name="vadjustment">recovery_adjustmentv</property>
                         <property 
name="model">anastasis_gtk_recovery_progress_liststore</property>
-                        <property name="headers-clickable">False</property>
-                        <property name="enable-search">False</property>
-                        <property name="search-column">0</property>
-                        <property name="show-expanders">False</property>
-                        <property name="tooltip-column">2</property>
+                        <property name="headers_clickable">False</property>
+                        <property name="enable_search">False</property>
+                        <property name="search_column">0</property>
+                        <property name="show_expanders">False</property>
+                        <property name="tooltip_column">2</property>
                         <signal name="button-press-event" 
handler="anastasis_gtk_recovery_progress_treeview_button_press_event_cb" 
swapped="no"/>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" 
id="anastasis_gtk_recovery_progress_tree_selection"/>
@@ -537,29 +544,29 @@ Author: Christian Grothoff, Dennis Neufeld
             <child>
               <object class="GtkScrolledWindow" 
id="anastasis_gtk_scrolledwindow">
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
+                <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="hadjustment">recovery_adjustmentv</property>
-                <property name="shadow-type">in</property>
+                <property name="shadow_type">in</property>
                 <child>
                   <object class="GtkViewport" id="anastasis_gtk_viewport">
                     <property name="visible">True</property>
-                    <property name="can-focus">False</property>
+                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <child>
                       <object class="GtkBox">
                         <property name="visible">True</property>
-                        <property name="can-focus">False</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkBox" id="anastasis_gtk_super_vbox">
                             <property name="visible">True</property>
-                            <property name="can-focus">False</property>
+                            <property name="can_focus">False</property>
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkLabel" 
id="anastasis_gtk_error_label">
-                                <property name="can-focus">False</property>
+                                <property name="can_focus">False</property>
                                 <property name="label">DYNAMIC ERROR 
MESSAGE</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
@@ -576,26 +583,26 @@ Author: Christian Grothoff, Dennis Neufeld
                             <child>
                               <object class="GtkAlignment" 
id="anastasis_gtk_start_frame">
                                 <property name="visible">True</property>
-                                <property name="can-focus">False</property>
-                                <property name="margin-left">10</property>
-                                <property name="left-padding">12</property>
+                                <property name="can_focus">False</property>
+                                <property name="margin_left">10</property>
+                                <property name="left_padding">12</property>
                                 <child>
                                   <object class="GtkBox" 
id="anastasis_gtk_primary_action_hbox">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
+                                    <property name="can_focus">False</property>
                                     <property name="halign">center</property>
-                                    <property name="margin-left">10</property>
-                                    <property name="margin-right">10</property>
-                                    <property name="margin-start">10</property>
-                                    <property name="margin-end">10</property>
-                                    <property name="margin-top">10</property>
-                                    <property 
name="margin-bottom">10</property>
+                                    <property name="margin_left">10</property>
+                                    <property name="margin_right">10</property>
+                                    <property name="margin_start">10</property>
+                                    <property name="margin_end">10</property>
+                                    <property name="margin_top">10</property>
+                                    <property 
name="margin_bottom">10</property>
                                     <property 
name="orientation">vertical</property>
                                     <property name="spacing">20</property>
                                     <child>
                                       <object class="GtkLabel">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">False</property>
+                                        <property 
name="can_focus">False</property>
                                         <property 
name="halign">center</property>
                                         <property name="label" 
translatable="yes">What do you want to do?</property>
                                         <property 
name="justify">center</property>
@@ -615,12 +622,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                       <object class="GtkButton" 
id="anastasis_gtk_backup_button">
                                         <property name="label" 
translatable="yes">_Back up a secret</property>
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">True</property>
-                                        <property 
name="receives-default">True</property>
-                                        <property name="tooltip-text" 
translatable="yes">Begin fresh backup process</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property name="tooltip_text" 
translatable="yes">Begin fresh backup process</property>
                                         <property 
name="image">backup_image</property>
-                                        <property 
name="use-underline">True</property>
-                                        <property 
name="always-show-image">True</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="always_show_image">True</property>
                                         <signal name="clicked" 
handler="anastasis_gtk_backup_button_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
@@ -634,12 +641,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                       <object class="GtkButton" 
id="anastasis_gtk_recovery_button">
                                         <property name="label" 
translatable="yes">_Restore a secret</property>
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">True</property>
-                                        <property 
name="receives-default">True</property>
-                                        <property name="tooltip-text" 
translatable="yes">Begin secret recovery process</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property name="tooltip_text" 
translatable="yes">Begin secret recovery process</property>
                                         <property 
name="image">restore_image</property>
-                                        <property 
name="use-underline">True</property>
-                                        <property 
name="always-show-image">True</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="always_show_image">True</property>
                                         <signal name="clicked" 
handler="anastasis_gtk_recovery_button_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
@@ -653,12 +660,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                       <object class="GtkButton" 
id="anastasis_gtk_open_state">
                                         <property name="label">_Open a saved 
action</property>
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">True</property>
-                                        <property 
name="receives-default">True</property>
-                                        <property name="tooltip-text" 
translatable="yes">Continue from file with saved Anastasis state</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="receives_default">True</property>
+                                        <property name="tooltip_text" 
translatable="yes">Continue from file with saved Anastasis state</property>
                                         <property 
name="image">open_image</property>
-                                        <property 
name="use-underline">True</property>
-                                        <property 
name="always-show-image">True</property>
+                                        <property 
name="use_underline">True</property>
+                                        <property 
name="always_show_image">True</property>
                                         <signal name="clicked" 
handler="anastasis_gtk_open_state_clicked_cb" swapped="no"/>
                                       </object>
                                       <packing>
@@ -679,31 +686,31 @@ Author: Christian Grothoff, Dennis Neufeld
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_continent_frame">
-                                <property name="can-focus">False</property>
-                                <property name="label-xalign">0</property>
-                                <property name="shadow-type">none</property>
+                                <property name="can_focus">False</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="left-padding">12</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="left_padding">12</property>
                                     <child>
                                       <object class="GtkBox" 
id="anastasis_gtk_continent_vbox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">False</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkScrolledWindow">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">True</property>
-                                            <property 
name="shadow-type">in</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="shadow_type">in</property>
                                             <child>
                                               <object class="GtkTreeView" 
id="anastasis_gtk_continent_treeview">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">True</property>
+                                                <property 
name="can_focus">True</property>
                                                 <property 
name="model">continent_liststore</property>
-                                                <property 
name="enable-search">False</property>
-                                                <property 
name="search-column">0</property>
-                                                <property 
name="activate-on-single-click">True</property>
+                                                <property 
name="enable_search">False</property>
+                                                <property 
name="search_column">0</property>
+                                                <property 
name="activate_on_single_click">True</property>
                                                 <child 
internal-child="selection">
                                                   <object 
class="GtkTreeSelection" id="anastasis_gtk_continent_selection">
                                                     <signal name="changed" 
handler="anastasis_gtk_continent_selection_changed_cb" swapped="no"/>
@@ -733,16 +740,16 @@ Author: Christian Grothoff, Dennis Neufeld
                                         <child>
                                           <object class="GtkScrolledWindow">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">True</property>
-                                            <property 
name="shadow-type">in</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="shadow_type">in</property>
                                             <child>
                                               <object class="GtkTreeView" 
id="anastasis_gtk_country_treeview">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">True</property>
+                                                <property 
name="can_focus">True</property>
                                                 <property 
name="model">country_liststore</property>
-                                                <property 
name="enable-search">False</property>
-                                                <property 
name="search-column">0</property>
-                                                <property 
name="activate-on-single-click">True</property>
+                                                <property 
name="enable_search">False</property>
+                                                <property 
name="search_column">0</property>
+                                                <property 
name="activate_on_single_click">True</property>
                                                 <child 
internal-child="selection">
                                                   <object 
class="GtkTreeSelection" id="anastasis_gtk_country_selection">
                                                     <signal name="changed" 
handler="anastasis_gtk_country_selection_changed_cb" swapped="no"/>
@@ -772,12 +779,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                         <child>
                                           <object class="GtkScrolledWindow">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">True</property>
-                                            <property 
name="shadow-type">in</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="shadow_type">in</property>
                                             <child>
                                               <object class="GtkTreeView" 
id="anastasis_gtk_currency_treeview">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">True</property>
+                                                <property 
name="can_focus">True</property>
                                                 <property 
name="model">currency_liststore</property>
                                                 <child 
internal-child="selection">
                                                   <object 
class="GtkTreeSelection" id="anastasis_gtk_currency_selection">
@@ -788,7 +795,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object 
class="GtkTreeViewColumn">
                                                     <property name="title" 
translatable="yes">Currencies</property>
-                                                    <property 
name="sort-column-id">0</property>
+                                                    <property 
name="sort_column_id">0</property>
                                                     <child>
                                                       <object 
class="GtkCellRendererText" id="currency"/>
                                                       <attributes>
@@ -814,12 +821,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="tooltip-text" 
translatable="yes">These questions determine which personal attributes we can 
ask you for, and which backup providers could be used.</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">5</property>
-                                    <property name="margin-bottom">5</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="tooltip_text" 
translatable="yes">These questions determine which personal attributes we can 
ask you for, and which backup providers could be used.</property>
+                                    <property name="margin_start">5</property>
+                                    <property name="margin_end">5</property>
+                                    <property name="margin_top">5</property>
+                                    <property name="margin_bottom">5</property>
                                     <property name="label" 
translatable="yes">Where do you live? In which currencies do you want to 
pay?</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -835,42 +842,42 @@ Author: Christian Grothoff, Dennis Neufeld
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_identity_frame">
-                                <property name="can-focus">False</property>
-                                <property name="label-xalign">0</property>
-                                <property name="shadow-type">none</property>
+                                <property name="can_focus">False</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
+                                    <property name="can_focus">False</property>
                                     <child>
                                       <object class="GtkBox" 
id="who_are_you_hbox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">False</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="spacing">10</property>
                                         <property 
name="homogeneous">True</property>
                                         <child>
                                           <object class="GtkBox" 
id="anastasis_gtk_identity_vbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">False</property>
+                                            <property 
name="can_focus">False</property>
                                             <property 
name="orientation">vertical</property>
                                             <property 
name="spacing">15</property>
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_full_name_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_full_name_hbox">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_full_name_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="halign">start</property>
                                                         <property 
name="valign">center</property>
-                                                        <property 
name="margin-left">20</property>
-                                                        <property 
name="margin-start">20</property>
+                                                        <property 
name="margin_left">20</property>
+                                                        <property 
name="margin_start">20</property>
                                                         <property name="label" 
translatable="yes">Full name:</property>
                                                       </object>
                                                       <packing>
@@ -883,9 +890,9 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_ia_full_name_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="can_focus">True</property>
                                                         <property 
name="hexpand">True</property>
-                                                        <property 
name="placeholder-text" translatable="yes">Max Mustermann</property>
+                                                        <property 
name="placeholder_text" translatable="yes">Max Mustermann</property>
                                                         <signal name="changed" 
handler="AG_identity_changed" swapped="no"/>
                                                       </object>
                                                       <packing>
@@ -906,13 +913,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox1">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="margin-left">40</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="margin_left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label1">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
-                                                        <property 
name="margin-left">40</property>
+                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="margin_left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -924,10 +931,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image1">
-                                                        <property 
name="width-request">24</property>
-                                                        <property 
name="height-request">24</property>
+                                                        <property 
name="width_request">24</property>
+                                                        <property 
name="height_request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -948,7 +955,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -966,18 +973,18 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_birthdate_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_birthdate_hbox">
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_birthdate_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="halign">start</property>
-                                                        <property 
name="margin-left">20</property>
-                                                        <property 
name="margin-start">20</property>
+                                                        <property 
name="margin_left">20</property>
+                                                        <property 
name="margin_start">20</property>
                                                         <property name="label" 
translatable="yes">Birthdate:</property>
                                                       </object>
                                                       <packing>
@@ -990,11 +997,11 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object 
class="GtkCalendar" id="anastasis_gtk_ia_birthdate_cal">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="can_focus">True</property>
                                                         <property 
name="year">1980</property>
                                                         <property 
name="month">8</property>
                                                         <property 
name="day">22</property>
-                                                        <property 
name="show-week-numbers">True</property>
+                                                        <property 
name="show_week_numbers">True</property>
                                                         <signal 
name="day-selected" handler="AG_identity_changed" swapped="no"/>
                                                       </object>
                                                       <packing>
@@ -1015,13 +1022,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox2">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="margin-left">40</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="margin_left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label2">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
-                                                        <property 
name="margin-left">40</property>
+                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="margin_left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -1033,10 +1040,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image2">
-                                                        <property 
name="width-request">24</property>
-                                                        <property 
name="height-request">24</property>
+                                                        <property 
name="width_request">24</property>
+                                                        <property 
name="height_request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -1057,7 +1064,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -1075,20 +1082,20 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_birthplace_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_birthplace_hbox">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_birthplace_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="halign">start</property>
                                                         <property 
name="valign">center</property>
-                                                        <property 
name="margin-left">20</property>
-                                                        <property 
name="margin-start">20</property>
+                                                        <property 
name="margin_left">20</property>
+                                                        <property 
name="margin_start">20</property>
                                                         <property name="label" 
translatable="yes">Birthplace:</property>
                                                       </object>
                                                       <packing>
@@ -1101,9 +1108,9 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_ia_birthplace_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="can_focus">True</property>
                                                         <property 
name="hexpand">True</property>
-                                                        <property 
name="placeholder-text" translatable="yes">Earth</property>
+                                                        <property 
name="placeholder_text" translatable="yes">Earth</property>
                                                       </object>
                                                       <packing>
                                                         <property 
name="expand">True</property>
@@ -1123,13 +1130,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox3">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="margin-left">40</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="margin_left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label3">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
-                                                        <property 
name="margin-left">40</property>
+                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="margin_left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -1141,10 +1148,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image3">
-                                                        <property 
name="width-request">24</property>
-                                                        <property 
name="height-request">24</property>
+                                                        <property 
name="width_request">24</property>
+                                                        <property 
name="height_request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -1165,7 +1172,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -1183,19 +1190,19 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_ahv_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_ahv_hbox">
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_ahv_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="halign">start</property>
                                                         <property 
name="valign">center</property>
-                                                        <property 
name="margin-left">20</property>
-                                                        <property 
name="margin-start">20</property>
+                                                        <property 
name="margin_left">20</property>
+                                                        <property 
name="margin_start">20</property>
                                                         <property name="label" 
translatable="yes">AHV number:</property>
                                                       </object>
                                                       <packing>
@@ -1208,13 +1215,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_ia_ahv_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">True</property>
-                                                        <property 
name="max-length">16</property>
-                                                        <property 
name="width-chars">17</property>
-                                                        <property 
name="max-width-chars">16</property>
-                                                        <property 
name="caps-lock-warning">False</property>
-                                                        <property 
name="placeholder-text" translatable="yes">756.1222.3425.89</property>
-                                                        <property 
name="input-purpose">number</property>
+                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="max_length">16</property>
+                                                        <property 
name="width_chars">17</property>
+                                                        <property 
name="max_width_chars">16</property>
+                                                        <property 
name="caps_lock_warning">False</property>
+                                                        <property 
name="placeholder_text" translatable="yes">756.1222.3425.89</property>
+                                                        <property 
name="input_purpose">number</property>
                                                         <signal name="changed" 
handler="AG_identity_changed" swapped="no"/>
                                                       </object>
                                                       <packing>
@@ -1234,13 +1241,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox4">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="margin-left">40</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="margin_left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label4">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
-                                                        <property 
name="margin-left">40</property>
+                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="margin_left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -1252,10 +1259,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image4">
-                                                        <property 
name="width-request">24</property>
-                                                        <property 
name="height-request">24</property>
+                                                        <property 
name="width_request">24</property>
+                                                        <property 
name="height_request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -1276,7 +1283,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -1294,19 +1301,19 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_tin_de_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_tin_de_hbox">
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_tin_de_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="halign">start</property>
                                                         <property 
name="valign">center</property>
-                                                        <property 
name="margin-left">20</property>
-                                                        <property 
name="margin-start">20</property>
+                                                        <property 
name="margin_left">20</property>
+                                                        <property 
name="margin_start">20</property>
                                                         <property name="label" 
translatable="yes">Steuerliche Identifikationsnummer:</property>
                                                       </object>
                                                       <packing>
@@ -1319,12 +1326,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_ia_tin_de_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">True</property>
-                                                        <property 
name="max-length">11</property>
-                                                        <property 
name="width-chars">12</property>
-                                                        <property 
name="max-width-chars">11</property>
-                                                        <property 
name="placeholder-text" translatable="yes">12345678912</property>
-                                                        <property 
name="input-purpose">number</property>
+                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="max_length">11</property>
+                                                        <property 
name="width_chars">12</property>
+                                                        <property 
name="max_width_chars">11</property>
+                                                        <property 
name="placeholder_text" translatable="yes">12345678912</property>
+                                                        <property 
name="input_purpose">number</property>
                                                       </object>
                                                       <packing>
                                                         <property 
name="expand">False</property>
@@ -1344,13 +1351,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox5">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="margin-left">40</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="margin_left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label5">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
-                                                        <property 
name="margin-left">40</property>
+                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="margin_left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -1362,10 +1369,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image5">
-                                                        <property 
name="width-request">24</property>
-                                                        <property 
name="height-request">24</property>
+                                                        <property 
name="width_request">24</property>
+                                                        <property 
name="height_request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -1386,7 +1393,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -1404,20 +1411,20 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_ssn_de_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_ssn_de_hbox">
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_ssn_de_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
-                                                        <property 
name="tooltip-text" translatable="yes">Falls vorhanden sollte diese Nummer auf 
jeden Fall angegeben werden. Nur Beamte, Selbstständige und andere Personen die 
keine Rentenversicherungsnummer haben sollten dieses Feld leer 
lassen.</property>
+                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="tooltip_text" translatable="yes">Falls vorhanden sollte diese Nummer auf 
jeden Fall angegeben werden. Nur Beamte, Selbstständige und andere Personen die 
keine Rentenversicherungsnummer haben sollten dieses Feld leer 
lassen.</property>
                                                         <property 
name="halign">start</property>
                                                         <property 
name="valign">center</property>
-                                                        <property 
name="margin-left">20</property>
-                                                        <property 
name="margin-start">20</property>
+                                                        <property 
name="margin_left">20</property>
+                                                        <property 
name="margin_start">20</property>
                                                         <property name="label" 
translatable="yes">Sozialversicherungsnummer (optional):</property>
                                                       </object>
                                                       <packing>
@@ -1430,12 +1437,12 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_ia_ssn_de_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">True</property>
-                                                        <property 
name="max-length">12</property>
-                                                        <property 
name="width-chars">13</property>
-                                                        <property 
name="max-width-chars">12</property>
-                                                        <property 
name="placeholder-text" translatable="yes">14230460S534</property>
-                                                        <property 
name="input-purpose">alpha</property>
+                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="max_length">12</property>
+                                                        <property 
name="width_chars">13</property>
+                                                        <property 
name="max_width_chars">12</property>
+                                                        <property 
name="placeholder_text" translatable="yes">14230460S534</property>
+                                                        <property 
name="input_purpose">alpha</property>
                                                         <signal name="changed" 
handler="AG_identity_changed" swapped="no"/>
                                                       </object>
                                                       <packing>
@@ -1456,13 +1463,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox6">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="margin-left">40</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="margin_left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label6">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
-                                                        <property 
name="margin-left">40</property>
+                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="margin_left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -1474,10 +1481,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image6">
-                                                        <property 
name="width-request">24</property>
-                                                        <property 
name="height-request">24</property>
+                                                        <property 
name="width_request">24</property>
+                                                        <property 
name="height_request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -1498,7 +1505,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -1516,19 +1523,19 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_ia_ssn_us_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="anastasis_gtk_ia_ssn_us_hbox">
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="anastasis_gtk_ia_ssn_us_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="halign">start</property>
                                                         <property 
name="valign">center</property>
-                                                        <property 
name="margin-left">20</property>
-                                                        <property 
name="margin-start">20</property>
+                                                        <property 
name="margin_left">20</property>
+                                                        <property 
name="margin_start">20</property>
                                                         <property name="label" 
translatable="yes">Social security number:</property>
                                                       </object>
                                                       <packing>
@@ -1541,11 +1548,11 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_ia_ssn_us_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">True</property>
-                                                        <property 
name="max-length">11</property>
-                                                        <property 
name="width-chars">12</property>
-                                                        <property 
name="max-width-chars">11</property>
-                                                        <property 
name="placeholder-text" translatable="yes">000-00-0000</property>
+                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="max_length">11</property>
+                                                        <property 
name="width_chars">12</property>
+                                                        <property 
name="max_width_chars">11</property>
+                                                        <property 
name="placeholder_text" translatable="yes">000-00-0000</property>
                                                         <signal name="changed" 
handler="AG_identity_changed" swapped="no"/>
                                                       </object>
                                                       <packing>
@@ -1566,13 +1573,13 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkBox" 
id="private_hbox7">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="margin-left">40</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="margin_left">40</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="privacy_label7">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
-                                                        <property 
name="margin-left">40</property>
+                                                        <property 
name="can_focus">False</property>
+                                                        <property 
name="margin_left">40</property>
                                                         <property name="label" 
translatable="yes">This stays private</property>
                                                       </object>
                                                       <packing>
@@ -1584,10 +1591,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                     </child>
                                                     <child>
                                                       <object class="GtkImage" 
id="blindfold_image7">
-                                                        <property 
name="width-request">24</property>
-                                                        <property 
name="height-request">24</property>
+                                                        <property 
name="width_request">24</property>
+                                                        <property 
name="height_request">24</property>
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                       </object>
                                                       <packing>
@@ -1608,7 +1615,7 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 <child>
                                                   <object class="GtkSeparator">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
@@ -1634,20 +1641,20 @@ Author: Christian Grothoff, Dennis Neufeld
                                         <child>
                                           <object class="GtkBox" 
id="anastasis_gtk_private_explainer_vbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">False</property>
+                                            <property 
name="can_focus">False</property>
                                             <property 
name="orientation">vertical</property>
                                             <property 
name="spacing">20</property>
-                                            <property 
name="baseline-position">top</property>
+                                            <property 
name="baseline_position">top</property>
                                             <child>
                                               <object class="GtkBox" 
id="private_hbox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkLabel" 
id="privacy_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="margin-top">5</property>
-                                                    <property 
name="margin-bottom">5</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="margin_top">5</property>
+                                                    <property 
name="margin_bottom">5</property>
                                                     <property name="label" 
translatable="yes">This stays private</property>
                                                     <attributes>
                                                       <attribute name="weight" 
value="bold"/>
@@ -1663,10 +1670,10 @@ Author: Christian Grothoff, Dennis Neufeld
                                                 </child>
                                                 <child>
                                                   <object class="GtkImage" 
id="blindfold_image">
-                                                    <property 
name="width-request">24</property>
-                                                    <property 
name="height-request">24</property>
+                                                    <property 
name="width_request">24</property>
+                                                    <property 
name="height_request">24</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <property 
name="pixbuf">noun_blindfold_3574196.svg</property>
                                                   </object>
                                                   <packing>
@@ -1686,9 +1693,9 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkLabel" 
id="explainer_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property 
name="margin-top">5</property>
-                                                <property 
name="margin-bottom">15</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="margin_top">5</property>
+                                                <property 
name="margin_bottom">15</property>
                                                 <property name="label" 
translatable="yes">The information you have entered here:
 • Will be hashed, and therefore unreadable
 • The non-hashed version is not shared</property>
@@ -1703,9 +1710,9 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkLabel" 
id="encrypt_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property name="label" 
translatable="yes">&lt;a 
href="https://taler.net/papers/thesis-anastasis-2020.pdf"&gt;How Anastasis 
encrypts your data&lt;/a&gt;</property>
-                                                <property 
name="use-markup">True</property>
+                                                <property 
name="use_markup">True</property>
                                               </object>
                                               <packing>
                                                 <property 
name="expand">False</property>
@@ -1716,9 +1723,9 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkLabel" 
id="free_software_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property name="label" 
translatable="yes">Anastasis is &lt;a 
href="https://www.gnu.org/philosophy/free-sw.html"&gt;Free 
Software&lt;/a&gt;</property>
-                                                <property 
name="use-markup">True</property>
+                                                <property 
name="use_markup">True</property>
                                               </object>
                                               <packing>
                                                 <property 
name="expand">False</property>
@@ -1729,11 +1736,11 @@ Author: Christian Grothoff, Dennis Neufeld
                                             <child>
                                               <object class="GtkLabel" 
id="funding_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property 
name="margin-top">10</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="margin_top">10</property>
                                                 <property name="label" 
translatable="yes">Anastasis is developed by &lt;a 
href="https://anastasis.lu/en/about.html#team"&gt;privacy advocates&lt;/a&gt;
 with &lt;a href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; 
from the European Commission.</property>
-                                                <property 
name="use-markup">True</property>
+                                                <property 
name="use_markup">True</property>
                                                 <property 
name="justify">center</property>
                                               </object>
                                               <packing>
@@ -1745,15 +1752,15 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                             </child>
                                             <child>
                                               <object class="GtkImage" 
id="ec_image">
-                                                <property 
name="width-request">128</property>
-                                                <property 
name="height-request">128</property>
+                                                <property 
name="width_request">128</property>
+                                                <property 
name="height_request">128</property>
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="halign">center</property>
-                                                <property 
name="margin-left">10</property>
-                                                <property 
name="margin-right">10</property>
-                                                <property 
name="margin-top">10</property>
-                                                <property 
name="margin-bottom">10</property>
+                                                <property 
name="margin_left">10</property>
+                                                <property 
name="margin_right">10</property>
+                                                <property 
name="margin_top">10</property>
+                                                <property 
name="margin_bottom">10</property>
                                                 <property 
name="pixbuf">bandiera_stelle.png</property>
                                               </object>
                                               <packing>
@@ -1778,11 +1785,11 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">5</property>
-                                    <property name="margin-bottom">5</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_start">5</property>
+                                    <property name="margin_end">5</property>
+                                    <property name="margin_top">5</property>
+                                    <property name="margin_bottom">5</property>
                                     <property name="label" 
translatable="yes">Who are you?</property>
                                     <attributes>
                                       <attribute name="style" value="normal"/>
@@ -1799,43 +1806,43 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_b_authentication_frame">
-                                <property name="can-focus">False</property>
-                                <property name="label-xalign">0</property>
-                                <property name="shadow-type">none</property>
+                                <property name="can_focus">False</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="left-padding">12</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="left_padding">12</property>
                                     <child>
                                       <object class="GtkBox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">False</property>
+                                        <property 
name="can_focus">False</property>
                                         <property 
name="orientation">vertical</property>
                                         <child>
                                           <object class="GtkFrame">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">False</property>
-                                            <property 
name="margin-right">50</property>
-                                            <property 
name="margin-end">50</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property 
name="margin_right">50</property>
+                                            <property 
name="margin_end">50</property>
                                             <property 
name="hexpand">True</property>
-                                            <property 
name="label-xalign">0</property>
-                                            <property 
name="shadow-type">none</property>
+                                            <property 
name="label_xalign">0</property>
+                                            <property 
name="shadow_type">none</property>
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_add_auth_button_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property 
name="margin-top">5</property>
-                                                <property 
name="margin-bottom">4</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="margin_top">5</property>
+                                                <property 
name="margin_bottom">4</property>
                                                 <property 
name="spacing">8</property>
                                                 <property 
name="homogeneous">True</property>
                                                 <child>
                                                   <object class="GtkButton" 
id="anastasis_gtk_btn_add_auth_sms">
                                                     <property name="label" 
translatable="yes">SMS</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="has-focus">True</property>
-                                                    <property 
name="receives-default">True</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="has_focus">True</property>
+                                                    <property 
name="receives_default">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_btn_add_auth_sms_clicked_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -1849,8 +1856,8 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                   <object class="GtkButton" 
id="anastasis_gtk_btn_add_auth_email">
                                                     <property name="label" 
translatable="yes">Email</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="receives-default">True</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="receives_default">True</property>
                                                     <property 
name="image">email_image</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_btn_add_auth_email_clicked_cb" swapped="no"/>
                                                   </object>
@@ -1865,8 +1872,8 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                   <object class="GtkButton" 
id="anastasis_gtk_btn_add_auth_question">
                                                     <property name="label" 
translatable="yes">Question</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="receives-default">True</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="receives_default">True</property>
                                                     <property 
name="image">image_question</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_btn_add_auth_question_clicked_cb" swapped="no"/>
                                                   </object>
@@ -1881,8 +1888,8 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                   <object class="GtkButton" 
id="anastasis_gtk_btn_add_auth_post">
                                                     <property name="label" 
translatable="yes">Post</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="receives-default">True</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="receives_default">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_btn_add_auth_post_clicked_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -1895,10 +1902,10 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                 <child>
                                                   <object class="GtkButton" 
id="anastasis_gtk_btn_add_auth_video">
                                                     <property name="label" 
translatable="yes">_Video</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="receives-default">True</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="receives_default">True</property>
                                                     <property 
name="image">video_image</property>
-                                                    <property 
name="use-underline">True</property>
+                                                    <property 
name="use_underline">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_btn_add_auth_video_clicked_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -1913,7 +1920,7 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                             <child type="label">
                                               <object class="GtkLabel">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property name="label" 
translatable="yes">Which authorization method should be added?</property>
                                                 <attributes>
                                                   <attribute name="weight" 
value="bold"/>
@@ -1931,30 +1938,30 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                         <child>
                                           <object class="GtkBox" 
id="anastasis_gtk_b_authentication_hbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">False</property>
+                                            <property 
name="can_focus">False</property>
                                             <child>
                                               <object class="GtkFrame">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property 
name="label-xalign">0</property>
-                                                <property 
name="shadow-type">none</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="label_xalign">0</property>
+                                                <property 
name="shadow_type">none</property>
                                                 <child>
                                                   <object class="GtkAlignment">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="left-padding">12</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="left_padding">12</property>
                                                     <child>
                                                       <object 
class="GtkScrolledWindow">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">True</property>
-                                                        <property 
name="shadow-type">in</property>
+                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="shadow_type">in</property>
                                                         <child>
                                                           <object 
class="GtkTreeView" id="anastasis_gtk_authentication_methods_list">
                                                             <property 
name="visible">True</property>
-                                                            <property 
name="can-focus">True</property>
+                                                            <property 
name="can_focus">True</property>
                                                             <property 
name="model">authentication_methods_liststore</property>
-                                                            <property 
name="enable-search">False</property>
-                                                            <property 
name="search-column">0</property>
+                                                            <property 
name="enable_search">False</property>
+                                                            <property 
name="search_column">0</property>
                                                             <child 
internal-child="selection">
                                                             <object 
class="GtkTreeSelection" id="anastasis_gtk_authentication_methods_selection">
                                                             <signal 
name="changed" handler="auth_method_selection_changed_cb" swapped="no"/>
@@ -1966,8 +1973,8 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                             <property 
name="title" translatable="yes">Type</property>
                                                             <property 
name="clickable">True</property>
                                                             <property 
name="reorderable">True</property>
-                                                            <property 
name="sort-indicator">True</property>
-                                                            <property 
name="sort-column-id">0</property>
+                                                            <property 
name="sort_indicator">True</property>
+                                                            <property 
name="sort_column_id">0</property>
                                                             <child>
                                                             <object 
class="GtkCellRendererText" id="type"/>
                                                             <attributes>
@@ -1998,7 +2005,7 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                 <child type="label">
                                                   <object class="GtkLabel" 
id="anastasis_gtk_authorization_methods_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <property name="label" 
translatable="yes">Authorization methods configured so far:</property>
                                                     <attributes>
                                                       <attribute name="weight" 
value="bold"/>
@@ -2016,17 +2023,17 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_authorization_meta_button_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkButton" 
id="anastasis_gtk_edit_provider_list">
                                                     <property name="label" 
translatable="yes">_Add provider</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="receives-default">True</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="receives_default">True</property>
                                                     <property 
name="image">add_image</property>
-                                                    <property 
name="use-underline">True</property>
-                                                    <property 
name="always-show-image">True</property>
+                                                    <property 
name="use_underline">True</property>
+                                                    <property 
name="always_show_image">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_edit_provider_list_clicked_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -2041,10 +2048,10 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                     <property 
name="label">gtk-delete</property>
                                                     <property 
name="visible">True</property>
                                                     <property 
name="sensitive">False</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="receives-default">True</property>
-                                                    <property 
name="use-stock">True</property>
-                                                    <property 
name="always-show-image">True</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="receives_default">True</property>
+                                                    <property 
name="use_stock">True</property>
+                                                    <property 
name="always_show_image">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_authentication_method_delete_button_clicked_cb" 
swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -2072,7 +2079,7 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                         <child>
                                           <object class="GtkSeparator">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">False</property>
+                                            <property 
name="can_focus">False</property>
                                           </object>
                                           <packing>
                                             <property 
name="expand">False</property>
@@ -2087,11 +2094,11 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">5</property>
-                                    <property name="margin-bottom">5</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_start">5</property>
+                                    <property name="margin_end">5</property>
+                                    <property name="margin_top">5</property>
+                                    <property name="margin_bottom">5</property>
                                     <property name="label" 
translatable="yes">Configure authorization methods!</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -2107,25 +2114,25 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_b_policy_frame">
-                                <property name="can-focus">False</property>
-                                <property name="label-xalign">0</property>
-                                <property name="shadow-type">none</property>
+                                <property name="can_focus">False</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="top-padding">10</property>
-                                    <property 
name="bottom-padding">10</property>
-                                    <property name="left-padding">12</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="top_padding">10</property>
+                                    <property 
name="bottom_padding">10</property>
+                                    <property name="left_padding">12</property>
                                     <child>
                                       <object class="GtkScrolledWindow">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">True</property>
-                                        <property 
name="shadow-type">in</property>
+                                        <property 
name="can_focus">True</property>
+                                        <property 
name="shadow_type">in</property>
                                         <child>
                                           <object class="GtkTreeView" 
id="anastasis_gtk_review_policy_treeview">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">True</property>
+                                            <property 
name="can_focus">True</property>
                                             <property 
name="model">policy_review_treestore</property>
                                             <signal name="button-press-event" 
handler="anastasis_gtk_review_policy_treeview_button_press_event_cb" 
swapped="no"/>
                                             <signal name="key-press-event" 
handler="anastasis_gtk_review_policy_treeview_key_press_event_cb" swapped="no"/>
@@ -2213,11 +2220,11 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">5</property>
-                                    <property name="margin-bottom">5</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_start">5</property>
+                                    <property name="margin_end">5</property>
+                                    <property name="margin_top">5</property>
+                                    <property name="margin_bottom">5</property>
                                     <property name="label" 
translatable="yes">Review recovery policies</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -2234,40 +2241,40 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_challenge_frame">
                                 <property 
name="name">anastasis_gtk_challenge_frame</property>
-                                <property name="can-focus">False</property>
-                                <property name="label-xalign">0</property>
-                                <property name="shadow-type">none</property>
+                                <property name="can_focus">False</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="left-padding">12</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="left_padding">12</property>
                                     <child>
                                       <object class="GtkBox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">False</property>
+                                        <property 
name="can_focus">False</property>
                                         <property 
name="orientation">vertical</property>
                                         <child>
                                           <object class="GtkFrame">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">False</property>
-                                            <property 
name="label-xalign">0</property>
-                                            <property 
name="shadow-type">none</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property 
name="label_xalign">0</property>
+                                            <property 
name="shadow_type">none</property>
                                             <child>
                                               <object class="GtkAlignment">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property 
name="left-padding">12</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="left_padding">12</property>
                                                 <child>
                                                   <object 
class="GtkScrolledWindow">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="shadow-type">in</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="shadow_type">in</property>
                                                     <child>
                                                       <object 
class="GtkTreeView" id="anastasis_gtk_challenge_status_treeview">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">True</property>
-                                                        <property 
name="tooltip-text" translatable="yes">Here you can see your progress in 
satisfying authorization challenges and can select the next challenge to 
solve.</property>
+                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="tooltip_text" translatable="yes">Here you can see your progress in 
satisfying authorization challenges and can select the next challenge to 
solve.</property>
                                                         <property 
name="model">challenge_status_liststore</property>
                                                         <signal 
name="row-activated" 
handler="anastasis_gtk_challenge_status_treeview_row_activated_cb" 
swapped="no"/>
                                                         <child 
internal-child="selection">
@@ -2278,7 +2285,7 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                         <child>
                                                           <object 
class="GtkTreeViewColumn">
                                                             <property 
name="title" translatable="yes">#</property>
-                                                            <property 
name="sort-column-id">0</property>
+                                                            <property 
name="sort_column_id">0</property>
                                                             <child>
                                                             <object 
class="GtkCellRendererToggle" id="solved">
                                                             <signal 
name="toggled" handler="anastasis_gtk_challenge_status_solved_toggled_cb" 
swapped="no"/>
@@ -2336,7 +2343,7 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                             <child>
                                                             <object 
class="GtkCellRendererText" id="instructions_text">
                                                             <property 
name="ellipsize">end</property>
-                                                            <property 
name="max-width-chars">20</property>
+                                                            <property 
name="max_width_chars">20</property>
                                                             </object>
                                                             <attributes>
                                                             <attribute 
name="text">14</attribute>
@@ -2344,6 +2351,18 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                             </child>
                                                           </object>
                                                         </child>
+                                                        <child>
+                                                          <object 
class="GtkTreeViewColumn">
+                                                            <property 
name="sizing">autosize</property>
+                                                            <property 
name="title" translatable="yes">Provider</property>
+                                                            <child>
+                                                            <object 
class="GtkCellRendererText" id="provider_url_text_column"/>
+                                                            <attributes>
+                                                            <attribute 
name="text">15</attribute>
+                                                            </attributes>
+                                                            </child>
+                                                          </object>
+                                                        </child>
                                                         <child>
                                                           <object 
class="GtkTreeViewColumn">
                                                             <property 
name="title" translatable="yes">Details</property>
@@ -2381,12 +2400,12 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                             <child type="label">
                                               <object class="GtkLabel">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property name="tooltip-text" 
translatable="yes">Here you can see your progress in satisfying authorization 
challenges and possible next steps.</property>
-                                                <property 
name="margin-start">5</property>
-                                                <property 
name="margin-end">5</property>
-                                                <property 
name="margin-top">5</property>
-                                                <property 
name="margin-bottom">5</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property name="tooltip_text" 
translatable="yes">Here you can see your progress in satisfying authorization 
challenges and possible next steps.</property>
+                                                <property 
name="margin_start">5</property>
+                                                <property 
name="margin_end">5</property>
+                                                <property 
name="margin_top">5</property>
+                                                <property 
name="margin_bottom">5</property>
                                                 <property name="label" 
translatable="yes">Select open challenge to solve:</property>
                                               </object>
                                             </child>
@@ -2400,30 +2419,44 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                         <child>
                                           <object class="GtkFrame">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">False</property>
-                                            <property 
name="label-xalign">0</property>
-                                            <property 
name="shadow-type">none</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property 
name="label_xalign">0</property>
+                                            <property 
name="shadow_type">none</property>
                                             <child>
                                               <object class="GtkAlignment">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property 
name="left-padding">12</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="left_padding">12</property>
                                                 <child>
                                                   <object 
class="GtkScrolledWindow">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="shadow-type">in</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="shadow_type">in</property>
                                                     <child>
                                                       <object 
class="GtkTreeView" id="anastasis_gtk_choose_policy_treeview">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">True</property>
-                                                        <property 
name="tooltip-text" translatable="yes">This table shows possible ways to 
recover the secret. For each policy, the challenges that must still be 
satisfied are listed.</property>
+                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="tooltip_text" translatable="yes">This table shows possible ways to 
recover the secret. For each policy, the challenges that must still be 
satisfied are listed.</property>
                                                         <property 
name="model">policy_review_treestore</property>
-                                                        <property 
name="enable-search">False</property>
-                                                        <property 
name="search-column">0</property>
+                                                        <property 
name="enable_search">False</property>
+                                                        <property 
name="search_column">0</property>
                                                         <child 
internal-child="selection">
                                                           <object 
class="GtkTreeSelection"/>
                                                         </child>
+                                                        <child>
+                                                          <object 
class="GtkTreeViewColumn" id="solved_column">
+                                                            <property 
name="sizing">autosize</property>
+                                                            <property 
name="title" translatable="yes">Solved</property>
+                                                            <child>
+                                                            <object 
class="GtkCellRendererToggle" id="solved_column2">
+                                                            <property 
name="activatable">False</property>
+                                                            </object>
+                                                            <attributes>
+                                                            <attribute 
name="active">8</attribute>
+                                                            </attributes>
+                                                            </child>
+                                                          </object>
+                                                        </child>
                                                         <child>
                                                           <object 
class="GtkTreeViewColumn" id="policy_name_column1">
                                                             <property 
name="resizable">True</property>
@@ -2487,12 +2520,12 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                             <child type="label">
                                               <object class="GtkLabel">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property name="tooltip-text" 
translatable="yes">This table shows possible ways to recover the secret. For 
each policy, the challenges that must still be satisfied are listed.</property>
-                                                <property 
name="margin-start">5</property>
-                                                <property 
name="margin-end">5</property>
-                                                <property 
name="margin-top">5</property>
-                                                <property 
name="margin-bottom">5</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property name="tooltip_text" 
translatable="yes">This table shows possible ways to recover the secret. For 
each policy, the challenges that must still be satisfied are listed.</property>
+                                                <property 
name="margin_start">5</property>
+                                                <property 
name="margin_end">5</property>
+                                                <property 
name="margin_top">5</property>
+                                                <property 
name="margin_bottom">5</property>
                                                 <property name="label" 
translatable="yes">Recovery policies:</property>
                                               </object>
                                             </child>
@@ -2510,11 +2543,11 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">5</property>
-                                    <property name="margin-bottom">5</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_start">5</property>
+                                    <property name="margin_end">5</property>
+                                    <property name="margin_top">5</property>
+                                    <property name="margin_bottom">5</property>
                                     <property name="label" 
translatable="yes">Select challenge to recover secret:</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -2530,48 +2563,48 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_enter_secret_frame">
-                                <property name="can-focus">False</property>
-                                <property name="label-xalign">0</property>
-                                <property name="shadow-type">none</property>
+                                <property name="can_focus">False</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkScrolledWindow" 
id="secret_frame_scrolled_window">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
+                                    <property name="can_focus">True</property>
                                     <property name="vexpand">True</property>
                                     <property 
name="hadjustment">secret_box_adjustmenth</property>
                                     <property 
name="vadjustment">secret_box_adjustmentv</property>
-                                    <property name="shadow-type">in</property>
-                                    <property 
name="propagate-natural-width">True</property>
-                                    <property 
name="propagate-natural-height">True</property>
+                                    <property name="shadow_type">in</property>
+                                    <property 
name="propagate_natural_width">True</property>
+                                    <property 
name="propagate_natural_height">True</property>
                                     <child>
                                       <object class="GtkViewport" 
id="secret_frame_viewport">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">False</property>
+                                        <property 
name="can_focus">False</property>
                                         <property 
name="hexpand">True</property>
                                         <property 
name="hadjustment">secret_box_adjustmenth</property>
                                         <property 
name="vadjustment">secret_box_adjustmentv</property>
                                         <child>
                                           <object class="GtkBox" 
id="secret_frame_main_vbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">False</property>
+                                            <property 
name="can_focus">False</property>
                                             <property 
name="valign">start</property>
-                                            <property 
name="margin-start">10</property>
-                                            <property 
name="margin-end">10</property>
-                                            <property 
name="margin-top">5</property>
-                                            <property 
name="margin-bottom">5</property>
+                                            <property 
name="margin_start">10</property>
+                                            <property 
name="margin_end">10</property>
+                                            <property 
name="margin_top">5</property>
+                                            <property 
name="margin_bottom">5</property>
                                             <property 
name="orientation">vertical</property>
                                             <property 
name="spacing">5</property>
-                                            <property 
name="baseline-position">top</property>
+                                            <property 
name="baseline_position">top</property>
                                             <child>
                                               <object class="GtkBox" 
id="secret_name_vbox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <property 
name="spacing">5</property>
                                                 <child>
                                                   <object class="GtkLabel">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <property 
name="halign">start</property>
                                                     <property 
name="valign">start</property>
                                                     <property name="label" 
translatable="yes">Secret's name</property>
@@ -2586,8 +2619,8 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                 <child>
                                                   <object class="GtkEntry" 
id="anastasis_gtk_secret_name_entry">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="has-focus">True</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="has_focus">True</property>
                                                     <signal name="changed" 
handler="anastasis_gtk_enter_secret_name_entry_changed_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
@@ -2600,7 +2633,7 @@ with &lt;a 
href="https://www.ngi.eu/ngi-projects/ledger/"&gt;funding&lt;/a&gt; f
                                                 <child>
                                                   <object class="GtkLabel" 
id="secret_name_explanation_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <property 
name="halign">start</property>
                                                     <property name="label" 
translatable="yes">Names should be unique, so that you can easily
 identify your secret later.</property>
@@ -2623,16 +2656,16 @@ identify your secret later.</property>
                                             <child>
                                               <object class="GtkBox" 
id="secret_entry_vbox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <child>
                                                   <object class="GtkBox">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="secret_text_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="halign">start</property>
                                                         <property name="label" 
translatable="yes">Provide secret as text</property>
                                                       </object>
@@ -2653,20 +2686,20 @@ identify your secret later.</property>
                                                 <child>
                                                   <object class="GtkBox">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkEntry" 
id="anastasis_gtk_enter_secret_entry">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">True</property>
+                                                        <property 
name="can_focus">True</property>
                                                         <property 
name="valign">start</property>
-                                                        <property 
name="margin-left">5</property>
-                                                        <property 
name="margin-right">5</property>
-                                                        <property 
name="margin-start">5</property>
-                                                        <property 
name="margin-end">5</property>
+                                                        <property 
name="margin_left">5</property>
+                                                        <property 
name="margin_right">5</property>
+                                                        <property 
name="margin_start">5</property>
+                                                        <property 
name="margin_end">5</property>
                                                         <property 
name="hexpand">True</property>
-                                                        <property 
name="primary-icon-stock">gtk-dialog-authentication</property>
-                                                        <property 
name="placeholder-text" translatable="yes">Type or paste your secret 
here</property>
-                                                        <property 
name="input-purpose">password</property>
+                                                        <property 
name="primary_icon_stock">gtk-dialog-authentication</property>
+                                                        <property 
name="placeholder_text" translatable="yes">Type or paste your secret 
here</property>
+                                                        <property 
name="input_purpose">password</property>
                                                         <signal name="changed" 
handler="anastasis_gtk_enter_secret_entry_changed_cb" swapped="no"/>
                                                       </object>
                                                       <packing>
@@ -2679,17 +2712,17 @@ identify your secret later.</property>
                                                     <child>
                                                       <object 
class="GtkButton" id="anastasis_gtk_secret_clear_text_button">
                                                         <property 
name="label">gtk-clear</property>
-                                                        <property 
name="can-focus">True</property>
-                                                        <property 
name="receives-default">True</property>
-                                                        <property 
name="use-stock">True</property>
-                                                        <property 
name="always-show-image">True</property>
+                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="receives_default">True</property>
+                                                        <property 
name="use_stock">True</property>
+                                                        <property 
name="always_show_image">True</property>
                                                         <signal name="clicked" 
handler="anastasis_gtk_secret_clear_button_clicked_cb" swapped="no"/>
                                                       </object>
                                                       <packing>
                                                         <property 
name="expand">False</property>
                                                         <property 
name="fill">True</property>
                                                         <property 
name="padding">5</property>
-                                                        <property 
name="pack-type">end</property>
+                                                        <property 
name="pack_type">end</property>
                                                         <property 
name="position">1</property>
                                                       </packing>
                                                     </child>
@@ -2704,19 +2737,19 @@ identify your secret later.</property>
                                                   <object class="GtkBox">
                                                     <property 
name="name">anastasis_gtk_enter_secret_file_box</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="margin-top">5</property>
-                                                    <property 
name="margin-bottom">5</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="margin_top">5</property>
+                                                    <property 
name="margin_bottom">5</property>
                                                     <property 
name="spacing">10</property>
                                                     <child>
                                                       <object class="GtkBox" 
id="anastasis_gtk_secret_file_chooser_hbox">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="spacing">5</property>
                                                         <child>
                                                           <object 
class="GtkLabel" id="secret_by_file_label">
                                                             <property 
name="visible">True</property>
-                                                            <property 
name="can-focus">False</property>
+                                                            <property 
name="can_focus">False</property>
                                                             <property 
name="label" translatable="yes">Or provide secret as a file:</property>
                                                           </object>
                                                           <packing>
@@ -2730,11 +2763,11 @@ identify your secret later.</property>
                                                           <object 
class="GtkButton" id="anastasis_gtk_enter_secret_open_button">
                                                             <property 
name="label">Choose file</property>
                                                             <property 
name="visible">True</property>
-                                                            <property 
name="can-focus">True</property>
-                                                            <property 
name="can-default">True</property>
-                                                            <property 
name="receives-default">True</property>
+                                                            <property 
name="can_focus">True</property>
+                                                            <property 
name="can_default">True</property>
+                                                            <property 
name="receives_default">True</property>
                                                             <property 
name="image">open_file_image</property>
-                                                            <property 
name="always-show-image">True</property>
+                                                            <property 
name="always_show_image">True</property>
                                                             <signal 
name="clicked" handler="anastasis_gtk_enter_secret_open_button_clicked_cb" 
swapped="no"/>
                                                           </object>
                                                           <packing>
@@ -2754,12 +2787,12 @@ identify your secret later.</property>
                                                     </child>
                                                     <child>
                                                       <object class="GtkBox" 
id="anastasis_gtk_secret_file_name_hbox">
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="spacing">5</property>
                                                         <child>
                                                           <object 
class="GtkLabel" id="secret_file_name_label">
                                                             <property 
name="visible">True</property>
-                                                            <property 
name="can-focus">False</property>
+                                                            <property 
name="can_focus">False</property>
                                                             <property 
name="label" translatable="yes">Your secret file:</property>
                                                           </object>
                                                           <packing>
@@ -2772,7 +2805,7 @@ identify your secret later.</property>
                                                         <child>
                                                           <object 
class="GtkLabel" id="anastasis_gtk_secret_file_name_label">
                                                             <property 
name="visible">True</property>
-                                                            <property 
name="can-focus">False</property>
+                                                            <property 
name="can_focus">False</property>
                                                             <property 
name="label">DYNAMICALLY GENERATED</property>
                                                             <attributes>
                                                             <attribute 
name="weight" value="bold"/>
@@ -2787,17 +2820,17 @@ identify your secret later.</property>
                                                         <child>
                                                           <object 
class="GtkButton" id="anastasis_gtk_secret_clear_file_button">
                                                             <property 
name="label">gtk-clear</property>
-                                                            <property 
name="can-focus">True</property>
-                                                            <property 
name="receives-default">True</property>
-                                                            <property 
name="use-stock">True</property>
-                                                            <property 
name="always-show-image">True</property>
+                                                            <property 
name="can_focus">True</property>
+                                                            <property 
name="receives_default">True</property>
+                                                            <property 
name="use_stock">True</property>
+                                                            <property 
name="always_show_image">True</property>
                                                             <signal 
name="clicked" handler="anastasis_gtk_secret_clear_button_clicked_cb" 
swapped="no"/>
                                                           </object>
                                                           <packing>
                                                             <property 
name="expand">False</property>
                                                             <property 
name="fill">True</property>
                                                             <property 
name="padding">5</property>
-                                                            <property 
name="pack-type">end</property>
+                                                            <property 
name="pack_type">end</property>
                                                             <property 
name="position">2</property>
                                                           </packing>
                                                         </child>
@@ -2827,15 +2860,15 @@ identify your secret later.</property>
                                             <child>
                                               <object class="GtkBox" 
id="expiration_vbox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="halign">start</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <property 
name="spacing">5</property>
-                                                <property 
name="baseline-position">top</property>
+                                                <property 
name="baseline_position">top</property>
                                                 <child>
                                                   <object class="GtkLabel" 
id="recovery_expiration_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <property name="label" 
translatable="yes">Your secret's recovery data expires on:</property>
                                                   </object>
                                                   <packing>
@@ -2848,11 +2881,11 @@ identify your secret later.</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="expiration_hbox">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="expiration_date_without_year_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="label">DYNAMICALLY SET</property>
                                                         <attributes>
                                                           <attribute 
name="weight" value="bold"/>
@@ -2867,11 +2900,11 @@ identify your secret later.</property>
                                                     <child>
                                                       <object 
class="GtkSpinButton" id="expiration_year_spin_button">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">True</property>
-                                                        <property 
name="max-length">4</property>
-                                                        <property 
name="width-chars">4</property>
-                                                        <property 
name="max-width-chars">4</property>
-                                                        <property 
name="input-purpose">digits</property>
+                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="max_length">4</property>
+                                                        <property 
name="width_chars">4</property>
+                                                        <property 
name="max_width_chars">4</property>
+                                                        <property 
name="input_purpose">digits</property>
                                                         <property 
name="adjustment">expiration_year_adjustment</property>
                                                         <property 
name="numeric">True</property>
                                                         <property 
name="value">9999</property>
@@ -2902,18 +2935,18 @@ identify your secret later.</property>
                                             <child>
                                               <object class="GtkBox" 
id="payment_info_vbox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <property 
name="spacing">10</property>
                                                 <child>
                                                   <object class="GtkBox" 
id="backup_free_hbox">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <property 
name="spacing">10</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="backup_fee_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property name="label" 
translatable="yes">Backup fee:</property>
                                                       </object>
                                                       <packing>
@@ -2926,7 +2959,7 @@ identify your secret later.</property>
                                                     <child>
                                                       <object class="GtkLabel" 
id="backup_fee_value_label">
                                                         <property 
name="visible">True</property>
-                                                        <property 
name="can-focus">False</property>
+                                                        <property 
name="can_focus">False</property>
                                                         <property 
name="label">DYNAMICALLY SET</property>
                                                         <attributes>
                                                           <attribute 
name="weight" value="bold"/>
@@ -2950,7 +2983,7 @@ identify your secret later.</property>
                                                 <child>
                                                   <object class="GtkLabel" 
id="backup_fee_explainer_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
                                                     <property 
name="halign">start</property>
                                                     <property name="label" 
translatable="yes">You pay this fee to back up your secret.
 The fee may increase with the expiry
@@ -2980,11 +3013,11 @@ date of your secret's recovery data.</property>
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">10</property>
-                                    <property 
name="margin-bottom">10</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_start">5</property>
+                                    <property name="margin_end">5</property>
+                                    <property name="margin_top">10</property>
+                                    <property 
name="margin_bottom">10</property>
                                     <property name="label" 
translatable="yes">Provide secret to backup:</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -3001,29 +3034,29 @@ date of your secret's recovery data.</property>
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_pay_frame">
-                                <property name="can-focus">False</property>
-                                <property name="label-xalign">0</property>
-                                <property name="shadow-type">none</property>
+                                <property name="can_focus">False</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-top">5</property>
-                                    <property name="left-padding">12</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_top">5</property>
+                                    <property name="left_padding">12</property>
                                     <child>
                                       <object class="GtkBox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">False</property>
+                                        <property 
name="can_focus">False</property>
                                         <property name="spacing">5</property>
                                         <child>
                                           <object class="GtkBox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">False</property>
+                                            <property 
name="can_focus">False</property>
                                             <property 
name="orientation">vertical</property>
                                             <child>
                                               <object class="GtkLabel">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property name="label" 
translatable="yes">Please pay with GNU Taler:</property>
                                               </object>
                                               <packing>
@@ -3036,22 +3069,22 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkBox" 
id="anastasis_gtk_main_window_unpaid_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property 
name="margin-left">5</property>
-                                                <property 
name="margin-right">5</property>
-                                                <property 
name="margin-start">5</property>
-                                                <property 
name="margin-end">5</property>
-                                                <property 
name="margin-top">5</property>
-                                                <property 
name="margin-bottom">5</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="margin_left">5</property>
+                                                <property 
name="margin_right">5</property>
+                                                <property 
name="margin_start">5</property>
+                                                <property 
name="margin_end">5</property>
+                                                <property 
name="margin_top">5</property>
+                                                <property 
name="margin_bottom">5</property>
                                                 <property 
name="orientation">vertical</property>
                                                 <property 
name="spacing">5</property>
                                                 <child>
                                                   <object class="GtkTreeView" 
id="unpaid_qr_treeview">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">True</property>
+                                                    <property 
name="can_focus">True</property>
                                                     <property 
name="model">unpaid_qrcodes_liststore</property>
-                                                    <property 
name="enable-search">False</property>
-                                                    <property 
name="search-column">1</property>
+                                                    <property 
name="enable_search">False</property>
+                                                    <property 
name="search_column">1</property>
                                                     <child 
internal-child="selection">
                                                       <object 
class="GtkTreeSelection" id="unpaid_qr_tree_selection">
                                                         <signal name="changed" 
handler="unpaid_qr_tree_selection_changed_cb" swapped="no"/>
@@ -3114,11 +3147,11 @@ date of your secret's recovery data.</property>
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-start">5</property>
-                                    <property name="margin-end">5</property>
-                                    <property name="margin-top">10</property>
-                                    <property name="margin-bottom">5</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_start">5</property>
+                                    <property name="margin_end">5</property>
+                                    <property name="margin_top">10</property>
+                                    <property name="margin_bottom">5</property>
                                     <property name="label" 
translatable="yes">Payment required:</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -3134,30 +3167,31 @@ date of your secret's recovery data.</property>
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_completed_frame">
-                                <property name="can-focus">False</property>
-                                <property name="label-xalign">0</property>
-                                <property name="shadow-type">none</property>
+                                <property name="can_focus">False</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-start">10</property>
-                                    <property name="margin-end">10</property>
-                                    <property name="margin-top">10</property>
-                                    <property 
name="margin-bottom">10</property>
-                                    <property name="left-padding">12</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_start">10</property>
+                                    <property name="margin_end">10</property>
+                                    <property name="margin_top">10</property>
+                                    <property 
name="margin_bottom">10</property>
+                                    <property name="left_padding">12</property>
                                     <child>
                                       <object class="GtkBox" 
id="anastasis_gtk_success_box">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">False</property>
+                                        <property 
name="can_focus">False</property>
                                         <child>
                                           <object class="GtkBox" 
id="anastasis_gtk_backup_complete_box">
                                             <property 
name="name">anastasis_gtk_backup_complete_box</property>
-                                            <property 
name="can-focus">False</property>
+                                            <property 
name="can_focus">False</property>
                                             <property 
name="orientation">vertical</property>
                                             <child>
                                               <object class="GtkLabel" 
id="anastasis_gtk_success_backup_label">
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="halign">start</property>
                                                 <property name="label" 
translatable="yes">Your backup is complete.</property>
                                                 <property 
name="justify">center</property>
                                                 <attributes>
@@ -3172,109 +3206,122 @@ date of your secret's recovery data.</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkLabel" 
id="anastasis_gtk_success_backup_version_label">
-                                                <property 
name="can-focus">False</property>
-                                                <property name="label" 
translatable="yes">Backups were made at the following providers:</property>
-                                              </object>
-                                              <packing>
-                                                <property 
name="expand">False</property>
-                                                <property 
name="fill">True</property>
-                                                <property 
name="padding">10</property>
-                                                <property 
name="position">1</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object 
class="GtkScrolledWindow">
+                                              <object class="GtkBox" 
id="recovery_expiration_box">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">True</property>
-                                                <property 
name="shadow-type">in</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="spacing">5</property>
                                                 <child>
-                                                  <object class="GtkTreeView" 
id="anastasis_gtk_backup_complete_treeview">
+                                                  <object class="GtkLabel" 
id="backup_expiration_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="model">backup_provider_liststore</property>
-                                                    <child 
internal-child="selection">
-                                                      <object 
class="GtkTreeSelection"/>
-                                                    </child>
-                                                    <child>
-                                                      <object 
class="GtkTreeViewColumn">
-                                                        <property 
name="sizing">autosize</property>
-                                                        <property name="title" 
translatable="yes">Provider</property>
-                                                        <child>
-                                                          <object 
class="GtkCellRendererText" id="provider_url"/>
-                                                          <attributes>
-                                                            <attribute 
name="text">0</attribute>
-                                                          </attributes>
-                                                        </child>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object 
class="GtkTreeViewColumn">
-                                                        <property 
name="spacing">5</property>
-                                                        <property 
name="sizing">autosize</property>
-                                                        <property name="title" 
translatable="yes">Version</property>
-                                                        <child>
-                                                          <object 
class="GtkCellRendererText" id="policy_version"/>
-                                                          <attributes>
-                                                            <attribute 
name="visible">3</attribute>
-                                                            <attribute 
name="text">1</attribute>
-                                                          </attributes>
-                                                        </child>
-                                                      </object>
-                                                    </child>
-                                                    <child>
-                                                      <object 
class="GtkTreeViewColumn">
-                                                        <property 
name="visible">False</property>
-                                                        <property name="title" 
translatable="yes">Expiration time</property>
-                                                        <child>
-                                                          <object 
class="GtkCellRendererText" id="expiration"/>
-                                                          <attributes>
-                                                            <attribute 
name="visible">3</attribute>
-                                                            <attribute 
name="text">2</attribute>
-                                                          </attributes>
-                                                        </child>
-                                                      </object>
-                                                    </child>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="halign">start</property>
+                                                    <property name="label" 
translatable="yes">Your backup is valid until:</property>
                                                   </object>
+                                                  <packing>
+                                                    <property 
name="expand">False</property>
+                                                    <property 
name="fill">True</property>
+                                                    <property 
name="padding">5</property>
+                                                    <property 
name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" 
id="backup_expiration_date_label">
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="label">DYNAMICALLY GENERATED</property>
+                                                    <attributes>
+                                                      <attribute name="weight" 
value="bold"/>
+                                                    </attributes>
+                                                  </object>
+                                                  <packing>
+                                                    <property 
name="expand">False</property>
+                                                    <property 
name="fill">True</property>
+                                                    <property 
name="position">1</property>
+                                                  </packing>
                                                 </child>
                                               </object>
                                               <packing>
                                                 <property 
name="expand">False</property>
                                                 <property 
name="fill">True</property>
-                                                <property 
name="padding">5</property>
+                                                <property 
name="padding">20</property>
                                                 <property 
name="position">2</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkBox" 
id="recovery_expiration_box">
+                                              <object class="GtkBox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="orientation">vertical</property>
-                                                <property 
name="spacing">5</property>
                                                 <child>
-                                                  <object class="GtkLabel" 
id="backup_expiration_label">
-                                                    <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                  <object class="GtkLabel" 
id="anastasis_gtk_success_backup_version_label">
+                                                    <property 
name="can_focus">False</property>
                                                     <property 
name="halign">start</property>
-                                                    <property name="label" 
translatable="yes">Your backup is valid until:</property>
+                                                    <property name="label" 
translatable="yes">Backups were made at the following providers:</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
                                                     <property 
name="fill">True</property>
-                                                    <property 
name="padding">5</property>
+                                                    <property 
name="padding">10</property>
                                                     <property 
name="position">0</property>
                                                   </packing>
                                                 </child>
                                                 <child>
-                                                  <object class="GtkLabel" 
id="backup_expiration_date_label">
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="label">DYNAMICALLY GENERATED</property>
-                                                    <attributes>
-                                                      <attribute name="weight" 
value="bold"/>
-                                                    </attributes>
+                                                  <object 
class="GtkScrolledWindow">
+                                                    <property 
name="visible">True</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="shadow_type">in</property>
+                                                    <child>
+                                                      <object 
class="GtkTreeView" id="anastasis_gtk_backup_complete_treeview">
+                                                        <property 
name="visible">True</property>
+                                                        <property 
name="can_focus">True</property>
+                                                        <property 
name="model">backup_provider_liststore</property>
+                                                        <property 
name="search_column">0</property>
+                                                        <child 
internal-child="selection">
+                                                          <object 
class="GtkTreeSelection"/>
+                                                        </child>
+                                                        <child>
+                                                          <object 
class="GtkTreeViewColumn">
+                                                            <property 
name="sizing">autosize</property>
+                                                            <property 
name="title" translatable="yes">Provider</property>
+                                                            <child>
+                                                            <object 
class="GtkCellRendererText" id="provider_url"/>
+                                                            <attributes>
+                                                            <attribute 
name="text">0</attribute>
+                                                            </attributes>
+                                                            </child>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object 
class="GtkTreeViewColumn">
+                                                            <property 
name="spacing">5</property>
+                                                            <property 
name="sizing">autosize</property>
+                                                            <property 
name="title" translatable="yes">Version</property>
+                                                            <child>
+                                                            <object 
class="GtkCellRendererText" id="policy_version"/>
+                                                            <attributes>
+                                                            <attribute 
name="visible">3</attribute>
+                                                            <attribute 
name="text">1</attribute>
+                                                            </attributes>
+                                                            </child>
+                                                          </object>
+                                                        </child>
+                                                        <child>
+                                                          <object 
class="GtkTreeViewColumn">
+                                                            <property 
name="visible">False</property>
+                                                            <property 
name="title" translatable="yes">Expiration time</property>
+                                                            <child>
+                                                            <object 
class="GtkCellRendererText" id="expiration"/>
+                                                            <attributes>
+                                                            <attribute 
name="visible">3</attribute>
+                                                            <attribute 
name="text">2</attribute>
+                                                            </attributes>
+                                                            </child>
+                                                          </object>
+                                                        </child>
+                                                      </object>
+                                                    </child>
                                                   </object>
                                                   <packing>
-                                                    <property 
name="expand">False</property>
+                                                    <property 
name="expand">True</property>
                                                     <property 
name="fill">True</property>
                                                     <property 
name="padding">5</property>
                                                     <property 
name="position">1</property>
@@ -3284,7 +3331,7 @@ date of your secret's recovery data.</property>
                                               <packing>
                                                 <property 
name="expand">True</property>
                                                 <property 
name="fill">True</property>
-                                                <property 
name="padding">20</property>
+                                                <property 
name="padding">10</property>
                                                 <property 
name="position">3</property>
                                               </packing>
                                             </child>
@@ -3298,13 +3345,14 @@ date of your secret's recovery data.</property>
                                         <child>
                                           <object class="GtkBox" 
id="anastasis_gtk_success_recovery_box">
                                             <property 
name="name">anastasis_gtk_success_recovery_box</property>
-                                            <property 
name="can-focus">False</property>
+                                            <property 
name="can_focus">False</property>
                                             <property 
name="orientation">vertical</property>
                                             <child>
                                               <object class="GtkLabel" 
id="anastasis_gtk_success_recovery_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property name="label" 
translatable="yes">Your secret was recovered:</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="halign">start</property>
+                                                <property name="label" 
translatable="yes">Your secret was recovered.</property>
                                                 <attributes>
                                                   <attribute name="weight" 
value="bold"/>
                                                 </attributes>
@@ -3317,83 +3365,101 @@ date of your secret's recovery data.</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkBox">
+                                              <object class="GtkBox" 
id="recovery_secret_name_hbox">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <child>
-                                                  <object class="GtkSeparator">
+                                                  <object class="GtkLabel">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property name="label" 
translatable="yes">Secret name:</property>
+                                                    <attributes>
+                                                      <attribute name="weight" 
value="bold"/>
+                                                    </attributes>
                                                   </object>
                                                   <packing>
-                                                    <property 
name="expand">True</property>
+                                                    <property 
name="expand">False</property>
                                                     <property 
name="fill">True</property>
+                                                    <property 
name="padding">5</property>
                                                     <property 
name="position">0</property>
                                                   </packing>
                                                 </child>
+                                                <child>
+                                                  <object class="GtkLabel" 
id="recovery_secret_name_value_label">
+                                                    <property 
name="visible">True</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="label">DYNAMICALLY GENERATED</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property 
name="expand">False</property>
+                                                    <property 
name="fill">True</property>
+                                                    <property 
name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                              <packing>
+                                                <property 
name="expand">False</property>
+                                                <property 
name="fill">True</property>
+                                                <property 
name="padding">10</property>
+                                                <property 
name="position">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkBox">
+                                                <property 
name="visible">True</property>
+                                                <property 
name="can_focus">False</property>
                                                 <child>
                                                   <object class="GtkLabel" 
id="anastasis_gtk_secret_value_label">
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="tooltip-text" translatable="yes">The secret is shown here. You can also 
copy it to the clipboard or save it to a file.</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="tooltip_text" translatable="yes">The secret is shown here. You can also 
copy it to the clipboard or save it to a file.</property>
                                                     <property name="label">THE 
SECRET TEXT</property>
                                                     <property 
name="wrap">True</property>
-                                                    <property 
name="wrap-mode">word-char</property>
+                                                    <property 
name="wrap_mode">word-char</property>
                                                     <property 
name="ellipsize">end</property>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
                                                     <property 
name="fill">True</property>
                                                     <property 
name="padding">10</property>
-                                                    <property 
name="position">1</property>
+                                                    <property 
name="position">0</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkButton" 
id="anastasis_gtk_secret_copy_button">
                                                     <property 
name="label">gtk-copy</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="can-default">True</property>
-                                                    <property 
name="receives-default">True</property>
-                                                    <property 
name="tooltip-text" translatable="yes">Copy secret to clipboard</property>
-                                                    <property 
name="use-stock">True</property>
-                                                    <property 
name="always-show-image">True</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="can_default">True</property>
+                                                    <property 
name="receives_default">True</property>
+                                                    <property 
name="tooltip_text" translatable="yes">Copy secret to clipboard</property>
+                                                    <property 
name="use_stock">True</property>
+                                                    <property 
name="always_show_image">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_secret_copy_button_clicked_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
                                                     <property 
name="fill">True</property>
                                                     <property 
name="padding">10</property>
-                                                    <property 
name="position">2</property>
+                                                    <property 
name="position">1</property>
                                                   </packing>
                                                 </child>
                                                 <child>
                                                   <object class="GtkButton" 
id="anastasis_gtk_secret_save_as_button">
                                                     <property 
name="label">gtk-save-as</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="receives-default">True</property>
-                                                    <property 
name="tooltip-text" translatable="yes">Save secret to file</property>
-                                                    <property 
name="use-stock">True</property>
-                                                    <property 
name="always-show-image">True</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="receives_default">True</property>
+                                                    <property 
name="tooltip_text" translatable="yes">Save secret to file</property>
+                                                    <property 
name="use_stock">True</property>
+                                                    <property 
name="always_show_image">True</property>
                                                     <signal name="clicked" 
handler="anastasis_gtk_secret_save_as_button_clicked_cb" swapped="no"/>
                                                   </object>
                                                   <packing>
                                                     <property 
name="expand">False</property>
                                                     <property 
name="fill">True</property>
                                                     <property 
name="padding">10</property>
-                                                    <property 
name="position">3</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkSeparator">
-                                                    <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property 
name="expand">True</property>
-                                                    <property 
name="fill">True</property>
-                                                    <property 
name="position">4</property>
+                                                    <property 
name="position">2</property>
                                                   </packing>
                                                 </child>
                                               </object>
@@ -3401,27 +3467,27 @@ date of your secret's recovery data.</property>
                                                 <property 
name="expand">False</property>
                                                 <property 
name="fill">True</property>
                                                 <property 
name="padding">5</property>
-                                                <property 
name="position">1</property>
+                                                <property 
name="position">2</property>
                                               </packing>
                                             </child>
                                             <child>
                                               <object class="GtkViewport">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="hexpand">True</property>
                                                 <property 
name="vexpand">True</property>
                                                 <child>
                                                   <object class="GtkImage" 
id="anastasis_gtk_secret_qr_image">
-                                                    <property 
name="width-request">400</property>
-                                                    <property 
name="height-request">400</property>
+                                                    <property 
name="width_request">400</property>
+                                                    <property 
name="height_request">400</property>
                                                     <property 
name="visible">True</property>
-                                                    <property 
name="can-focus">False</property>
-                                                    <property 
name="margin-left">10</property>
-                                                    <property 
name="margin-right">10</property>
-                                                    <property 
name="margin-start">10</property>
-                                                    <property 
name="margin-end">10</property>
-                                                    <property 
name="margin-top">10</property>
-                                                    <property 
name="margin-bottom">10</property>
+                                                    <property 
name="can_focus">False</property>
+                                                    <property 
name="margin_left">10</property>
+                                                    <property 
name="margin_right">10</property>
+                                                    <property 
name="margin_start">10</property>
+                                                    <property 
name="margin_end">10</property>
+                                                    <property 
name="margin_top">10</property>
+                                                    <property 
name="margin_bottom">10</property>
                                                     <property 
name="hexpand">True</property>
                                                     <property 
name="vexpand">True</property>
                                                     <property 
name="stock">gtk-missing-image</property>
@@ -3432,9 +3498,12 @@ date of your secret's recovery data.</property>
                                                 <property 
name="expand">True</property>
                                                 <property 
name="fill">True</property>
                                                 <property 
name="padding">5</property>
-                                                <property 
name="position">2</property>
+                                                <property 
name="position">3</property>
                                               </packing>
                                             </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
                                           </object>
                                           <packing>
                                             <property 
name="expand">True</property>
@@ -3449,11 +3518,11 @@ date of your secret's recovery data.</property>
                                 <child type="label">
                                   <object class="GtkLabel" 
id="anastasis_gtk_backup_success_label">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="margin-start">10</property>
-                                    <property name="margin-end">10</property>
-                                    <property name="margin-top">10</property>
-                                    <property 
name="margin-bottom">10</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="margin_start">10</property>
+                                    <property name="margin_end">10</property>
+                                    <property name="margin_top">10</property>
+                                    <property 
name="margin_bottom">10</property>
                                     <property name="label" 
translatable="yes">Success!</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -3470,32 +3539,32 @@ date of your secret's recovery data.</property>
                             </child>
                             <child>
                               <object class="GtkFrame" 
id="anastasis_gtk_select_secret_frame">
-                                <property name="can-focus">False</property>
-                                <property name="label-xalign">0</property>
-                                <property name="shadow-type">none</property>
+                                <property name="can_focus">False</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkAlignment">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
-                                    <property name="left-padding">12</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="left_padding">12</property>
                                     <child>
                                       <object class="GtkBox" 
id="anastasis_gtk_secret_select_vbox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can-focus">False</property>
+                                        <property 
name="can_focus">False</property>
                                         <property 
name="orientation">vertical</property>
                                         <property name="spacing">10</property>
                                         <child>
                                           <object class="GtkBox" 
id="provider_selection_vbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">False</property>
+                                            <property 
name="can_focus">False</property>
                                             <property 
name="halign">start</property>
                                             <property 
name="orientation">vertical</property>
                                             <property 
name="spacing">5</property>
                                             <child>
                                               <object class="GtkLabel" 
id="anastasis_gtk_provider_url_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property name="tooltip-text" 
translatable="yes">This is the URL of the provider from which we downloaded the 
recovery document.</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property name="tooltip_text" 
translatable="yes">This is the URL of the provider from which we downloaded the 
recovery document.</property>
                                                 <property 
name="halign">start</property>
                                                 <property name="label" 
translatable="yes">Select a provider</property>
                                               </object>
@@ -3509,21 +3578,21 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkComboBoxText" 
id="anastasis_gtk_provider_url_combo_box_text">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property 
name="margin-left">5</property>
-                                                <property 
name="margin-right">5</property>
-                                                <property 
name="margin-start">5</property>
-                                                <property 
name="margin-end">5</property>
-                                                <property 
name="margin-top">5</property>
-                                                <property 
name="margin-bottom">5</property>
-                                                <property 
name="has-entry">True</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="margin_left">5</property>
+                                                <property 
name="margin_right">5</property>
+                                                <property 
name="margin_start">5</property>
+                                                <property 
name="margin_end">5</property>
+                                                <property 
name="margin_top">5</property>
+                                                <property 
name="margin_bottom">5</property>
+                                                <property 
name="has_entry">True</property>
                                                 <child internal-child="entry">
                                                   <object class="GtkEntry" 
id="anastasis_gtk_provider_url_entry">
-                                                    <property 
name="can-focus">True</property>
-                                                    <property 
name="max-length">1024</property>
-                                                    <property 
name="width-chars">32</property>
-                                                    <property 
name="placeholder-text" translatable="yes">https://</property>
-                                                    <property 
name="input-purpose">url</property>
+                                                    <property 
name="can_focus">True</property>
+                                                    <property 
name="max_length">1024</property>
+                                                    <property 
name="width_chars">32</property>
+                                                    <property 
name="placeholder_text" translatable="yes">https://</property>
+                                                    <property 
name="input_purpose">url</property>
                                                     <signal name="changed" 
handler="anastasis_gtk_provider_url_entry_changed_cb" swapped="no"/>
                                                   </object>
                                                 </child>
@@ -3546,14 +3615,14 @@ date of your secret's recovery data.</property>
                                         <child>
                                           <object class="GtkBox" 
id="backup_version_selection_vbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">False</property>
+                                            <property 
name="can_focus">False</property>
                                             <property 
name="halign">start</property>
                                             <property 
name="orientation">vertical</property>
                                             <child>
                                               <object class="GtkLabel" 
id="anastasis_gtk_backup_version_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
-                                                <property name="tooltip-text" 
translatable="yes">This is the version of the backup at the provider. By 
default, the latest available backup version is obtained.</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property name="tooltip_text" 
translatable="yes">This is the version of the backup at the provider. By 
default, the latest available backup version is obtained.</property>
                                                 <property 
name="halign">start</property>
                                                 <property name="label" 
translatable="yes">Select a backup version</property>
                                               </object>
@@ -3566,13 +3635,13 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkSpinButton" 
id="anastasis_gtk_policy_version_spin_button">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">True</property>
-                                                <property 
name="margin-right">5</property>
-                                                <property 
name="margin-end">5</property>
+                                                <property 
name="can_focus">True</property>
+                                                <property 
name="margin_right">5</property>
+                                                <property 
name="margin_end">5</property>
                                                 <property name="text" 
translatable="yes">0</property>
-                                                <property 
name="input-purpose">number</property>
+                                                <property 
name="input_purpose">number</property>
                                                 <property 
name="adjustment">policy_version_adjustment</property>
-                                                <property 
name="climb-rate">1</property>
+                                                <property 
name="climb_rate">1</property>
                                                 <property 
name="numeric">True</property>
                                                 <signal name="changed" 
handler="anastasis_gtk_policy_version_spin_button_changed_cb" swapped="no"/>
                                               </object>
@@ -3586,7 +3655,7 @@ date of your secret's recovery data.</property>
                                             <child>
                                               <object class="GtkLabel" 
id="backup_version_explainer_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property name="label" 
translatable="yes">To see other backup versions,
 choose a different provider.</property>
                                                 <attributes>
@@ -3611,14 +3680,14 @@ choose a different provider.</property>
                                         <child>
                                           <object class="GtkBox" 
id="anastasis_gtk_secret_identification_vbox">
                                             <property 
name="visible">True</property>
-                                            <property 
name="can-focus">False</property>
+                                            <property 
name="can_focus">False</property>
                                             <property 
name="halign">start</property>
                                             <property 
name="orientation">vertical</property>
                                             <property 
name="spacing">5</property>
                                             <child>
                                               <object class="GtkLabel" 
id="secret_name_explainer_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="halign">start</property>
                                                 <property name="label" 
translatable="yes">The secret name associated with this backup version 
is:</property>
                                               </object>
@@ -3632,7 +3701,7 @@ choose a different provider.</property>
                                             <child>
                                               <object class="GtkLabel" 
id="anastasis_gtk_secret_name_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="label">COMPUTATIONALLY GENERATED</property>
                                                 <attributes>
                                                   <attribute name="weight" 
value="bold"/>
@@ -3647,7 +3716,7 @@ choose a different provider.</property>
                                             <child>
                                               <object class="GtkLabel" 
id="secret_recovery_change_explainer_label">
                                                 <property 
name="visible">True</property>
-                                                <property 
name="can-focus">False</property>
+                                                <property 
name="can_focus">False</property>
                                                 <property 
name="halign">start</property>
                                                 <property name="label" 
translatable="yes">If this is not the secret you want to recover,
 select a different provider or backup version.</property>
@@ -3677,7 +3746,7 @@ select a different provider or backup version.</property>
                                 <child type="label">
                                   <object class="GtkLabel">
                                     <property name="visible">True</property>
-                                    <property name="can-focus">False</property>
+                                    <property name="can_focus">False</property>
                                     <property name="label" 
translatable="yes">Select secret to recover</property>
                                     <attributes>
                                       <attribute name="weight" value="bold"/>
@@ -3714,12 +3783,12 @@ select a different provider or backup 
version.</property>
             </child>
             <child>
               <object class="GtkBox" id="anastasis_gtk_illustration_vbox">
-                <property name="can-focus">False</property>
+                <property name="can_focus">False</property>
                 <property name="vexpand">True</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkImage" 
id="anastasis_gtk_continent_selection_image">
-                    <property name="can-focus">False</property>
+                    <property name="can_focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3731,8 +3800,8 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" 
id="anastasis_gtk_country_selection_image">
-                    <property name="width-request">100</property>
-                    <property name="can-focus">False</property>
+                    <property name="width_request">100</property>
+                    <property name="can_focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3744,7 +3813,7 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" 
id="anastasis_gtk_user_attributes_image">
-                    <property name="can-focus">False</property>
+                    <property name="can_focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3756,7 +3825,7 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" 
id="anastasis_gtk_b_authentication_methods_image">
-                    <property name="can-focus">False</property>
+                    <property name="can_focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3768,7 +3837,7 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" id="anastasis_gtk_b_policies_image">
-                    <property name="can-focus">False</property>
+                    <property name="can_focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3780,7 +3849,7 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" 
id="anastasis_gtk_enter_secret_image">
-                    <property name="can-focus">False</property>
+                    <property name="can_focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3792,7 +3861,7 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" id="anastasis_gtk_pay_image">
-                    <property name="can-focus">False</property>
+                    <property name="can_focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3804,7 +3873,7 @@ select a different provider or backup version.</property>
                 </child>
                 <child>
                   <object class="GtkImage" id="anastasis_gtk_completed_image">
-                    <property name="can-focus">False</property>
+                    <property name="can_focus">False</property>
                     <property name="vexpand">True</property>
                     <property name="stock">gtk-missing-image</property>
                   </object>
@@ -3830,16 +3899,16 @@ select a different provider or backup 
version.</property>
         </child>
         <child>
           <object class="GtkBox" id="anastasis_gtk_main_control_vbox">
-            <property name="can-focus">False</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" 
id="anastasis_gtk_main_window_prev_button">
                 <property name="label">gtk-go-back</property>
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="can-default">True</property>
-                <property name="receives-default">True</property>
-                <property name="use-stock">True</property>
-                <property name="always-show-image">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <property name="always_show_image">True</property>
                 <signal name="clicked" 
handler="anastasis_gtk_main_window_back_clicked" swapped="no"/>
               </object>
               <packing>
@@ -3852,12 +3921,12 @@ select a different provider or backup 
version.</property>
             <child>
               <object class="GtkButton" id="anastasis_gtk_restart_button">
                 <property name="label" translatable="yes">_Restart</property>
-                <property name="can-focus">True</property>
-                <property name="receives-default">True</property>
-                <property name="tooltip-text" translatable="yes">Go back to 
the beginning.</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Go back to 
the beginning.</property>
                 <property name="image">restart_image</property>
-                <property name="use-underline">True</property>
-                <property name="always-show-image">True</property>
+                <property name="use_underline">True</property>
+                <property name="always_show_image">True</property>
                 <signal name="clicked" 
handler="anastasis_gtk_restart_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
@@ -3869,7 +3938,7 @@ select a different provider or backup version.</property>
             <child>
               <object class="GtkSeparator">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -3881,11 +3950,11 @@ select a different provider or backup 
version.</property>
             <child>
               <object class="GtkButton" 
id="anastasis_gtk_main_window_quit_button">
                 <property name="label">gtk-quit</property>
-                <property name="can-focus">True</property>
-                <property name="can-default">True</property>
-                <property name="receives-default">True</property>
-                <property name="use-stock">True</property>
-                <property name="always-show-image">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <property name="always_show_image">True</property>
                 <signal name="clicked" 
handler="anastasis_gtk_main_window_quit_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
@@ -3898,7 +3967,7 @@ select a different provider or backup version.</property>
             <child>
               <object class="GtkSeparator">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -3911,11 +3980,11 @@ select a different provider or backup 
version.</property>
               <object class="GtkButton" 
id="anastasis_gtk_main_window_save_as_button">
                 <property name="label">gtk-save-as</property>
                 <property name="visible">True</property>
-                <property name="can-focus">True</property>
-                <property name="can-default">True</property>
-                <property name="receives-default">True</property>
-                <property name="use-stock">True</property>
-                <property name="always-show-image">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <property name="always_show_image">True</property>
                 <signal name="clicked" 
handler="anastasis_gtk_main_window_save_as_button_clicked_cb" swapped="no"/>
               </object>
               <packing>
@@ -3930,12 +3999,12 @@ select a different provider or backup 
version.</property>
                 <property name="label">gtk-media-next</property>
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
-                <property name="can-focus">False</property>
-                <property name="can-default">True</property>
-                <property name="has-default">True</property>
-                <property name="receives-default">True</property>
-                <property name="use-stock">True</property>
-                <property name="always-show-image">True</property>
+                <property name="can_focus">False</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <property name="always_show_image">True</property>
                 <signal name="clicked" 
handler="anastasis_gtk_main_window_forward_clicked" swapped="no"/>
               </object>
               <packing>
@@ -3955,7 +4024,7 @@ select a different provider or backup version.</property>
         <child>
           <object class="GtkStatusbar" id="anastasis_gtk_statusbar">
             <property name="visible">True</property>
-            <property name="can-focus">False</property>
+            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">8</property>
           </object>
diff --git a/src/anastasis/anastasis-gtk_action.c 
b/src/anastasis/anastasis-gtk_action.c
index 0e1686d..0e605cf 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -1666,8 +1666,26 @@ action_backup_finished (void)
       true,
       -1);
   }
-  update_label ("backup_expiration_date_label",
-                GNUNET_STRINGS_absolute_time_to_string (mexp));
+  {
+    struct tm tv;
+    char estr[128];
+    time_t t;
+
+    /* be more conservative in what we show */
+    mexp = GNUNET_TIME_absolute_subtract (mexp,
+                                         GNUNET_TIME_UNIT_DAYS);
+    t = mexp.abs_value_us / GNUNET_TIME_UNIT_SECONDS.rel_value_us;
+    GNUNET_assert (NULL !=
+                   localtime_r (&t,
+                                &tv));
+    GNUNET_assert (sizeof (estr) >
+                   strftime (estr,
+                             sizeof (estr),
+                             "%d %B %Y",
+                             &tv));
+    update_label ("backup_expiration_date_label",
+                 GNUNET_STRINGS_absolute_time_to_string (mexp));
+  }
   AG_hide ("anastasis_gtk_progress_vbox");
   AG_hide ("anastasis_gtk_backup_progress_scrolled_window");
   AG_show ("anastasis_gtk_completed_frame");
@@ -2252,6 +2270,7 @@ action_challenge_selecting (void)
         AG_CSM_NOT_SOLVED, true,
         AG_CSM_TYPE, type,
         AG_CSM_INSTRUCTIONS, instructions,
+       AG_CSM_PROVIDER_URL, provider,
         -1);
     }
   }
@@ -2297,6 +2316,7 @@ action_challenge_selecting (void)
         const char *type;
         const char *provider;
         const char *instructions;
+       bool solved = false;
         struct GNUNET_JSON_Specification cspec[] = {
           GNUNET_JSON_spec_string ("type",
                                    &type),
@@ -2304,6 +2324,9 @@ action_challenge_selecting (void)
                                    &provider),
           GNUNET_JSON_spec_string ("instructions",
                                    &instructions),
+         GNUNET_JSON_spec_mark_optional (
+            GNUNET_JSON_spec_bool ("solved",
+                                  &solved)),
           GNUNET_JSON_spec_end ()
         };
         struct TALER_Amount recovery_cost;
@@ -2316,15 +2339,6 @@ action_challenge_selecting (void)
           AG_error ("Policy did not parse correctly");
           return;
         }
-        {
-          const json_t *ks;
-
-          ks = json_object_get (cs,
-                                "key_share");
-          if ( (NULL != ks) &&
-               (! json_is_null (ks)) )
-            continue; /* already solved */
-        }
         if (GNUNET_OK !=
             GNUNET_JSON_parse (cs,
                                cspec,
@@ -2356,6 +2370,8 @@ action_challenge_selecting (void)
                                            TALER_amount2s (&recovery_cost),
                                            AG_PRMC_PROVIDER_URL,
                                            provider,
+                                          AG_PRMC_WAS_SOLVED,
+                                          solved,
                                            -1);
         if (NULL == summary)
         {
@@ -2863,10 +2879,11 @@ action_challenge_solving (void)
 static void
 action_recovery_finished (void)
 {
-  const char *mime;
-  const char *text;
-  void *data;
-  size_t data_size;
+  const char *mime = NULL;
+  const char *text = NULL;
+  const char *name = NULL;
+  void *data = NULL;
+  size_t data_size = 0;
   const json_t *cs;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_mark_optional (
@@ -2885,6 +2902,10 @@ action_recovery_finished (void)
   GtkImage *img;
 
   AG_hide_all_frames ();
+  name = json_string_value (json_object_get (json_object_get (AG_redux_state,
+                                                             
"recovery_information"),
+                                            "secret_name"));
+
   cs = json_object_get (AG_redux_state,
                         "core_secret");
   GNUNET_assert (NULL != cs);
@@ -2895,6 +2916,13 @@ action_recovery_finished (void)
   AG_hide ("anastasis_gtk_secret_copy_button");
   update_label ("anastasis_gtk_secret_value_label",
                 text);
+  if ( (NULL != name) &&
+       (0 != strlen (name)) )
+    update_label ("recovery_secret_name_value_label",
+                 name);
+  else
+    update_label ("recovery_secret_name_value_label",
+                 _("You did not name this secret"));
   if ( (0 == strncasecmp (mime,
                           "text/",
                           strlen ("text/"))) ||
diff --git a/src/anastasis/anastasis-gtk_helper.h 
b/src/anastasis/anastasis-gtk_helper.h
index 4feda9a..28ddc74 100644
--- a/src/anastasis/anastasis-gtk_helper.h
+++ b/src/anastasis/anastasis-gtk_helper.h
@@ -146,7 +146,12 @@ enum AG_ChallengeStatusModelColumns
   /**
    * A gchararray
    */
-  AG_CSM_INSTRUCTIONS = 14
+  AG_CSM_INSTRUCTIONS = 14,
+
+  /**
+   * A gchararray
+   */
+  AG_CSM_PROVIDER_URL = 15
 
 };
 
@@ -304,7 +309,13 @@ enum AG_PolicyReviewModelColumns
   /**
    * A guint.
    */
-  AG_PRMC_METHOD_INDEX = 7
+  AG_PRMC_METHOD_INDEX = 7,
+
+  /**
+   * A gboolean. True on lines representing solved challenges.
+   */
+  AG_PRMC_WAS_SOLVED
+
 };
 
 

-- 
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]