callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

placesview: jumps to the default location

Browse Source 
When we connect to a server, the default and expected
behavior is going to the default location, which usually
is the home directory or a writable directory.

GtkPlacesSidebar behaves properly, while GtkPlacesView
doesn't.

Fix that by jumping to the default locations instead of
the root location.
This commit is contained in:
Georges Basile Stavracas Neto 2015-08-10 10:42:43 -03:00
parent 525732b623
commit 5e3d0b19b0
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkplacesview.c
View File

@ -344,7 +344,7 @@ activate_row (GtkPlacesView *view,
} }
else if (mount) else if (mount)
{ {
GFile *location = g_mount_get_root (mount); GFile *location = g_mount_get_default_location (mount);
emit_open_location (view, location, flags); emit_open_location (view, location, flags);
@ -684,7 +684,7 @@ add_volume (GtkPlacesView *view,
is_network = g_strcmp0 (identifier, "network") == 0; is_network = g_strcmp0 (identifier, "network") == 0;
mount = g_volume_get_mount (volume); mount = g_volume_get_mount (volume);
root = mount ? g_mount_get_root (mount) : NULL; root = mount ? g_mount_get_default_location (mount) : NULL;
icon = g_volume_get_icon (volume); icon = g_volume_get_icon (volume);
name = g_volume_get_name (volume); name = g_volume_get_name (volume);
path = !is_network ? g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE) : NULL; path = !is_network ? g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE) : NULL;
@ -728,7 +728,7 @@ add_mount (GtkPlacesView *view,
icon = g_mount_get_icon (mount); icon = g_mount_get_icon (mount);
name = g_mount_get_name (mount); name = g_mount_get_name (mount);
root = g_mount_get_root (mount); root = g_mount_get_default_location (mount);
path = root ? g_file_get_parse_name (root) : NULL; path = root ? g_file_get_parse_name (root) : NULL;
uri = g_file_get_uri (root); uri = g_file_get_uri (root);
schema = g_uri_parse_scheme (uri); schema = g_uri_parse_scheme (uri);
@ -944,9 +944,29 @@ server_mount_ready_cb (GObject *source_file,
gtk_entry_set_text (GTK_ENTRY (priv->address_entry), ""); gtk_entry_set_text (GTK_ENTRY (priv->address_entry), "");
if (priv->should_open_location) if (priv->should_open_location)
emit_open_location (view, location, priv->open_flags); {
GMount *mount_point;
GError *error;
GFile *enclosing_location;
error = NULL;
mount_point = g_file_find_enclosing_mount (location, NULL, &error);
if (error)
{
emit_show_error_message (view, _("Unable to access location"), error->message);
goto out;
} }
enclosing_location = g_mount_get_default_location (mount_point);
emit_open_location (view, enclosing_location, priv->open_flags);
g_object_unref (enclosing_location);
}
}
out:
update_places (view); update_places (view);
} }
@ -1001,7 +1021,7 @@ volume_mount_ready_cb (GObject *source_volume,
GFile *root; GFile *root;
mount = g_volume_get_mount (volume); mount = g_volume_get_mount (volume);
root = g_mount_get_root (mount); root = g_mount_get_default_location (mount);
if (priv->should_open_location) if (priv->should_open_location)
emit_open_location (GTK_PLACES_VIEW (user_data), root, priv->open_flags); emit_open_location (GTK_PLACES_VIEW (user_data), root, priv->open_flags);
@ -1190,7 +1210,7 @@ get_view_and_file (GtkPlacesViewRow *row,
mount = gtk_places_view_row_get_mount (row); mount = gtk_places_view_row_get_mount (row);
if (mount) if (mount)
*file = g_mount_get_root (mount); *file = g_mount_get_default_location (mount);
else if (volume) else if (volume)
*file = g_volume_get_activation_root (volume); *file = g_volume_get_activation_root (volume);
else else