Import Upstream version 0.4.1

1 files changed, 7 insertions, 1 deletions

diff --git a/report.c b/report.c
index 990abd8b..db2a02e3 100644
--- a/report.c
+++ b/report.c
@@ -116,7 +116,9 @@ report_html_table(ReportContext *ctx, gchar *text)
 
                     if (g_str_equal(value, "...")) {
                         g_free(value);
-                        value = ctx->entry->fieldfunc(key);
+                        if (!(value = ctx->entry->fieldfunc(key))) {
+                            value = g_strdup("...");
+                        }
                     }
 
                     if (*key == '$') {
@@ -194,8 +196,11 @@ report_get_filename(void)
                                          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                          GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
                                          NULL);
+#if GTK_CHECK_VERSION(2,8,0)
     gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(dialog),
                                                    TRUE);
+#endif                                                   
+                                                   
     gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog),
                                       "hardinfo report.html");
     
@@ -434,6 +439,7 @@ static ReportDialog
     gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog1_action_area),
 			      GTK_BUTTONBOX_END);
 
+
     button8 = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
     gtk_widget_show(button8);
     gtk_dialog_add_action_widget(GTK_DIALOG(dialog), button8,