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

Caolán McNamara caolanm at redhat.com
Fri Jun 19 06:29:43 PDT 2015


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

New commits:
commit a319ef245229b18082110cd5e5014fe1fa250114
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 19 14:28:47 2015 +0100

    gtk3: gtk_dialog_get_header_bar new in 3.12
    
    Change-Id: Ifc63714b6b9e797b668cccc46052cb9d791122ea
    (cherry picked from commit b6d31d5a1897834b84477f32cdb2331e426d4c70)

diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 2de19dc..de85382 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -425,8 +425,12 @@ dialog_remove_buttons( GtkDialog *pDialog )
     GtkWidget *pActionArea;
 
 #if GTK_CHECK_VERSION(3,0,0)
+#if GTK_CHECK_VERSION(3,12,0)
     pActionArea = gtk_dialog_get_header_bar(pDialog);
 #else
+    pActionArea = gtk_dialog_get_action_area(pDialog);
+#endif
+#else
     pActionArea = pDialog->action_area;
 #endif
 


More information about the Libreoffice-commits mailing list