GNOME Bugzilla – Bug 368661
Home directory should not be labelled as the desktop
Last modified: 2007-02-19 08:53:57 UTC
If the user has enabled the desktop_is_home_dir option in gconf, Nautilus labels their home directory as "Desktop" in the path bar. This seems to be a design decision, but I feel it to be a poor one. In addition to the unwanted use of the desktop idea, it clashes with GTK+'s file chooser behaviour.
Created attachment 75748 [details] [review] Disable special treatment of the home directory when desktop_is_home_dir is enabled
Comment on attachment 75748 [details] [review] Disable special treatment of the home directory when desktop_is_home_dir is enabled Index: nautilus/src/nautilus-pathbar.c =================================================================== --- nautilus/src/nautilus-pathbar.c (revision 12746) +++ nautilus/src/nautilus-pathbar.c (working copy) @@ -1064,25 +1064,19 @@ return path_bar->home_icon; } - if (!desktop_is_home) { - icon_name = get_icon_name_for_file_path (path_bar->home_path); - if (strcmp (icon_name, DEFAULT_ICON) == 0) { - path_bar->home_icon = nautilus_icon_factory_get_pixbuf_from_name (DEFAULT_HOME_ICON, + icon_name = get_icon_name_for_file_path (path_bar->home_path); + if (strcmp (icon_name, DEFAULT_ICON) == 0) { + path_bar->home_icon = nautilus_icon_factory_get_pixbuf_from_name (DEFAULT_HOME_ICON, NULL, NAUTILUS_PATH_BAR_ICON_SIZE, TRUE, NULL); - } else { - path_bar->home_icon = nautilus_icon_factory_get_pixbuf_from_name (icon_name, + } else { + path_bar->home_icon = nautilus_icon_factory_get_pixbuf_from_name (icon_name, NULL, NAUTILUS_PATH_BAR_ICON_SIZE, TRUE, NULL); - } - - g_free (icon_name); - } else { - path_bar->home_icon = nautilus_icon_factory_get_pixbuf_from_name (DEFAULT_DESKTOP_ICON, - NULL, NAUTILUS_PATH_BAR_ICON_SIZE, - TRUE, NULL); } - return path_bar->home_icon; + + g_free (icon_name); + return path_bar->home_icon; case DESKTOP_BUTTON: if (path_bar->desktop_icon != NULL) { @@ -1123,7 +1117,7 @@ static const char * get_dir_name (ButtonData *button_data) { - if (button_data->type == DESKTOP_BUTTON || (button_data->type == HOME_BUTTON && desktop_is_home)) { + if (button_data->type == DESKTOP_BUTTON) { return _("Desktop"); } else { return button_data->dir_name;
Created attachment 82698 [details] [review] Updated patch Well, that edit didn't work. Guess I'll have to upload a new version. This just updates the patch for compatibility with the newest code.
I agree, its still your homedir, its just shown on the desktop. Commited.