[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx

[Maxim Monastirsky]

 vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b9996778c3033281d624b960c61200cfbb4c7746
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sat Oct 17 23:42:15 2015 +0300

    tdf#94936 Update the button removal hack to 3.18
    
    Gtk 3.18 has the filename entry in the header too.
    
    Change-Id: Id1abf5baf0e82c03e27ede2bfc67ec1983a2c4fb
    (cherry picked from commit c1b97d2747004d1912744ab7ff11353a73713310)
    Reviewed-on: https://gerrit.libreoffice.org/19427
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index cee1e3e..c7e1256 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -425,7 +425,11 @@ dialog_remove_buttons(GtkWidget *pActionArea)
         gtk_container_get_children( GTK_CONTAINER( pActionArea ) );
 
     for( GList *p = pChildren; p; p = p->next )
-        gtk_widget_destroy( GTK_WIDGET( p->data ) );
+    {
+        GtkWidget *pWidget = GTK_WIDGET( p->data );
+        if ( GTK_IS_BUTTON( pWidget ) )
+            gtk_widget_destroy( pWidget );
+    }
 
     g_list_free( pChildren );
 }