Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged from HEAD:

Browse Source 
2005-10-04  Federico Mena Quintero  <federico@ximian.com>

	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.
This commit is contained in:
Federico Mena Quintero
2005-10-04 20:12:05 +00:00
committed by Federico Mena Quintero
parent 61a352d098
commit 4fc5f91b8b
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,15 @@
2005-10-04 Federico Mena Quintero <federico@ximian.com>
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 <tml@novell.com>
* gtk/gtkcalendar.c (gtk_calendar_init): Make it compile without

12
ChangeLog.pre-2-10
View File

@@ -1,3 +1,15 @@
2005-10-04 Federico Mena Quintero <federico@ximian.com>
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 <tml@novell.com>
* gtk/gtkcalendar.c (gtk_calendar_init): Make it compile without

2
gtk/gtkfilechooserdefault.c
View File

@@ -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);

8
gtk/gtkpathbar.c
View File

@@ -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