From 9cd793968e42a7b018c7af5875e376f7473f7037 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 3 Oct 2008 17:29:42 +0000 Subject: [PATCH] 2008-10-03 [colin] 3.6.0cvs1 * src/gtk/filesel.c Allow network mounts with new GTKs: they're available via FUSE mounts and we don't need GVFS. --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/filesel.c | 5 +++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5eae08a18..95c202782 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-10-03 [colin] 3.6.0cvs1 + + * src/gtk/filesel.c + Allow network mounts with new GTKs: they're + available via FUSE mounts and we don't need + GVFS. + 2008-10-03 [paul] 3.6.0 * NEWS diff --git a/PATCHSETS b/PATCHSETS index 95045a5a7..5e221ae19 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3557,3 +3557,4 @@ ( cvs diff -u -r 1.179.2.232 -r 1.179.2.233 src/imap.c; ) > 3.5.0cvs143.patchset ( cvs diff -u -r 1.23.2.19 -r 1.23.2.20 src/common/session.c; ) > 3.5.0cvs144.patchset ( cvs diff -u -r 1.654.2.3618 -r 1.654.2.3619 configure.ac; cvs diff -u -r 1.21.2.6 -r 1.21.2.7 po/bg.po; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 po/ca.po; cvs diff -u -r 1.58.2.40 -r 1.58.2.41 po/de.po; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 po/fi.po; cvs diff -u -r 1.42.2.40 -r 1.42.2.41 po/fr.po; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 po/hu.po; cvs diff -u -r 1.34.2.27 -r 1.34.2.28 po/it.po; cvs diff -u -r 1.28.2.10 -r 1.28.2.11 po/nl.po; cvs diff -u -r 1.10.2.16 -r 1.10.2.17 po/pl.po; cvs diff -u -r 1.17.2.17 -r 1.17.2.18 po/ru.po; cvs diff -u -r 1.4.2.8 -r 1.4.2.9 po/sv.po; cvs diff -u -r 1.5.2.27 -r 1.5.2.28 po/zh_CN.po; ) > 3.5.0cvs145.patchset +( cvs diff -u -r 1.2.2.38 -r 1.2.2.39 src/gtk/filesel.c; ) > 3.6.0cvs1.patchset diff --git a/configure.ac b/configure.ac index 51be92d28..6be4c6551 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=0 +EXTRA_VERSION=1 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/filesel.c b/src/gtk/filesel.c index ca69a598e..3f4c7a423 100644 --- a/src/gtk/filesel.c +++ b/src/gtk/filesel.c @@ -124,6 +124,11 @@ static GList *filesel_create(const gchar *title, const gchar *path, NULL); #endif #endif + +#if GLIB_CHECK_VERSION(2,16,0) + gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(chooser), FALSE); +#endif + if (filter != NULL) { GtkFileFilter *file_filter = gtk_file_filter_new(); gtk_file_filter_add_pattern(file_filter, filter); -- 2.25.1