[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 71dd1d72358a862b4cf36d5014624ab9d8c8a402
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue May 11 09:08:57 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue May 11 12:16:36 2021 +0200

    gtk4: current-folder-changed removed without replacement
    
    since...
    
    commit e31bacf7be3dcc5295c89f8e929b53636976ebaa
    Date:   Thu Jul 9 01:48:33 2020 -0400
    
        filechooser: Drop the ::current-folder-changed signal
    
        This signal does not work on native file choosers,
        and it exposes internals of the widget that should
        not be public. And it is just not very interesting.
    
    Change-Id: I170f91b6dc87965248e206c2b1a2863448e5c976
    
    and selection-changed removed without replacement
    
    since...
    
    commit 2746a2d929615231af10f221fc2ab416537285f3
    Date:   Thu Jul 9 02:06:31 2020 -0400
    
        filechooser: Drop the ::selection-changed signal
    
        This signal does not work on native file choosers,
        and it exposes internals of the widget that should
        not be public. And it is just not very interesting.
    
    which doesn't bode too well.
    
    Change-Id: Ib8657afbbc23bf921c0bfad037d7cdb0bc490790
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115385
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
index 5df93c145fd6..c0113822b27f 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
@@ -946,13 +946,23 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute()
     if ( !m_aCurrentFilter.isEmpty() )
         SetCurFilter(m_aCurrentFilter);
 
+#if !GTK_CHECK_VERSION(4, 0, 0)
     mnHID_FolderChange =
         g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "current-folder-changed",
             G_CALLBACK( folder_changed_cb ), static_cast<gpointer>(this) );
+#else
+    // no replacement in 4-0 that I can see :-(
+    mnHID_FolderChange = 0;
+#endif
 
+#if !GTK_CHECK_VERSION(4, 0, 0)
     mnHID_SelectionChange =
         g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "selection-changed",
             G_CALLBACK( selection_changed_cb ), static_cast<gpointer>(this) );
+#else
+    // no replacement in 4-0 that I can see :-(
+    mnHID_SelectionChange = 0;
+#endif
 
     int btn = GTK_RESPONSE_NO;