diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 11:35:57 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-11 11:38:05 +0100 |
commit | cb4d4b7214170989fbce773bcf2dc0ca0581f4af (patch) | |
tree | 43cad405aa6ae7bb8064f1be47cad94dc255ba5c /libmsi/distinct.c | |
parent | 4a33d8ff9f1e0593bd49922cd46aa3e6a7aa1273 (diff) | |
parent | ae4c81e4fca5bb5816b5cbabb17a7dcc22f58a3b (diff) | |
download | msitools-cb4d4b7214170989fbce773bcf2dc0ca0581f4af.tar.gz msitools-cb4d4b7214170989fbce773bcf2dc0ca0581f4af.tar.xz msitools-cb4d4b7214170989fbce773bcf2dc0ca0581f4af.zip |
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
Diffstat (limited to 'libmsi/distinct.c')
-rw-r--r-- | libmsi/distinct.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmsi/distinct.c b/libmsi/distinct.c index 89614e3..d134b03 100644 --- a/libmsi/distinct.c +++ b/libmsi/distinct.c @@ -220,7 +220,7 @@ static unsigned distinct_view_delete( LibmsiView *view ) dv->table->ops->delete( dv->table ); msi_free( dv->translation ); - msiobj_release( &dv->db->hdr ); + g_object_unref(dv->db); msi_free( dv ); return LIBMSI_RESULT_SUCCESS; @@ -289,8 +289,7 @@ unsigned distinct_view_create( LibmsiDatabase *db, LibmsiView **view, LibmsiView /* fill the structure */ dv->view.ops = &distinct_ops; - msiobj_addref( &db->hdr ); - dv->db = db; + dv->db = g_object_ref(db); dv->table = table; dv->translation = NULL; dv->row_count = 0; |