Kaydet (Commit) 8659ca5c authored tarafından Michael Meeks's avatar Michael Meeks

fdo#64311 - don't encourage the fpicker to give us URLs we can't handle.

Change-Id: Ide7d833801e96a3375909238d036687082f34605
üst 363b82fd
......@@ -11,5 +11,7 @@ Settings about which X11 desktops have support enabled.
#define ENABLE_KDE 0
#define ENABLE_KDE4 0
#define ENABLE_TDE 0
#define ENABLE_GNOME_VFS 0
#define ENABLE_GIO 0
#endif
......@@ -9346,6 +9346,7 @@ if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes" -
ENABLE_GNOMEVFS="TRUE"
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 >= 2.6.0 )
AC_DEFINE(ENABLE_GNOME_VFS)
else
AC_MSG_RESULT([no])
fi
......@@ -9485,6 +9486,7 @@ if test "$test_gtk" = "yes"; then
ENABLE_GIO="TRUE"
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( GIO, gio-2.0 )
AC_DEFINE(ENABLE_GIO)
else
AC_MSG_RESULT([no])
fi
......
......@@ -23,6 +23,8 @@
#undef _LINUX_SOURCE_COMPAT
#endif
#include <config_vclplug.h>
#include <com/sun/star/awt/Toolkit.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
......@@ -138,7 +140,9 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
#if defined(ENABLE_GNOME_VFS) || defined (ENABLE_GIO)
gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
#endif
gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
m_pVBox = gtk_vbox_new( sal_False, 0 );
......
......@@ -23,6 +23,8 @@
#undef _LINUX_SOURCE_COMPAT
#endif
#include <config_vclplug.h>
#include <com/sun/star/awt/Toolkit.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
......@@ -57,7 +59,9 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, (char *)NULL );
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
#if defined(ENABLE_GNOME_VFS) || defined (ENABLE_GIO)
gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
#endif
gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment