From a53fac33f277695542135f062b9776b36367adf9 Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Fri, 11 Jan 2002 15:48:52 +0000 Subject: [PATCH] Don't set the value if it is NULL 2002-01-11 Bradford Hovinen * service-info.c (set_string): Don't set the value if it is NULL * service-edit-dialog.c (store_data): Call service_info_save --- capplets/file-types/ChangeLog | 4 ++++ capplets/file-types/TODO_NOTES | 1 + capplets/file-types/service-edit-dialog.c | 1 + capplets/file-types/service-info.c | 3 +++ 4 files changed, 9 insertions(+) diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog index f198656c1..0efe9dbb8 100644 --- a/capplets/file-types/ChangeLog +++ b/capplets/file-types/ChangeLog @@ -1,5 +1,9 @@ 2002-01-11 Bradford Hovinen + * service-info.c (set_string): Don't set the value if it is NULL + + * service-edit-dialog.c (store_data): Call service_info_save + * mime-edit-dialog.c (add_ext_cb): Terminate column list with -1 * service-edit-dialog.c (store_data): Call service_info_update diff --git a/capplets/file-types/TODO_NOTES b/capplets/file-types/TODO_NOTES index abee746fc..bc5a58cbc 100644 --- a/capplets/file-types/TODO_NOTES +++ b/capplets/file-types/TODO_NOTES @@ -16,3 +16,4 @@ CVS Surgery - Move default-apps to control-center-plus - Rename .glade files in standard convention (gnome-xxx-properties.glade) - Rename primary .c files in standard convention (gnome-xxx-properties.c) + - Kill url-properties, preferably with extreme prejudice diff --git a/capplets/file-types/service-edit-dialog.c b/capplets/file-types/service-edit-dialog.c index 1dd6cd602..7836e5079 100644 --- a/capplets/file-types/service-edit-dialog.c +++ b/capplets/file-types/service-edit-dialog.c @@ -303,6 +303,7 @@ store_data (ServiceEditDialog *dialog) g_strdup (gnome_file_entry_get_full_path (GNOME_FILE_ENTRY (WID ("custom_program_entry")), FALSE)); service_info_update (dialog->p->info); + service_info_save (dialog->p->info, NULL); } static void diff --git a/capplets/file-types/service-info.c b/capplets/file-types/service-info.c index 2c979b950..1c1848c4e 100644 --- a/capplets/file-types/service-info.c +++ b/capplets/file-types/service-info.c @@ -42,6 +42,9 @@ set_string (const ServiceInfo *info, gchar *end, gchar *value, GConfChangeSet *c { gchar *key; + if (value == NULL) + return; + key = get_key_name (info, end); if (changeset != NULL)