[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - libreofficekit/source

[Miklos Vajna]

 libreofficekit/source/gtk/lokdocview.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 3689e73d884463103a6783547074bc5ced5d5dab
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Mon Feb 9 08:02:46 2015 +0100

    lokdocview: fix Linux baseline build
    
    Baseline is only used for releases, while lokdocview is a tool to
    helpdevelopment for now, so don't bother with full compatiblity, just add
    enough to not break the build.
    
    Change-Id: I52e312d3c3ae80636448bf42d5f277184fb9ca7b

diff --git a/libreofficekit/source/gtk/lokdocview.c 
b/libreofficekit/source/gtk/lokdocview.c
index 3e223fd..bdb7270 100644
--- a/libreofficekit/source/gtk/lokdocview.c
+++ b/libreofficekit/source/gtk/lokdocview.c
@@ -181,6 +181,7 @@ static gboolean lcl_handleTimeout(gpointer pData)
 
 static gboolean renderOverlay(GtkWidget* pWidget, GdkEventExpose* pEvent, 
gpointer pData)
 {
+#if GTK_CHECK_VERSION(2,14,0) // we need gtk_widget_get_window()
     LOKDocView* pDocView = pData;
     cairo_t* pCairo;
 
@@ -217,6 +218,7 @@ static gboolean renderOverlay(GtkWidget* pWidget, 
GdkEventExpose* pEvent, gpoint
     }
 
     cairo_destroy(pCairo);
+#endif
     return FALSE;
 }
 
@@ -382,6 +384,7 @@ static GList* lcl_payloadToRectangles(const char* pPayload)
 /// Invoked on the main thread if lok_docview_callback_worker() requests so.
 static gboolean lok_docview_callback(gpointer pData)
 {
+#if GLIB_CHECK_VERSION(2,28,0) // we need g_list_free_full()
     LOKDocViewCallbackData* pCallback = pData;
 
     switch (pCallback->m_nType)
@@ -419,6 +422,7 @@ static gboolean lok_docview_callback(gpointer pData)
 
     g_free(pCallback->m_pPayload);
     g_free(pCallback);
+#endif
     return G_SOURCE_REMOVE;
 }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits