diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-12-01 01:05:38 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-12-01 01:05:38 +0000 |
| commit | a238fef0fe5fac60ed626d9c3851674a8db69688 (patch) | |
| tree | ee44c06560cdf0280d3be108bda72b8c69492476 /libnautilus-private/nautilus-directory-background.c | |
| parent | 36759c332d0ffbf52b0635e7a458335ef9b7a1db (diff) | |
| download | nautilus-a238fef0fe5fac60ed626d9c3851674a8db69688.tar.gz | |
Roll double-free bug fix from the branch.
* libnautilus-private/nautilus-directory-async.c:
(top_left_read_callback): Roll double-free bug fix from the branch.
* TODO: Some small updates.
* components/hardware/nautilus-hardware-view.c:
* data/browser.xml:
* icons/crux_eggplant/crux_eggplant.xml:
* icons/crux_teal/crux_teal.xml:
* icons/default.xml:
* icons/gnome/gnome.xml:
* icons/sierra/sierra.xml:
* icons/tahoe/tahoe.xml:
* libnautilus-private/nautilus-directory-background.c:
(nautilus_file_background_write_desktop_settings):
* libnautilus-private/nautilus-icon-container.c:
(start_rubberbanding):
* libnautilus-private/nautilus-icon-text-item.c:
(fetch_themed_color):
* src/nautilus-property-browser.c: (add_color_to_browser):
* src/nautilus-sidebar-tabs.c: (setup_light_text),
(setup_dark_text), (nautilus_sidebar_tabs_init),
(nautilus_sidebar_tabs_receive_dropped_color):
* src/nautilus-sidebar-title.c:
(nautilus_sidebar_title_select_text_color):
* src/nautilus-sidebar.c: (receive_dropped_color):
Changed all rgb:RRRR/GGGG/BBBB to #RRGGBB. We still probably have
to handle the old format just for old data files.
* libnautilus-private/.cvsignore:
nautilus-marshal-guts.h -> nautilus-marshal.h
* src/file-manager/fm-directory-view.c:
(update_directory_in_scripts_menu): Add filter so that we don't
see invisible or backup files in the scripts menu. In the old
days, gnome-vfs supplied the filtering.
* src/nautilus-about.c: (nautilus_about_finalize),
(nautilus_about_instance_init), (nautilus_about_hide),
(nautilus_about_hide_on_response),
(nautilus_about_hide_on_delete), (nautilus_about_class_init):
Get rid of double-destroy problem with about, and fix OK button.
* src/nautilus-bookmarks-window.c:
(nautilus_bookmarks_window_response_callback): Fix Done button.
(create_bookmarks_window): Hook up response callback.
(on_window_delete_event), (handle_close_accelerator): Get rid of
save_geometry_and_hide, since hide already does that.
* src/nautilus-main.c: (main): Add some missing domains for better
debugging. We should figure out a way to do this without a list of
domains.
Diffstat (limited to 'libnautilus-private/nautilus-directory-background.c')
| -rw-r--r-- | libnautilus-private/nautilus-directory-background.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c index 6ef421d97..c2710c619 100644 --- a/libnautilus-private/nautilus-directory-background.c +++ b/libnautilus-private/nautilus-directory-background.c @@ -397,8 +397,8 @@ nautilus_file_background_write_desktop_settings (char *color, char *image, EelBa /* We set it to white here because that's how backgrounds with a NULL color * are drawn by Nautilus - due to usage of eel_gdk_color_parse_with_white_default. */ - gnome_config_set_string ("/Background/Default/color1", "rgb:FFFF/FFFF/FFFF"); - gnome_config_set_string ("/Background/Default/color2", "rgb:FFFF/FFFF/FFFF"); + gnome_config_set_string ("/Background/Default/color1", "#FFFFFF"); + gnome_config_set_string ("/Background/Default/color2", "#FFFFFF"); gnome_config_set_string ("/Background/Default/simple", "solid"); gnome_config_set_string ("/Background/Default/gradient", "vertical"); } |