[Libreoffice-commits] core.git: connectivity/source

Caolán McNamara caolanm at redhat.com
Mon Feb 11 08:01:01 PST 2013


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

New commits:
commit 428478b9da0c1a68842d1afd441f8d779c380b87
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 11 15:58:42 2013 +0000

    no g_list_free_full in RHEL-6 glib
    
    Change-Id: I213bb62c2a9318d98f0736cc23431dca3dfd4708

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;
 


More information about the Libreoffice-commits mailing list