Hello community, here is the log from the commit of package gtk3 for openSUSE:Factory checked in at 2017-11-21 15:23:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk3 (Old) and /work/SRC/openSUSE:Factory/.gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtk3" Tue Nov 21 15:23:59 2017 rev:121 rq:542842 version:3.22.25 Changes: -------- --- /work/SRC/openSUSE:Factory/gtk3/gtk3.changes 2017-11-03 19:05:58.356368963 +0100 +++ /work/SRC/openSUSE:Factory/.gtk3.new/gtk3.changes 2017-11-21 15:24:14.382895089 +0100 @@ -1,0 +2,7 @@ +Fri Nov 17 17:12:13 CET 2017 - [email protected] + +- Add gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch: + Present FUSE reachable network shares in gtkplacesview (bgo#787128, + bsc#1062879) + +------------------------------------------------------------------- New: ---- gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk3.spec ++++++ --- /var/tmp/diff_new_pack.kS0xal/_old 2017-11-21 15:24:16.366823176 +0100 +++ /var/tmp/diff_new_pack.kS0xal/_new 2017-11-21 15:24:16.370823031 +0100 @@ -50,6 +50,8 @@ Patch4: gtk3-revert-forced-xftdpi.patch # PATCH-FIX-UPSTREAM gtk3-wayland-distribute-server-decoration-xml.patch bgo#789630 [email protected] -- Builds that include wayland fail unless gtk/wayland/protocol/server-decoration.xml is included in tarballs Patch5: gtk3-wayland-distribute-server-decoration-xml.patch +# PATCH-FIX-UPSTREAM gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch bgo#787128 bsc#1062879 [email protected] -- Present FUSE reachable network shared in gtkplacesview +Patch6: gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -372,6 +374,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build # Disabled since patch 1 is in need of rebase ++++++ gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch ++++++ Index: gtk+-3.20.10/gtk/gtkplacesview.c =================================================================== --- gtk+-3.20.10.orig/gtk/gtkplacesview.c +++ gtk+-3.20.10/gtk/gtkplacesview.c @@ -1129,8 +1129,7 @@ update_places (GtkPlacesView *view) populate_servers (view); /* fetch networks and add them asynchronously */ - if (!gtk_places_view_get_local_only (view)) - fetch_networks (view); + fetch_networks (view); update_view_mode (view); /* Check whether we still are in a loading state */ @@ -1895,12 +1894,37 @@ on_listbox_row_activated (GtkPlacesView } static gboolean +is_mount_locally_accessible (GMount *mount) +{ + GFile *base_file; + gchar *path; + + if (mount == NULL) + return FALSE; + + base_file = g_mount_get_root (mount); + + if (base_file == NULL) + return FALSE; + + path = g_file_get_path (base_file); + g_object_unref (base_file); + + if (path == NULL) + return FALSE; + + g_free (path); + return TRUE; +} + +static gboolean listbox_filter_func (GtkListBoxRow *row, gpointer user_data) { GtkPlacesViewPrivate *priv; gboolean is_network; gboolean is_placeholder; + gboolean is_local = FALSE; gboolean retval; gboolean searching; gchar *name; @@ -1913,7 +1937,20 @@ listbox_filter_func (GtkListBoxRow *row, is_network = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "is-network")); is_placeholder = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "is-placeholder")); - if (is_network && priv->local_only) + if (GTK_IS_PLACES_VIEW_ROW (row)) + { + GtkPlacesViewRow *placesviewrow; + GMount *mount; + + placesviewrow = GTK_PLACES_VIEW_ROW (row); + g_object_get(G_OBJECT (placesviewrow), "mount", &mount, NULL); + + is_local = is_mount_locally_accessible (mount); + + g_clear_object (&mount); + } + + if (is_network && priv->local_only && !is_local) return FALSE; if (is_placeholder && searching)
