diff options
author | Руслан Ижбулатов <lrn1986@gmail.com> | 2016-05-01 19:00:25 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2016-05-05 15:04:01 -0400 |
commit | 86855f7531ecc427ede1a93e317673c92edfe6e9 (patch) | |
tree | 5b074337e55db0cef6011d41637681ce5fa26293 | |
parent | 25672b7f39b414052e27c9215a9db294f7d6d055 (diff) | |
download | gtk+-86855f7531ecc427ede1a93e317673c92edfe6e9.tar.gz |
GtkPlacesView: check for network:// URI support before using it
Specifically, this URI is not supported on Windows, but GFile will
do its "best" and turn it into GLocalFile("$pwd/network"), with
spectacularly bad results.
https://bugzilla.gnome.org/show_bug.cgi?id=765858
-rw-r--r-- | gtk/gtkplacesview.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c index b91394f7e7..162434a137 100644 --- a/gtk/gtkplacesview.c +++ b/gtk/gtkplacesview.c @@ -19,6 +19,7 @@ #include "config.h" #include <gio/gio.h> +#include <gio/gvfs.h> #include <gtk/gtk.h> #include "gtkintl.h" @@ -1003,8 +1004,19 @@ fetch_networks (GtkPlacesView *view) { GtkPlacesViewPrivate *priv; GFile *network_file; + const gchar * const *supported_uris; + gboolean found; priv = gtk_places_view_get_instance_private (view); + supported_uris = g_vfs_get_supported_uri_schemes (g_vfs_get_default ()); + + for (found = FALSE; !found && supported_uris && supported_uris[0]; supported_uris++) + if (g_strcmp0 (supported_uris[0], "network") == 0) + found = TRUE; + + if (!found) + return; + network_file = g_file_new_for_uri ("network:///"); g_cancellable_cancel (priv->networks_fetching_cancellable); |