Attachment 179731 Details for Bug 203563 – Fix GTK3 crash

[patch] Fix GTK3 crash

patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx (text/plain), 980 bytes, created by Jung-uk Kim on 2017-02-07 23:29:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2017-02-07 23:29:06 UTC

Size: 980 bytes

patch

obsolete

>--- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx.orig	2017-01-12 00:54:33 UTC
>+++ vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
>@@ -418,8 +418,11 @@ shrinkFilterName( const OUString &rFilte
> static void
> dialog_remove_buttons(GtkWidget *pActionArea)
> {
>-    GList *pChildren =
>-        gtk_container_get_children( GTK_CONTAINER( pActionArea ) );
>+    GtkContainer *pContainer = GTK_CONTAINER( pActionArea );
>+
>+    g_return_if_fail( pContainer != nullptr );
>+
>+    GList *pChildren = gtk_container_get_children( pContainer );
> 
>     for( GList *p = pChildren; p; p = p->next )
>     {
>@@ -436,10 +439,10 @@ dialog_remove_buttons( GtkDialog *pDialo
> {
>     g_return_if_fail( GTK_IS_DIALOG( pDialog ) );
> 
>-#if GTK_CHECK_VERSION(3,0,0)
> #if GTK_CHECK_VERSION(3,12,0)
>     dialog_remove_buttons(gtk_dialog_get_header_bar(pDialog));
> #endif
>+#if GTK_CHECK_VERSION(2,14,0)
>     dialog_remove_buttons(gtk_dialog_get_action_area(pDialog));
> #else
>     dialog_remove_buttons(pDialog->action_area);

Actions: View | Diff

Attachments on bug 203563: 161737 | 164277 | 179545 | 179547 | 179729 | 179731