From 4fc5f91b8b6ab920444d45d76e0cdb4aea3feb58 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 4 Oct 2005 20:12:05 +0000 Subject: [PATCH] Merged from HEAD: 2005-10-04 Federico Mena Quintero Merged from HEAD: * gtk/gtkpathbar.c (get_dir_name): Don't special-case Home and Desktop; just use their real names on the file system for the user-visible names. * gtk/gtkfilechooserdefault.c (shortcuts_append_home): Don't special-case the name of "Home"; just use the folder name. --- ChangeLog | 12 ++++++++++++ ChangeLog.pre-2-10 | 12 ++++++++++++ gtk/gtkfilechooserdefault.c | 2 +- gtk/gtkpathbar.c | 8 +------- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7523cab926..edfe5cc3f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2005-10-04 Federico Mena Quintero + + Merged from HEAD: + + * gtk/gtkpathbar.c (get_dir_name): Don't special-case Home and + Desktop; just use their real names on the file system for the + user-visible names. + + * gtk/gtkfilechooserdefault.c + (shortcuts_append_home): Don't special-case the name of "Home"; + just use the folder name. + 2005-10-04 Tor Lillqvist * gtk/gtkcalendar.c (gtk_calendar_init): Make it compile without diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7523cab926..edfe5cc3f4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +2005-10-04 Federico Mena Quintero + + Merged from HEAD: + + * gtk/gtkpathbar.c (get_dir_name): Don't special-case Home and + Desktop; just use their real names on the file system for the + user-visible names. + + * gtk/gtkfilechooserdefault.c + (shortcuts_append_home): Don't special-case the name of "Home"; + just use the folder name. + 2005-10-04 Tor Lillqvist * gtk/gtkcalendar.c (gtk_calendar_init): Make it compile without diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index ee285ba524..d43924adff 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -1430,7 +1430,7 @@ shortcuts_append_home (GtkFileChooserDefault *impl) home_path = gtk_file_system_filename_to_path (impl->file_system, home); error = NULL; - impl->has_home = shortcuts_insert_path (impl, -1, FALSE, NULL, home_path, _("Home"), FALSE, &error); + impl->has_home = shortcuts_insert_path (impl, -1, FALSE, NULL, home_path, NULL, FALSE, &error); if (!impl->has_home) error_getting_info_dialog (impl, home_path, error); diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index ed80304fe1..6d772baf97 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -1016,13 +1016,7 @@ button_data_free (ButtonData *button_data) static const char * get_dir_name (ButtonData *button_data) { - if (button_data->type == HOME_BUTTON) - return _("Home"); - else if (button_data->type == DESKTOP_BUTTON) - return _("Desktop"); - else - return button_data->dir_name; - + return button_data->dir_name; } /* We always want to request the same size for the label, whether