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

2 files changed, 25 insertions, 25 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;
 }
diff --git a/tools/msiinfo.c b/tools/msiinfo.c
index 9f54520..5a6dfc8 100644
--- a/tools/msiinfo.c
+++ b/tools/msiinfo.c
@@ -178,7 +178,7 @@ static LibmsiResult print_strings_from_query(LibmsiQuery *query)
         }
 
         puts(name);
-        libmsi_unref(rec);
+        g_object_unref(rec);
     }
 
     if (r == LIBMSI_RESULT_NO_MORE_ITEMS) {
@@ -217,8 +217,8 @@ static int cmd_streams(struct Command *cmd, int argc, char **argv)
         print_libmsi_error(r);
     }
 
-    libmsi_unref(query);
-    libmsi_unref(db);
+    g_object_unref(query);
+    g_object_unref(db);
 
     return 0;
 }
@@ -253,8 +253,8 @@ static int cmd_tables(struct Command *cmd, int argc, char **argv)
         print_libmsi_error(r);
     }
 
-    libmsi_unref(query);
-    libmsi_unref(db);
+    g_object_unref(query);
+    g_object_unref(db);
 
     return 0;
 }
@@ -343,8 +343,8 @@ static int cmd_suminfo(struct Command *cmd, int argc, char **argv)
     print_suminfo(si, MSI_PID_APPNAME, "Application");
     print_suminfo(si, MSI_PID_SECURITY, "Security");
 
-    libmsi_unref(db);
-    libmsi_unref(si);
+    g_object_unref(db);
+    g_object_unref(si);
 
     return 0;
 }
@@ -388,7 +388,7 @@ static int cmd_extract(struct Command *cmd, int argc, char **argv)
     rec = libmsi_record_new(1);
     libmsi_record_set_string(rec, 1, argv[2]);
     r = libmsi_query_execute(query, rec);
-    libmsi_unref(rec);
+    g_object_unref(rec);
     if (r) {
         print_libmsi_error(r);
     }
@@ -417,9 +417,9 @@ static int cmd_extract(struct Command *cmd, int argc, char **argv)
         size -= bufsize;
     }
 
-    libmsi_unref(rec);
-    libmsi_unref(query);
-    libmsi_unref(db);
+    g_object_unref(rec);
+    g_object_unref(query);
+    g_object_unref(db);
 
     return 0;
 }
@@ -644,7 +644,7 @@ static unsigned export_sql( LibmsiDatabase *db, const char *table)
     while ((r = libmsi_query_fetch(query, &rec)) == LIBMSI_RESULT_SUCCESS) {
         unsigned size = PATH_MAX;
         r = export_insert(table, name, type, rec);
-        libmsi_unref(rec);
+        g_object_unref(rec);
         if (r) {
             break;
         }
@@ -655,10 +655,10 @@ static unsigned export_sql( LibmsiDatabase *db, const char *table)
     }
 
 done:
-    libmsi_unref(name);
-    libmsi_unref(type);
-    libmsi_unref(keys);
-    libmsi_unref(query);
+    g_object_unref(name);
+    g_object_unref(type);
+    g_object_unref(keys);
+    g_object_unref(query);
     return r;
 }
 
@@ -666,10 +666,10 @@ static int cmd_export(struct Command *cmd, int argc, char **argv)
 {
     LibmsiDatabase *db = NULL;
     LibmsiResult r;
-    bool sql = false;
+    gboolean sql = FALSE;
 
     if (!strcmp(argv[1], "-s")) {
-        sql = true;
+        sql = TRUE;
         argc--;
         argv++;
     }
@@ -696,7 +696,7 @@ static int cmd_export(struct Command *cmd, int argc, char **argv)
         print_libmsi_error(r);
     }
 
-    libmsi_unref(db);
+    g_object_unref(db);
 
     return 0;
 }