diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-01-31 19:43:13 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-01-31 19:43:13 +0000 |
| commit | 140b9c15b1233ae0b27e60cef1909488a2576da0 (patch) | |
| tree | 406b37d1d8248d6c3714839b000ec5fc80586a4e /libnautilus-private/nautilus-directory-background.c | |
| parent | 17955b15190075a200dd9b6b2535014c36a556fb (diff) | |
| download | nautilus-140b9c15b1233ae0b27e60cef1909488a2576da0.tar.gz | |
reviewed by: Michael Engber <engber@eazel.com>
Fix bug 6192 ("mapped before underway" warning when clicking on
any sidebar tab).
* src/nautilus-view-frame.c: (nautilus_view_frame_map): Remove
inappropriate check of state, and replace it with a simple NULL
check that handles the failed case.
* libnautilus-extensions/nautilus-directory-background.c:
(nautilus_file_background_is_set): Fixed backwards logic by
removing an erroneous "!".
* libnautilus-extensions/nautilus-icon-factory.c: Formatting
tweaks.
* src/file-manager/fm-directory-view.c: Formatting tweak.
* src/nautilus-application.c: (nautilus_application_startup):
Fixed comment.
(check_for_and_run_as_super_user): Formatting tweak.
Diffstat (limited to 'libnautilus-private/nautilus-directory-background.c')
| -rw-r--r-- | libnautilus-private/nautilus-directory-background.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c index dea207d64..af2530647 100644 --- a/libnautilus-private/nautilus-directory-background.c +++ b/libnautilus-private/nautilus-directory-background.c @@ -761,10 +761,10 @@ nautilus_file_background_is_set (NautilusBackground *background) nautilus_file_background_peek_theme_source (background), &default_color, &default_image, &default_placement, &default_combine); - matches = !nautilus_file_background_matches_default_settings (color, default_color, - image, default_image, - placement, default_placement, - combine, default_combine); + matches = nautilus_file_background_matches_default_settings (color, default_color, + image, default_image, + placement, default_placement, + combine, default_combine); g_free (color); g_free (image); |