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

diff --git a/tools/msibuild.c b/tools/msibuild.c
index a0bb01b..b2ab565 100644
--- a/tools/msibuild.c
+++ b/tools/msibuild.c
@@ -95,7 +95,7 @@ static LibmsiResult open_database(const char *msifile, LibmsiDatabase **db,
         if (r != LIBMSI_RESULT_SUCCESS)
         {
             fprintf(stderr, "failed to commit database (%u)\n", r);
-            libmsi_unref(*db);
+            g_object_unref(*db);
             return r;
         }
     }
@@ -183,9 +183,9 @@ static int add_stream(const char *stream, const char *file)
     if (r != LIBMSI_RESULT_SUCCESS)
         fprintf(stderr, "failed to execute query (%u)\n", r);
 
-    libmsi_unref(rec);
+    g_object_unref(rec);
     libmsi_query_close(query);
-    libmsi_unref(query);
+    g_object_unref(query);
     return r;
 }
 
@@ -205,7 +205,7 @@ static int do_query(const char *sql, void *opaque)
         fprintf(stderr, "failed to execute query (%u)\n", r);
 
     libmsi_query_close(query);
-    libmsi_unref(query);
+    g_object_unref(query);
     return r;
 }
 
@@ -318,7 +318,7 @@ int main(int argc, char *argv[])
             exit(1);
         }
     }
-    libmsi_unref(si);
-    libmsi_unref(db);
+    g_object_unref(si);
+    g_object_unref(db);
     return r != LIBMSI_RESULT_SUCCESS;
 }