Attachment #265338 for bug #437780

View | Details | Raw Unified | Return to bug 437780
Collapse All | Expand All

Lines 998-1004 dnd_select_folder_get_info_cb (GCancella Link Here

(-)gtk+-2.14.4-pre/gtk/gtkfilechooserbutton.c (-2 / +2 lines)
998	{	998	{
999	gboolean is_folder;	999	gboolean is_folder;
1000		1000
1001	is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);	1001	is_folder = _gtk_file_system_consider_as_directory (info);
1002		1002
1003	data->selected =	1003	data->selected =
1004	(((data->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER && is_folder) \|\|	1004	(((data->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER && is_folder) \|\|
Lines 1455-1461 set_info_get_info_cb (GCancellable *canc Link Here
1455	if (!data->label)	1455	if (!data->label)
1456	data->label = g_strdup (g_file_info_get_display_name (info));	1456	data->label = g_strdup (g_file_info_get_display_name (info));
1457		1457
1458	is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);	1458	is_folder = _gtk_file_system_consider_as_directory (info);
1459		1459
1460	gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,	1460	gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
1461	ICON_COLUMN, pixbuf,	1461	ICON_COLUMN, pixbuf,




    case OPERATION_MODE_BROWSE:
      gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter);
      info = _gtk_file_system_model_get_info (closure->impl->browse_files_model, &child_iter);
      is_folder = info ? (_gtk_file_system_consider_as_directory (info)) : FALSE;
      break;

    case OPERATION_MODE_SEARCH:


  if ((data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
       data->impl->action == GTK_FILE_CHOOSER_ACTION_SAVE) &&
      data->uris[1] == 0 && !error && _gtk_file_system_consider_as_directory (info))
      g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
    change_folder_and_display_error (data->impl, data->file, FALSE);
  else
    {

  if (!impl->current_filter)
    return TRUE;

  if (_gtk_file_system_consider_as_directory (file_info))
    return TRUE;

  return !get_is_file_filtered (impl, file, file_info);

  gboolean dir_a, dir_b;										       \
													       \
  if (info_a)												       \
    dir_a = _gtk_file_system_consider_as_directory (info_a);						       \
  else													       \
    return impl->list_sort_ascending ? -1 : 1;								       \
													       \
  if (info_b)												       \
    dir_b = _gtk_file_system_consider_as_directory (info_b);						       \
  else													       \
    return impl->list_sort_ascending ? 1 : -1;  							       \
													       \

	    have_hidden = g_file_info_get_is_hidden (info);

	  if (!have_filtered)
	    have_filtered = (! _gtk_file_system_consider_as_directory (info)) &&
			     get_is_file_filtered (data->impl, file, info);
	
	  g_object_unref (info);

	  if (have_hidden && have_filtered)

	      impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
	    {
	      /* We don't want the name to change when clicking on a folder... */
	      change_entry = (! _gtk_file_system_consider_as_directory (info));
	    }
          else
	    change_entry = TRUE; /* ... unless we are in SELECT_FOLDER mode */

      g_object_unref (data->original_file);
    }

  if (! _gtk_file_system_consider_as_directory (info))
    goto out;

  if (!_gtk_path_bar_set_file (GTK_PATH_BAR (impl->browse_path_bar), data->file, data->keep_trail, NULL))

  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
  
  info = get_list_file_info (impl, iter);
  is_folder = _gtk_file_system_consider_as_directory (info);

  if ((is_folder && impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) ||
      (!is_folder && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN))


  data->impl->loading_shortcuts = g_slist_remove (data->impl->loading_shortcuts, cancellable);

  if (cancelled || error || (! _gtk_file_system_consider_as_directory (info)))
    goto out;

  pos = shortcuts_get_pos_for_shortcut_folder (data->impl, data->impl->num_shortcuts);

  if (!info)
    parent_is_folder = FALSE;
  else
    parent_is_folder = _gtk_file_system_consider_as_directory (info);

  if (parent_is_folder)
    {

  if (cancelled)
    goto out;

  file_exists_and_is_not_folder = info && (! _gtk_file_system_consider_as_directory (info));

  if (data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
    /* user typed a filename; we are done */


  display_name = g_strdup (g_file_info_get_display_name (info));
  mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (info));
  is_folder = _gtk_file_system_consider_as_directory (info);
  pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (request->impl),
				       request->impl->icon_size);


      goto out;
    }

  is_folder = _gtk_file_system_consider_as_directory (info);

  gtk_list_store_set (request->impl->recent_model, &iter,
                      RECENT_MODEL_COL_IS_FOLDER, is_folder,

  if (cancelled)
    goto out;

  if (!error && _gtk_file_system_consider_as_directory (info))
    change_folder_and_display_error (data->impl, data->file, FALSE);
  else
    gtk_file_chooser_default_select_file (GTK_FILE_CHOOSER (data->impl),


            gtk_tree_model_sort_convert_iter_to_child_iter (impl->sort_model, &child_iter, &iter);
            info = _gtk_file_system_model_get_info (impl->browse_files_model, &child_iter);
            if (info && (! _gtk_file_system_consider_as_directory (info)))
              return FALSE;
          }
          break;

        info = _gtk_file_system_model_get_info (impl->browse_files_model,
                                                &child_iter);

        if (_gtk_file_system_consider_as_directory (info))
          {
	    GFile *file, *target_file;
	    const gchar *target_uri;

            file = _gtk_file_system_model_get_file (impl->browse_files_model, &child_iter);
            if (g_file_info_get_file_type (info) == G_FILE_TYPE_SHORTCUT ||
                g_file_info_get_file_type (info) == G_FILE_TYPE_MOUNTABLE) 
              {
                target_uri = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
                if (target_uri)
                  {
                    target_file = g_file_new_for_uri (target_uri);
                    if (target_file)
                      {
                        g_object_unref (file);
                        file = target_file;
                      }
                  }  
              }
            
            
            change_folder_and_display_error (impl, file, FALSE);
            return;
          }

        if (info &&
            (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
             impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
          sensitive = _gtk_file_system_consider_as_directory (info);
      }
      break;
    }

  if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
      impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
    {
      sensitive = _gtk_file_system_consider_as_directory (info);
    }

  g_object_set (cell,

  gchar *str;
  gboolean sensitive = TRUE;

  if (!info || _gtk_file_system_consider_as_directory (info))
    {
      g_object_set (cell,
		    "text", NULL,


      if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
	  impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
	sensitive = _gtk_file_system_consider_as_directory (info);
    }

  if (G_UNLIKELY (time_mtime == 0))

Lines 439-445 maybe_append_separator_to_file (GtkFileC Link Here

(-)gtk+-2.14.4-pre/gtk/gtkfilechooserentry.c (-2 / +2 lines)
439		439
440	if (info)	440	if (info)
441	{	441	{
442	if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)	442	if (_gtk_file_system_consider_as_directory (info))
443	{	443	{
444	gchar *tmp = display_name;	444	gchar *tmp = display_name;
445	display_name = g_strconcat (tmp, G_DIR_SEPARATOR_S, NULL);	445	display_name = g_strconcat (tmp, G_DIR_SEPARATOR_S, NULL);
Lines 1812-1818 _gtk_file_chooser_entry_get_is_folder (G Link Here
1812		1812
1813	if (file_info)	1813	if (file_info)
1814	{	1814	{
1815	retval = (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY);	1815	retval = _gtk_file_system_consider_as_directory (file_info);
1816	g_object_unref (file_info);	1816	g_object_unref (file_info);
1817	}	1817	}
1818	}	1818	}

Lines 918-923 enclosing_volume_mount_cb (GObject Link Here

(-)gtk+-2.14.4-pre/gtk/gtkfilesystem.c (+16 lines)
918	g_file_mount_enclosing_volume_finish (G_FILE (source_object), result, &error);	918	g_file_mount_enclosing_volume_finish (G_FILE (source_object), result, &error);
919	volume = _gtk_file_system_get_volume_for_file (async_data->file_system, G_FILE (source_object));	919	volume = _gtk_file_system_get_volume_for_file (async_data->file_system, G_FILE (source_object));
920		920
		921	/* Silently drop G_IO_ERROR_ALREADY_MOUNTED error for gvfs backends without visible mounts. */
		922	/* Better than doing query_info with additional I/O every time. */
		923	if (error && g_error_matches (error, G_IO_ERROR, G_IO_ERROR_ALREADY_MOUNTED))
		924	g_clear_error (&error);
		925
921	gdk_threads_enter ();	926	gdk_threads_enter ();
922	((GtkFileSystemVolumeMountCallback) async_data->callback) (async_data->cancellable, volume,	927	((GtkFileSystemVolumeMountCallback) async_data->callback) (async_data->cancellable, volume,
923	error, async_data->data);	928	error, async_data->data);
Lines 1742-1744 _gtk_file_info_render_icon (GFileInfo *i Link Here
1742		1747
1743	return pixbuf;	1748	return pixbuf;
1744	}	1749	}
		1750
		1751	gboolean
		1752	_gtk_file_system_consider_as_directory (GFileInfo *info)
		1753	{
		1754	GFileType type = g_file_info_get_file_type (info);
		1755
		1756	return (type == G_FILE_TYPE_DIRECTORY \|\|
		1757	type == G_FILE_TYPE_SHORTCUT \|\|
		1758	type == G_FILE_TYPE_MOUNTABLE);
		1759	}
		1760

Lines 172-177 GdkPixbuf * _gtk_file_info_render_ic Link Here

(-)gtk+-2.14.4-pre/gtk/gtkfilesystem.h (+2 lines)
172	GtkWidget *widget,	172	GtkWidget *widget,
173	gint icon_size);	173	gint icon_size);
174		174
		175	gboolean _gtk_file_system_consider_as_directory (GFileInfo *info);
		176
175	G_END_DECLS	177	G_END_DECLS
176		178
177	#endif /* __GTK_FILE_SYSTEM_H__ */	179	#endif /* __GTK_FILE_SYSTEM_H__ */




  else
    {
      GFileInfo *info = file_model_node_get_info (model, node);
      return _gtk_file_system_consider_as_directory (info);
    }
}


	  return FALSE;
	}

      is_folder = _gtk_file_system_consider_as_directory (info);

      if (model->show_folders != model->show_files &&
	  model->show_folders != is_folder)

    {
      GFileInfo *info = file_model_node_get_info (model, node);
      gboolean has_children = FALSE;
      gboolean is_folder = _gtk_file_system_consider_as_directory (info);

      file_model_node_idle_clear_cancel (node);


Return to bug 437780

Lines 2771-2777 selection_check_foreach_cb (GtkTreeModel Link Here

(-)gtk+-2.14.4-pre/gtk/gtkfilechooserdefault.c (-24 / +40 lines)
2771	case OPERATION_MODE_BROWSE:	2771	case OPERATION_MODE_BROWSE:
2772	gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter);	2772	gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter);
2773	info = _gtk_file_system_model_get_info (closure->impl->browse_files_model, &child_iter);	2773	info = _gtk_file_system_model_get_info (closure->impl->browse_files_model, &child_iter);
2774	is_folder = info ? (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) : FALSE;	2774	is_folder = info ? (_gtk_file_system_consider_as_directory (info)) : FALSE;
2775	break;	2775	break;
2776		2776
2777	case OPERATION_MODE_SEARCH:	2777	case OPERATION_MODE_SEARCH:
Lines 4165-4172 file_list_drag_data_received_get_info_cb Link Here
4165		4165
4166	if ((data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN \|\|	4166	if ((data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN \|\|
4167	data->impl->action == GTK_FILE_CHOOSER_ACTION_SAVE) &&	4167	data->impl->action == GTK_FILE_CHOOSER_ACTION_SAVE) &&
4168	data->uris[1] == 0 && !error &&	4168	data->uris[1] == 0 && !error && _gtk_file_system_consider_as_directory (info))
4169	g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
4170	change_folder_and_display_error (data->impl, data->file, FALSE);	4169	change_folder_and_display_error (data->impl, data->file, FALSE);
4171	else	4170	else
4172	{	4171	{
Lines 6086-6092 list_model_filter_func (GtkFileSystemMod Link Here
6086	if (!impl->current_filter)	6085	if (!impl->current_filter)
6087	return TRUE;	6086	return TRUE;
6088		6087
6089	if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)	6088	if (_gtk_file_system_consider_as_directory (file_info))
6090	return TRUE;	6089	return TRUE;
6091		6090
6092	return !get_is_file_filtered (impl, file, file_info);	6091	return !get_is_file_filtered (impl, file, file_info);
Lines 6123-6134 install_list_model_filter (GtkFileChoose Link Here
6123	gboolean dir_a, dir_b; \	6122	gboolean dir_a, dir_b; \
6124	\	6123	\
6125	if (info_a) \	6124	if (info_a) \
6126	dir_a = (g_file_info_get_file_type (info_a) == G_FILE_TYPE_DIRECTORY); \	6125	dir_a = _gtk_file_system_consider_as_directory (info_a); \
6127	else \	6126	else \
6128	return impl->list_sort_ascending ? -1 : 1; \	6127	return impl->list_sort_ascending ? -1 : 1; \
6129	\	6128	\
6130	if (info_b) \	6129	if (info_b) \
6131	dir_b = (g_file_info_get_file_type (info_b) == G_FILE_TYPE_DIRECTORY); \	6130	dir_b = _gtk_file_system_consider_as_directory (info_b); \
6132	else \	6131	else \
6133	return impl->list_sort_ascending ? 1 : -1; \	6132	return impl->list_sort_ascending ? 1 : -1; \
6134	\	6133	\
Lines 6410-6418 show_and_select_files_finished_loading ( Link Here
6410	have_hidden = g_file_info_get_is_hidden (info);	6409	have_hidden = g_file_info_get_is_hidden (info);
6411		6410
6412	if (!have_filtered)	6411	if (!have_filtered)
6413	have_filtered = (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY) &&	6412	have_filtered = (! _gtk_file_system_consider_as_directory (info)) &&
6414	get_is_file_filtered (data->impl, file, info);	6413	get_is_file_filtered (data->impl, file, info);
6415		6414
6416	g_object_unref (info);	6415	g_object_unref (info);
6417		6416
6418	if (have_hidden && have_filtered)	6417	if (have_hidden && have_filtered)
Lines 6745-6751 update_chooser_entry (GtkFileChooserDefa Link Here
6745	impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)	6744	impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
6746	{	6745	{
6747	/* We don't want the name to change when clicking on a folder... */	6746	/* We don't want the name to change when clicking on a folder... */
6748	change_entry = (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY);	6747	change_entry = (! _gtk_file_system_consider_as_directory (info));
6749	}	6748	}
6750	else	6749	else
6751	change_entry = TRUE; /* ... unless we are in SELECT_FOLDER mode */	6750	change_entry = TRUE; /* ... unless we are in SELECT_FOLDER mode */
Lines 6900-6906 update_current_folder_get_info_cb (GCanc Link Here
6900	g_object_unref (data->original_file);	6899	g_object_unref (data->original_file);
6901	}	6900	}
6902		6901
6903	if (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY)	6902	if (! _gtk_file_system_consider_as_directory (info))
6904	goto out;	6903	goto out;
6905		6904
6906	if (!_gtk_path_bar_set_file (GTK_PATH_BAR (impl->browse_path_bar), data->file, data->keep_trail, NULL))	6905	if (!_gtk_path_bar_set_file (GTK_PATH_BAR (impl->browse_path_bar), data->file, data->keep_trail, NULL))
Lines 7183-7189 maybe_select (GtkTreeModel *model, Link Here
7183	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));	7182	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
7184		7183
7185	info = get_list_file_info (impl, iter);	7184	info = get_list_file_info (impl, iter);
7186	is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);	7185	is_folder = _gtk_file_system_consider_as_directory (info);
7187		7186
7188	if ((is_folder && impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) \|\|	7187	if ((is_folder && impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) \|\|
7189	(!is_folder && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN))	7188	(!is_folder && impl->action == GTK_FILE_CHOOSER_ACTION_OPEN))
Lines 7581-7587 add_shortcut_get_info_cb (GCancellable * Link Here
7581		7580
7582	data->impl->loading_shortcuts = g_slist_remove (data->impl->loading_shortcuts, cancellable);	7581	data->impl->loading_shortcuts = g_slist_remove (data->impl->loading_shortcuts, cancellable);
7583		7582
7584	if (cancelled \|\| error \|\| g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY)	7583	if (cancelled \|\| error \|\| (! _gtk_file_system_consider_as_directory (info)))
7585	goto out;	7584	goto out;
7586		7585
7587	pos = shortcuts_get_pos_for_shortcut_folder (data->impl, data->impl->num_shortcuts);	7586	pos = shortcuts_get_pos_for_shortcut_folder (data->impl, data->impl->num_shortcuts);
Lines 8129-8135 save_entry_get_info_cb (GCancellable *ca Link Here
8129	if (!info)	8128	if (!info)
8130	parent_is_folder = FALSE;	8129	parent_is_folder = FALSE;
8131	else	8130	else
8132	parent_is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);	8131	parent_is_folder = _gtk_file_system_consider_as_directory (info);
8133		8132
8134	if (parent_is_folder)	8133	if (parent_is_folder)
8135	{	8134	{
Lines 8199-8205 file_exists_get_info_cb (GCancellable *c Link Here
8199	if (cancelled)	8198	if (cancelled)
8200	goto out;	8199	goto out;
8201		8200
8202	file_exists_and_is_not_folder = info && (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY);	8201	file_exists_and_is_not_folder = info && (! _gtk_file_system_consider_as_directory (info));
8203		8202
8204	if (data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)	8203	if (data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
8205	/* user typed a filename; we are done */	8204	/* user typed a filename; we are done */
Lines 8613-8619 search_hit_get_info_cb (GCancellable *ca Link Here
8613		8612
8614	display_name = g_strdup (g_file_info_get_display_name (info));	8613	display_name = g_strdup (g_file_info_get_display_name (info));
8615	mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (info));	8614	mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (info));
8616	is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);	8615	is_folder = _gtk_file_system_consider_as_directory (info);
8617	pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (request->impl),	8616	pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (request->impl),
8618	request->impl->icon_size);	8617	request->impl->icon_size);
8619		8618
Lines 9684-9690 recent_item_get_info_cb (GCancellable *c Link Here
9684	goto out;	9683	goto out;
9685	}	9684	}
9686		9685
9687	is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);	9686	is_folder = _gtk_file_system_consider_as_directory (info);
9688		9687
9689	gtk_list_store_set (request->impl->recent_model, &iter,	9688	gtk_list_store_set (request->impl->recent_model, &iter,
9690	RECENT_MODEL_COL_IS_FOLDER, is_folder,	9689	RECENT_MODEL_COL_IS_FOLDER, is_folder,
Lines 10248-10254 shortcuts_activate_get_info_cb (GCancell Link Here
10248	if (cancelled)	10247	if (cancelled)
10249	goto out;	10248	goto out;
10250		10249
10251	if (!error && g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)	10250	if (!error && _gtk_file_system_consider_as_directory (info))
10252	change_folder_and_display_error (data->impl, data->file, FALSE);	10251	change_folder_and_display_error (data->impl, data->file, FALSE);
10253	else	10252	else
10254	gtk_file_chooser_default_select_file (GTK_FILE_CHOOSER (data->impl),	10253	gtk_file_chooser_default_select_file (GTK_FILE_CHOOSER (data->impl),
Lines 10470-10476 list_select_func (GtkTreeSelection *se Link Here
10470		10469
10471	gtk_tree_model_sort_convert_iter_to_child_iter (impl->sort_model, &child_iter, &iter);	10470	gtk_tree_model_sort_convert_iter_to_child_iter (impl->sort_model, &child_iter, &iter);
10472	info = _gtk_file_system_model_get_info (impl->browse_files_model, &child_iter);	10471	info = _gtk_file_system_model_get_info (impl->browse_files_model, &child_iter);
10473	if (info && g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY)	10472	if (info && (! _gtk_file_system_consider_as_directory (info)))
10474	return FALSE;	10473	return FALSE;
10475	}	10474	}
10476	break;	10475	break;
Lines 10582-10592 list_row_activated (GtkTreeView Link Here
10582	info = _gtk_file_system_model_get_info (impl->browse_files_model,	10581	info = _gtk_file_system_model_get_info (impl->browse_files_model,
10583	&child_iter);	10582	&child_iter);
10584		10583
10585	if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)	10584	if (_gtk_file_system_consider_as_directory (info))
10586	{	10585	{
10587	GFile *file;	10586	GFile file, target_file;
		10587	const gchar *target_uri;
10588		10588
10589	file = _gtk_file_system_model_get_file (impl->browse_files_model, &child_iter);	10589	file = _gtk_file_system_model_get_file (impl->browse_files_model, &child_iter);
		10590	if (g_file_info_get_file_type (info) == G_FILE_TYPE_SHORTCUT \|\|
		10591	g_file_info_get_file_type (info) == G_FILE_TYPE_MOUNTABLE)
		10592	{
		10593	target_uri = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
		10594	if (target_uri)
		10595	{
		10596	target_file = g_file_new_for_uri (target_uri);
		10597	if (target_file)
		10598	{
		10599	g_object_unref (file);
		10600	file = target_file;
		10601	}
		10602	}
		10603	}
		10604
		10605
10590	change_folder_and_display_error (impl, file, FALSE);	10606	change_folder_and_display_error (impl, file, FALSE);
10591	return;	10607	return;
10592	}	10608	}
Lines 10714-10720 list_icon_data_func (GtkTreeViewColumn * Link Here
10714	if (info &&	10730	if (info &&
10715	(impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER \|\|	10731	(impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER \|\|
10716	impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))	10732	impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
10717	sensitive = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);	10733	sensitive = _gtk_file_system_consider_as_directory (info);
10718	}	10734	}
10719	break;	10735	break;
10720	}	10736	}
Lines 10818-10824 list_name_data_func (GtkTreeViewColumn * Link Here
10818	if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER \|\|	10834	if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER \|\|
10819	impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)	10835	impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
10820	{	10836	{
10821	sensitive = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);	10837	sensitive = _gtk_file_system_consider_as_directory (info);
10822	}	10838	}
10823		10839
10824	g_object_set (cell,	10840	g_object_set (cell,
Lines 10842-10848 list_size_data_func (GtkTreeViewColumn * Link Here
10842	gchar *str;	10858	gchar *str;
10843	gboolean sensitive = TRUE;	10859	gboolean sensitive = TRUE;
10844		10860
10845	if (!info \|\| g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)	10861	if (!info \|\| _gtk_file_system_consider_as_directory (info))
10846	{	10862	{
10847	g_object_set (cell,	10863	g_object_set (cell,
10848	"text", NULL,	10864	"text", NULL,
Lines 10959-10965 list_mtime_data_func (GtkTreeViewColumn Link Here
10959		10975
10960	if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER \|\|	10976	if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER \|\|
10961	impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)	10977	impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
10962	sensitive = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);	10978	sensitive = _gtk_file_system_consider_as_directory (info);
10963	}	10979	}
10964		10980
10965	if (G_UNLIKELY (time_mtime == 0))	10981	if (G_UNLIKELY (time_mtime == 0))

Lines 444-450 gtk_file_system_model_iter_has_child (Gt Link Here

(-)gtk+-2.14.4-pre/gtk/gtkfilesystemmodel.c (-3 / +3 lines)
444	else	444	else
445	{	445	{
446	GFileInfo *info = file_model_node_get_info (model, node);	446	GFileInfo *info = file_model_node_get_info (model, node);
447	return (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);	447	return _gtk_file_system_consider_as_directory (info);
448	}	448	}
449	}	449	}
450		450
Lines 1330-1336 file_model_node_is_visible (GtkFileSyste Link Here
1330	return FALSE;	1330	return FALSE;
1331	}	1331	}
1332		1332
1333	is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);	1333	is_folder = _gtk_file_system_consider_as_directory (info);
1334		1334
1335	if (model->show_folders != model->show_files &&	1335	if (model->show_folders != model->show_files &&
1336	model->show_folders != is_folder)	1336	model->show_folders != is_folder)
Lines 1553-1559 file_model_node_get_children (GtkFileSys Link Here
1553	{	1553	{
1554	GFileInfo *info = file_model_node_get_info (model, node);	1554	GFileInfo *info = file_model_node_get_info (model, node);
1555	gboolean has_children = FALSE;	1555	gboolean has_children = FALSE;
1556	gboolean is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);	1556	gboolean is_folder = _gtk_file_system_consider_as_directory (info);
1557		1557
1558	file_model_node_idle_clear_cancel (node);	1558	file_model_node_idle_clear_cancel (node);
1559		1559