summaryrefslogtreecommitdiff
path: root/src/file-manager
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2001-01-31 19:43:13 +0000
committerDarin Adler <darin@src.gnome.org>2001-01-31 19:43:13 +0000
commit140b9c15b1233ae0b27e60cef1909488a2576da0 (patch)
tree406b37d1d8248d6c3714839b000ec5fc80586a4e /src/file-manager
parent17955b15190075a200dd9b6b2535014c36a556fb (diff)
downloadnautilus-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 'src/file-manager')
-rw-r--r--src/file-manager/fm-directory-view.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 20c7cac09..fee47f6b4 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -3214,7 +3214,8 @@ real_update_menus (FMDirectoryView *view)
background = fm_directory_view_get_background (view);
nautilus_bonobo_set_sensitive (view->details->ui,
FM_DIRECTORY_VIEW_COMMAND_RESET_BACKGROUND,
- background && nautilus_file_background_is_set (background));
+ background != NULL
+ && nautilus_file_background_is_set (background));
nautilus_bonobo_set_label_for_menu_item_and_command
(view->details->ui,