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

file chooser: Fix gtk_file_chooser_set_show_hidden

Browse Source 
We should not override an explicitly set show-hidden value
when loading the setting.

https://bugzilla.gnome.org/show_bug.cgi?id=610925
This commit is contained in:
Matthias Clasen 2015-07-23 21:54:47 -04:00
parent 3fec234c22
commit e2b9caf26a
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkfilechooserwidget.c
View File

@ -343,6 +343,7 @@ struct _GtkFileChooserWidgetPrivate {
guint use_preview_label : 1; guint use_preview_label : 1;
guint select_multiple : 1; guint select_multiple : 1;
guint show_hidden : 1; guint show_hidden : 1;
guint show_hidden_set : 1;
guint sort_directories_first : 1; guint sort_directories_first : 1;
guint show_time : 1; guint show_time : 1;
guint do_overwrite_confirmation : 1; guint do_overwrite_confirmation : 1;
@ -3253,6 +3254,21 @@ gtk_file_chooser_widget_get_subtitle (GtkFileChooserWidget *impl)
return subtitle; return subtitle;
} }
static void
set_show_hidden (GtkFileChooserWidget *impl,
gboolean show_hidden)
{
GtkFileChooserWidgetPrivate *priv = impl->priv;
if (priv->show_hidden != show_hidden)
{
priv->show_hidden = show_hidden;
if (priv->browse_files_model)
_gtk_file_system_model_set_show_hidden (priv->browse_files_model, show_hidden);
}
}
static void static void
gtk_file_chooser_widget_set_property (GObject *object, gtk_file_chooser_widget_set_property (GObject *object,
guint prop_id, guint prop_id,
@ -3355,16 +3371,8 @@ gtk_file_chooser_widget_set_property (GObject *object,
break; break;
case GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN: case GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN:
{ priv->show_hidden_set = TRUE;
gboolean show_hidden = g_value_get_boolean (value); set_show_hidden (impl, g_value_get_boolean (value));
if (show_hidden != priv->show_hidden)
{
priv->show_hidden = show_hidden;
if (priv->browse_files_model)
_gtk_file_system_model_set_show_hidden (priv->browse_files_model, show_hidden);
}
}
break; break;
case GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION: case GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION:
@ -3767,8 +3775,8 @@ settings_load (GtkFileChooserWidget *impl)
sort_directories_first = g_settings_get_boolean (settings, SETTINGS_KEY_SORT_DIRECTORIES_FIRST); sort_directories_first = g_settings_get_boolean (settings, SETTINGS_KEY_SORT_DIRECTORIES_FIRST);
date_format = g_settings_get_enum (settings, SETTINGS_KEY_DATE_FORMAT); date_format = g_settings_get_enum (settings, SETTINGS_KEY_DATE_FORMAT);
gtk_file_chooser_set_show_hidden (GTK_FILE_CHOOSER (impl), show_hidden); if (!priv->show_hidden_set)
set_show_hidden (impl, show_hidden);
priv->show_size_column = show_size_column; priv->show_size_column = show_size_column;
gtk_tree_view_column_set_visible (priv->list_size_column, show_size_column); gtk_tree_view_column_set_visible (priv->list_size_column, show_size_column);