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

[Miklos Vajna]

 libreofficekit/source/gtk/lokdocview.cxx |    2 ++
 libreofficekit/source/gtk/tilebuffer.cxx |    4 ++++
 2 files changed, 6 insertions(+)

New commits:
commit afdb81c7822d4d44929253077aabe3a6cd0f5be8
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jun 8 08:02:37 2015 +0200

    libreofficekit: fix RHEL5 build of tilebuffer
    
    Change-Id: I27da86c774f0450c844e742563c4a8de3f23ad34

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index b6c529f..166fecb 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -1335,6 +1335,7 @@ SAL_DLLPUBLIC_EXPORT void lok_doc_view_post_key(GtkWidget* /*pWidget*/, GdkEvent
 
 SAL_DLLPUBLIC_EXPORT void lok_doc_view_get_visarea(LOKDocView* pThis, GdkRectangle* pArea)
 {
+#if GTK_CHECK_VERSION(2,14,0) // we need gtk_adjustment_get_page_size()
     float zoom = pThis->m_pImpl->m_fZoom;
     GtkAdjustment* pHAdjustment = gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(pThis));
     pArea->x = pixelToTwip(gtk_adjustment_get_value(pHAdjustment),zoom);
@@ -1342,6 +1343,7 @@ SAL_DLLPUBLIC_EXPORT void lok_doc_view_get_visarea(LOKDocView* pThis, GdkRectang
     GtkAdjustment* pVAdjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(pThis));
     pArea->y = pixelToTwip(gtk_adjustment_get_value(pVAdjustment), zoom);
     pArea->height = pixelToTwip(gtk_adjustment_get_page_size(pVAdjustment), zoom);
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/libreofficekit/source/gtk/tilebuffer.cxx b/libreofficekit/source/gtk/tilebuffer.cxx
index 3380380..0c79823 100644
--- a/libreofficekit/source/gtk/tilebuffer.cxx
+++ b/libreofficekit/source/gtk/tilebuffer.cxx
@@ -9,6 +9,10 @@
 
 #include "tilebuffer.hxx"
 
+#if !GLIB_CHECK_VERSION(2,40,0)
+#define g_info(...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__)
+#endif
+
 /* ------------------
    Utility functions
    ------------------