AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

file chooser: Be more careful with subtitles

Browse Source 
We were showing things like "Searching in (null)" if the current
folder is not in the sidebar. Avoid that by falling back to using
current_folder.

Pointed out by Carlos Soriano.
This commit is contained in:
Matthias Clasen 2015-07-14 23:48:09 -04:00
parent a00a5ed210
commit eb67d14551
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtkfilechooserwidget.c
View File

@ -3160,9 +3160,29 @@ gtk_file_chooser_widget_get_subtitle (GtkFileChooserWidget *impl)
{
gchar *location;
subtitle = _("Searching");
location = gtk_places_sidebar_get_location_title (GTK_PLACES_SIDEBAR (priv->places_sidebar));
subtitle = g_strdup_printf (_("Searching in %s"), location);
g_free (location);
if (location)
{
subtitle = g_strdup_printf (_("Searching in %s"), location);
g_free (location);
}
else if (priv->current_folder)
{
GFileInfo *info;
info = g_file_query_info (priv->current_folder,
G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
G_FILE_QUERY_INFO_NONE,
NULL,
NULL);
if (info)
{
subtitle = g_strdup_printf (_("Searching in %s"), g_file_info_get_display_name (info));
g_object_unref (info);
}
}
}
else if (priv->operation_mode == OPERATION_MODE_ENTER_LOCATION ||
(priv->operation_mode == OPERATION_MODE_BROWSE &&