|
 |
5506cea |
From ecf6b9a9020d086ce411c26a1972811002d500a5 Mon Sep 17 00:00:00 2001
|
|
|
5506cea |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
5506cea |
Date: Mon, 11 Feb 2013 15:58:42 +0000
|
|
|
5506cea |
Subject: [PATCH] no g_list_free_full in RHEL-6 glib
|
|
|
5506cea |
|
|
|
5506cea |
Change-Id: I213bb62c2a9318d98f0736cc23431dca3dfd4708
|
|
|
5506cea |
---
|
|
|
5506cea |
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 3 ++-
|
|
|
5506cea |
connectivity/source/drivers/evoab2/NResultSet.cxx | 3 ++-
|
|
|
5506cea |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
5506cea |
|
|
|
5506cea |
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
|
|
|
5506cea |
index a83de24..11742c1 100644
|
|
|
5506cea |
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
|
|
|
5506cea |
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
|
|
|
5506cea |
@@ -1170,7 +1170,8 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
|
|
|
5506cea |
aRows.push_back(aRow);
|
|
|
5506cea |
}
|
|
|
5506cea |
|
|
|
5506cea |
- g_list_free_full (pSources, g_object_unref);
|
|
|
5506cea |
+ g_list_foreach (pSources, (GFunc)g_object_unref, NULL);
|
|
|
5506cea |
+ g_list_free (pSources);
|
|
|
5506cea |
}
|
|
|
5506cea |
else
|
|
|
5506cea |
{
|
|
|
5506cea |
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
|
|
|
5506cea |
index 4baf3ae..154db40 100644
|
|
|
5506cea |
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
|
|
|
5506cea |
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
|
|
|
5506cea |
@@ -405,7 +405,8 @@ public:
|
|
|
5506cea |
break;
|
|
|
5506cea |
}
|
|
|
5506cea |
}
|
|
|
5506cea |
- g_list_free_full (pSources, g_object_unref);
|
|
|
5506cea |
+ g_list_foreach (pSources, (GFunc)g_object_unref, NULL);
|
|
|
5506cea |
+ g_list_free (pSources);
|
|
|
5506cea |
if (!id)
|
|
|
5506cea |
return NULL;
|
|
|
5506cea |
|
|
|
5506cea |
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
|
|
|
5506cea |
index a33a558..63d066a 100644
|
|
|
5506cea |
--- a/vcl/inc/unx/gtk/gtkframe.hxx
|
|
|
5506cea |
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
|
|
|
5506cea |
@@ -54,6 +54,10 @@ typedef XLIB_Window GdkNativeWindow;
|
|
|
5506cea |
#define gdk_window_foreign_new_for_display(a,b) gdk_x11_window_foreign_new_for_display(a,b)
|
|
|
5506cea |
#endif
|
|
|
5506cea |
|
|
|
5506cea |
+#if !(GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 26)
|
|
|
5506cea |
+ typedef void GDBusConnection;
|
|
|
5506cea |
+#endif
|
|
|
5506cea |
+
|
|
|
5506cea |
class GtkSalFrame : public SalFrame
|
|
|
5506cea |
{
|
|
|
5506cea |
static const int nMaxGraphics = 2;
|