From 05a8ed1e4f43536bc8e3f2cba3ff67f04d81eb89 Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Mon, 17 Dec 2012 13:09:29 +0100 Subject: database: make merge() GObject-like --- include/libmsi-database.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/libmsi-database.h b/include/libmsi-database.h index bd1e5f3..a43d86e 100644 --- a/include/libmsi-database.h +++ b/include/libmsi-database.h @@ -61,8 +61,12 @@ gboolean libmsi_database_import (LibmsiDatabase *db, const char *folder, const char *filename, GError **error); -LibmsiCondition libmsi_database_is_table_persistent (LibmsiDatabase *, const char *); -LibmsiResult libmsi_database_merge (LibmsiDatabase *, LibmsiDatabase *, const char *); +LibmsiCondition libmsi_database_is_table_persistent (LibmsiDatabase *db, + const char *table); +gboolean libmsi_database_merge (LibmsiDatabase *db, + LibmsiDatabase *merge, + const char *table, + GError **error); LibmsiResult libmsi_database_get_summary_info (LibmsiDatabase *, unsigned, LibmsiSummaryInfo **); LibmsiResult libmsi_database_commit (LibmsiDatabase *); -- cgit