From 189ea5682da7e646ffe2d56630016f19a9d786dc Mon Sep 17 00:00:00 2001 From: Alfons Hoogervorst Date: Mon, 24 Sep 2001 18:41:31 +0000 Subject: [PATCH] more plumbing in Hoa's code (can't wait to have all these settings moved into folderlist.xml) --- ChangeLog.claws | 6 ++++++ src/prefs_folder_item.c | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index 34f273e0a..1543c1f88 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,9 @@ +2001-09-24 [alfons] + + * src/prefs_folder_item.c + add check for item->prefs->default_to string is NULL and + add another check when freeing this string + 2001-09-24 [paul] * configure.in diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c index f716c8e8c..038fca1e5 100644 --- a/src/prefs_folder_item.c +++ b/src/prefs_folder_item.c @@ -180,7 +180,8 @@ PrefsFolderItem * prefs_folder_item_new(void) void prefs_folder_item_free(PrefsFolderItem * prefs) { - g_free(prefs->default_to); + if (prefs->default_to) + g_free(prefs->default_to); if (prefs->scoring != NULL) prefs_scoring_free(prefs->scoring); g_free(prefs); @@ -215,6 +216,9 @@ gint prefs_folder_item_get_sort_type(FolderItem * item) return GTK_SORT_ASCENDING; } +#define SAFE_STRING(str) \ + (str) ? (str) : "" + void prefs_folder_item_create(FolderItem *item) { struct PrefsFolderItemDialog *dialog; GtkWidget *window; @@ -266,7 +270,7 @@ void prefs_folder_item_create(FolderItem *item) { PACK_CHECK_BUTTON(vbox, checkbtn_request_return_receipt, _("Request Return Receipt")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_request_return_receipt), - item->ret_rcpt); + item->ret_rcpt ? TRUE : FALSE); /* Default To */ hbox = gtk_hbox_new(FALSE, 8); @@ -283,7 +287,7 @@ void prefs_folder_item_create(FolderItem *item) { gtk_widget_show(entry_default_to); gtk_box_pack_start(GTK_BOX(hbox), entry_default_to, FALSE, FALSE, 0); gtk_editable_set_editable(GTK_EDITABLE(entry_default_to), item->prefs->enable_default_to); - gtk_entry_set_text(GTK_ENTRY(entry_default_to), item->prefs->default_to); + gtk_entry_set_text(GTK_ENTRY(entry_default_to), SAFE_STRING(item->prefs->default_to)); /* Folder chmod */ hbox = gtk_hbox_new(FALSE, 8); -- 2.25.1