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

Merged from HEAD:

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

	Merged from HEAD:

	* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Only get
	the base path of the volume if it is mounted.
This commit is contained in:
Federico Mena Quintero
2005-11-11 19:50:21 +00:00
committed by Federico Mena Quintero
parent dfe3abc6bb
commit 0c1868687b
3 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2005-11-11 Federico Mena Quintero <federico@ximian.com>
Merged from HEAD:
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Only get
the base path of the volume if it is mounted.
2005-11-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_motion_resize_column): Remove

7
ChangeLog.pre-2-10
View File

@@ -1,3 +1,10 @@
2005-11-11 Federico Mena Quintero <federico@ximian.com>
Merged from HEAD:
* gtk/gtkfilechooserdefault.c (shortcuts_add_volumes): Only get
the base path of the volume if it is mounted.
2005-11-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_motion_resize_column): Remove

21
gtk/gtkfilechooserdefault.c
View File

@@ -1627,16 +1627,21 @@ shortcuts_add_volumes (GtkFileChooserDefault *impl)
if (impl->local_only)
{
GtkFilePath *base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
if (base_path != NULL)
if (gtk_file_system_volume_get_is_mounted (impl->file_system, volume))
{
gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path);
gtk_file_path_free (base_path);
if (!is_local)
GtkFilePath *base_path;
base_path = gtk_file_system_volume_get_base_path (impl->file_system, volume);
if (base_path != NULL)
{
gtk_file_system_volume_free (impl->file_system, volume);
continue;
gboolean is_local = gtk_file_system_path_is_local (impl->file_system, base_path);
gtk_file_path_free (base_path);
if (!is_local)
{
gtk_file_system_volume_free (impl->file_system, volume);
continue;
}
}
}
}