Merge branch 'pre-gsf'

Conflicts:
	libmsi/Makefile.am
	libmsi/handle.c
	libmsi/libmsi-database.c
	libmsi/libmsi-query.c
	libmsi/libmsi-record.c
	libmsi/libmsi-summary-info.c
	libmsi/msipriv.h

1 files changed, 7 insertions, 7 deletions

diff --git a/libmsi/insert.c b/libmsi/insert.c
index 9ad48a7..1301584 100644
--- a/libmsi/insert.c
+++ b/libmsi/insert.c
@@ -91,7 +91,7 @@ LibmsiRecord *msi_query_merge_record( unsigned fields, const column_info *vl, Li
 
     return merged;
 err:
-    msiobj_release( &merged->hdr );
+    g_object_unref(merged);
     return NULL;
 }
 
@@ -161,12 +161,12 @@ static unsigned msi_arrange_record(LibmsiInsertView *iv, LibmsiRecord **values)
             }
         }
     }
-    msiobj_release(&(*values)->hdr);
+    g_object_unref(*values);
     *values = padded;
     return LIBMSI_RESULT_SUCCESS;
 
 err:
-    msiobj_release(&padded->hdr);
+    g_object_unref(padded);
     return r;
 }
 
@@ -237,7 +237,7 @@ static unsigned insert_view_execute( LibmsiView *view, LibmsiRecord *record )
 
 err:
     if( values )
-        msiobj_release( &values->hdr );
+        g_object_unref(values);
 
     return r;
 }
@@ -296,7 +296,7 @@ static unsigned insert_view_delete( LibmsiView *view )
     sv = iv->sv;
     if( sv )
         sv->ops->delete( sv );
-    msiobj_release( &iv->db->hdr );
+    g_object_unref(iv->db);
     msi_free( iv );
 
     return LIBMSI_RESULT_SUCCESS;
@@ -372,9 +372,9 @@ unsigned insert_view_create( LibmsiDatabase *db, LibmsiView **view, const char *
 
     /* fill the structure */
     iv->view.ops = &insert_ops;
-    msiobj_addref( &db->hdr );
+
     iv->table = tv;
-    iv->db = db;
+    iv->db = g_object_ref(db);
     iv->vals = values;
     iv->bIsTemp = temp;
     iv->sv = sv;