1 files changed, 27 insertions, 28 deletions

diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c
index 667c9328..bfb82a72 100644
--- a/src/gui-wizard-gtk/wizard.c
+++ b/src/gui-wizard-gtk/wizard.c
@@ -18,7 +18,7 @@ GtkLabel *g_lbl_cd_reason;
 GtkTextView *g_tv_backtrace;
 GtkTreeView *g_tv_details;
 GtkListStore *g_ls_details;
-GtkBox *g_box_warnings_area;
+GtkWidget *g_widget_warnings_area;
 GtkBox *g_box_warning_labels;
 GtkToggleButton * g_tb_approve_bt;
 
@@ -358,7 +358,7 @@ static void create_details_treeview()
 /* wizard.glade file as a string WIZARD_GLADE_CONTENTS: */
 #include "wizard_glade.c"
 
-static void add_pages()
+static void add_pages(void)
 {
     GError *error = NULL;
     if (!g_glade_file)
@@ -411,12 +411,11 @@ static void add_pages()
     g_tv_report_log = GTK_TEXT_VIEW(gtk_builder_get_object(builder, "tv_report_log"));
     g_tv_backtrace = GTK_TEXT_VIEW(gtk_builder_get_object(builder, "tv_backtrace"));
     g_tv_details = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tv_details"));
-    g_box_warnings_area = GTK_BOX(gtk_builder_get_object(builder, "hb_warnings_area"));
-    /* hide the warnings by default */
-    gtk_widget_hide(GTK_WIDGET(g_box_warnings_area));
     g_box_warning_labels = GTK_BOX(gtk_builder_get_object(builder, "hb_warning_labels"));
     g_tb_approve_bt = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "cb_approve_bt"));
-
+    g_widget_warnings_area = GTK_WIDGET(gtk_builder_get_object(builder, "hb_warnings_area"));
+    ///* hide the warnings by default */
+    //gtk_widget_hide(g_widget_warnings_area);
 }
 
 static void add_warning(const char *warning)
@@ -426,32 +425,34 @@ static void add_warning(const char *warning)
     gtk_misc_set_alignment(GTK_MISC(warning_lbl), 0.0, 0.0);
     gtk_label_set_justify(GTK_LABEL(warning_lbl), GTK_JUSTIFY_LEFT);
     gtk_box_pack_start(g_box_warning_labels, warning_lbl, false, false, 0);
-    gtk_widget_show(GTK_WIDGET(warning_lbl));
+    gtk_widget_show(warning_lbl);
     /* should be safe to free it, gtk calls strdup() to copy it */
     free(label_str);
 }
 
-static void check_backtrace_and_allow_send()
+static void check_backtrace_and_allow_send(void)
 {
     bool send = true;
-    gtk_widget_hide(GTK_WIDGET(g_box_warnings_area));
+
     /* erase all warnings */
+    gtk_widget_hide(g_widget_warnings_area);
     gtk_container_foreach(GTK_CONTAINER(g_box_warning_labels), &remove_child_widget, NULL);
-    /* FIXME: this should be bind to a reporter not to a compoment
+
+    /*
+     * FIXME: this should be bind to a reporter not to a compoment
      * but we don't rate oopses, so for now we skip the "kernel" manually
      */
     const char *component = get_crash_item_content_or_NULL(g_cd, FILENAME_COMPONENT);
-    if(strcmp(component, "kernel") != 0)
+    if (strcmp(component, "kernel") != 0)
     {
         const char *rating = get_crash_item_content_or_NULL(g_cd, FILENAME_RATING);
-        switch(*rating)
+        if (rating) switch (*rating)
         {
             case '4': //bt is ok - no warning here
-VERB2 log("rating is 4\n");
                 break;
             case '3': //bt is usable, but not complete, so show a warning
-VERB2 log("rating is 3 - adding warning");
                 add_warning(_("The backtrace is incomplete, please make sure you provide the steps to reproduce."));
+                send = false;
                 break;
             case '2':
             case '1':
@@ -462,21 +463,18 @@ VERB2 log("rating is 3 - adding warning");
         }
     }
 
-    if(!gtk_toggle_button_get_active(g_tb_approve_bt))
+    if (!gtk_toggle_button_get_active(g_tb_approve_bt))
     {
-VERB2 log("bt is not approved");
         add_warning(_("You should check the backtrace for sensitive data."));
         add_warning(_("You must agree with sending the backtrace."));
         send = false;
     }
 
-    //use a variable like bool show_warnings instead of this??
-    if(g_list_length(gtk_container_get_children(GTK_CONTAINER(g_box_warning_labels))) > 0)
-        gtk_widget_show(GTK_WIDGET(g_box_warnings_area));
-
     gtk_assistant_set_page_complete(g_assistant,
                                     pages[PAGENO_BACKTRACE_APPROVAL].page_widget,
                                     send);
+    if (!send)
+        gtk_widget_show(g_widget_warnings_area);
 }
 
 static void on_bt_approve_toggle(GtkToggleButton *togglebutton, gpointer user_data)
@@ -484,23 +482,18 @@ static void on_bt_approve_toggle(GtkToggleButton *togglebutton, gpointer user_da
     check_backtrace_and_allow_send();
 }
 
-void on_page_prepare(GtkAssistant *assistant, GtkWidget *page, gpointer user_data)
+static void on_page_prepare(GtkAssistant *assistant, GtkWidget *page, gpointer user_data)
 {
     //FIXME: move some of this to the add_pages??
-    if(pages[PAGENO_SUMMARY].page_widget == page)
+    if (pages[PAGENO_SUMMARY].page_widget == page)
     {
         /* the first page doesn't require any action to be completed,
-         * so lets make it complete and enable the "Forawrd" button
+         * so lets make it complete and enable the "Forward" button
          */
         gtk_assistant_set_page_complete(assistant, page, true);
     }
     if (pages[PAGENO_BACKTRACE_APPROVAL].page_widget == page)
     {
-        g_signal_connect(g_tb_approve_bt, "toggled", G_CALLBACK(on_bt_approve_toggle), NULL);
-        gtk_assistant_set_page_complete(g_assistant,
-            pages[PAGENO_BACKTRACE_APPROVAL].page_widget,
-            false
-            );
         check_backtrace_and_allow_send();
     }
 }
@@ -531,4 +524,10 @@ void create_assistant()
     gtk_tree_view_set_model(g_tv_details, GTK_TREE_MODEL(g_ls_details));
 
     gtk_builder_connect_signals(builder, NULL);
+
+    g_signal_connect(g_tb_approve_bt, "toggled", G_CALLBACK(on_bt_approve_toggle), NULL);
+    gtk_assistant_set_page_complete(g_assistant,
+                pages[PAGENO_BACKTRACE_APPROVAL].page_widget,
+                gtk_toggle_button_get_active(g_tb_approve_bt)
+    );
 }