diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog index fa2d5b396..d00ad9f96 100644 --- a/capplets/background/ChangeLog +++ b/capplets/background/ChangeLog @@ -1,3 +1,8 @@ +2001-07-26 Bradford Hovinen + + * background-properties-capplet.c (create_dialog): Add a "(none)" + string to the history + 2001-07-26 Richard Hestilow * applier.c: Remove all bonobo-conf stuff. diff --git a/capplets/background/background-properties-capplet.c b/capplets/background/background-properties-capplet.c index 5a639dbc9..58a1a8082 100644 --- a/capplets/background/background-properties-capplet.c +++ b/capplets/background/background-properties-capplet.c @@ -158,27 +158,25 @@ get_legacy_settings (Bonobo_ConfigDatabase db) /* Code to deal with new enum - messy */ val_ulong = -1; val_string = gnome_config_get_string_with_default ("/Background/Default/simple=solid", &def); - if (!def) - { - if (!strcmp (val_string, "solid")) + if (!def) { + if (!strcmp (val_string, "solid")) { val_ulong = 0; - else - { + } else { g_free (val_string); val_string = gnome_config_get_string_with_default ("/Background/Default/gradient=vertical", &def); if (!def) val_ulong = !strcmp (val_string, "vertical"); } } - + g_free (val_string); - + if (val_ulong != -1) bonobo_config_set_ulong (db, "/main/orientation", val_ulong, NULL); - + val_boolean = gnome_config_get_bool_with_default ("/Background/Default/adjustOpacity=true", &def); - if (!def && val_boolean) - { + + if (!def && val_boolean) { COPY_FROM_LEGACY (long, "/main/opacity", int, "/Background/Default/opacity=100"); } } @@ -262,6 +260,8 @@ create_dialog (void) TRUE, TRUE, 0); gtk_widget_show_all (holder); + gnome_entry_append_history (GNOME_ENTRY (gnome_file_entry_gnome_entry (GNOME_FILE_ENTRY (WID ("image_fileentry")))), 0, "(none)"); + gtk_signal_connect_object (GTK_OBJECT (widget), "destroy", GTK_SIGNAL_FUNC (gtk_object_destroy), GTK_OBJECT (dialog));