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

[Caolán McNamara]

 vcl/unx/gtk/glomenu.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 692c4b3c8535b7886a34f1c4138e0984374d3665
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 22 10:27:15 2016 +0100

    g_icon_serialize is only in glib >= 2.38
    
    Change-Id: I824ebd9083bd702e90f577471248be43707cc811
    (cherry picked from commit 1ad4575723a91883b8c179e247fd06d822ca7f84)

diff --git a/vcl/unx/gtk/glomenu.cxx b/vcl/unx/gtk/glomenu.cxx
index ffa43e5..aab6857 100644
--- a/vcl/unx/gtk/glomenu.cxx
+++ b/vcl/unx/gtk/glomenu.cxx
@@ -238,7 +238,13 @@ g_lo_menu_set_icon (GLOMenu     *menu,
     GVariant *value;
 
     if (icon != nullptr)
+    {
+#if GLIB_CHECK_VERSION(2,38,0)
         value = g_icon_serialize (const_cast<GIcon*>(icon));
+#else
+        value = nullptr;
+#endif
+    }
     else
         value = nullptr;