pool/gtk3
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 542842 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/542842
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=121
This commit is contained in:
Dominique Leuenberger 2017-11-21 14:23:59 +00:00 committed by Git OBS Bridge
commit 14f92df45a
3 changed files with 84 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch Normal file
View File

@ -0,0 +1,74 @@
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)

7
gtk3.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Nov 17 17:12:13 CET 2017 - vliaskovitis@suse.com
- Add gtk3-placesview-Present-FUSE-reachable-network-shares-in-.patch:
Present FUSE reachable network shares in gtkplacesview (bgo#787128,
bsc#1062879)
-------------------------------------------------------------------
Tue Oct 31 07:27:50 UTC 2017 - badshah400@gmail.com

3
gtk3.spec
View File

@ -50,6 +50,8 @@ Patch3: gtk3-restore-filechooser-click-behavior.patch
Patch4: gtk3-revert-forced-xftdpi.patch
# PATCH-FIX-UPSTREAM gtk3-wayland-distribute-server-decoration-xml.patch bgo#789630 badshah400@gmail.com -- 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 vliaskovitis@suse.com -- 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 @@ cp -a %{S:1} .
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
# Disabled since patch 1 is in need of rebase