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, 2 insertions, 2 deletions

diff --git a/libmsi/select.c b/libmsi/select.c
index e0967b4..7fe5a16 100644
--- a/libmsi/select.c
+++ b/libmsi/select.c
@@ -132,7 +132,7 @@ static unsigned select_view_set_row( LibmsiView *view, unsigned row, LibmsiRecor
     if (r == LIBMSI_RESULT_SUCCESS)
         r = sv->table->ops->set_row( sv->table, row, expanded, expanded_mask );
 
-    msiobj_release( &expanded->hdr );
+    g_object_unref(expanded);
     return r;
 }
 
@@ -164,7 +164,7 @@ static unsigned select_view_insert_row( LibmsiView *view, LibmsiRecord *record,
     r = sv->table->ops->insert_row( sv->table, outrec, row, temporary );
 
 fail:
-    msiobj_release( &outrec->hdr );
+    g_object_unref(outrec);
 
     return r;
 }