From ecf6b9a9020d086ce411c26a1972811002d500a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 11 Feb 2013 15:58:42 +0000
Subject: [PATCH] no g_list_free_full in RHEL-6 glib

Change-Id: I213bb62c2a9318d98f0736cc23431dca3dfd4708
---
 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 3 ++-
 connectivity/source/drivers/evoab2/NResultSet.cxx        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index a83de24..11742c1 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -1170,7 +1170,8 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
             aRows.push_back(aRow);
         }
 
-        g_list_free_full (pSources, g_object_unref);
+        g_list_foreach (pSources, (GFunc)g_object_unref, NULL);
+        g_list_free (pSources);
     }
     else
     {
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 4baf3ae..154db40 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -405,7 +405,8 @@ public:
                 break;
             }
         }
-        g_list_free_full (pSources, g_object_unref);
+        g_list_foreach (pSources, (GFunc)g_object_unref, NULL);
+        g_list_free (pSources);
         if (!id)
             return NULL;
 
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index a33a558..63d066a 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -54,6 +54,10 @@ typedef XLIB_Window GdkNativeWindow;
 #define gdk_window_foreign_new_for_display(a,b) gdk_x11_window_foreign_new_for_display(a,b)
 #endif
 
+#if !(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 26)
+    typedef void GDBusConnection;
+#endif
+
 class GtkSalFrame : public SalFrame
 {
     static const int nMaxGraphics = 2;