diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-05-11 17:35:04 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-05-13 08:27:25 +0000 |
| commit | bfdab9aeb1290f970d11c3704cbb11992c0d6304 (patch) | |
| tree | b2938ea08b6bfbfc2eba6317aff368d00e76e93e | |
| parent | 71f77792ed000e30a5cb090b0a21b8d1c577c23f (diff) | |
fdo#64311 - don't encourage the fpicker to give us URLs we can't handle.
(cherry picked from commit 8659ca5c350b9b08fb5f343c68955cdd6d361c96)
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Conflicts:
config_host/config_vclplug.h.in
Change-Id: Ide7d833801e96a3375909238d036687082f34605
Reviewed-on: https://gerrit.libreoffice.org/3881
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | vcl/Library_vclplug_gtk.mk | 12 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 2 |
4 files changed, 18 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 9a89227536df..17f792df86a9 100644 --- a/configure.ac +++ b/configure.ac @@ -9266,6 +9266,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 @@ -9405,6 +9406,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 diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 153498c037ee..86c1c6ae0555 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -37,6 +37,18 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\ )) endif +ifeq ($(ENABLE_GIO),TRUE) +$(eval $(call gb_Library_add_defs,vclplug_gtk,\ + -DENABLE_GIO \ +)) +endif + +ifeq ($(ENABLE_GNOMEVFS),TRUE) +$(eval $(call gb_Library_add_defs,vclplug_gtk,\ + -DENABLE_GNOME_VFS \ +)) +endif + $(eval $(call gb_Library_use_sdk_api,vclplug_gtk)) $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index b4f1c6a0418b..f2e114184a89 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -146,7 +146,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 ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index d062cda4a277..b80d6f577d73 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -56,7 +56,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 ); } |