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/where.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/where.c')
| -rw-r--r-- | libmsi/where.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libmsi/where.c b/libmsi/where.c index 154a22a..18473ec 100644 --- a/libmsi/where.c +++ b/libmsi/where.c @@ -332,7 +332,7 @@ static unsigned where_view_set_row( LibmsiView *view, unsigned row, LibmsiRecord if (r == LIBMSI_RESULT_SUCCESS) r = table->view->ops->set_row(table->view, rows[table->table_index], reduced, reduced_mask); - msiobj_release(&reduced->hdr); + g_object_unref(reduced); } while ((table = table->next)); return r; @@ -894,7 +894,7 @@ static unsigned where_view_delete( LibmsiView *view ) msi_free(wv->order_info); wv->order_info = NULL; - msiobj_release( &wv->db->hdr ); + g_object_unref(wv->db); msi_free( wv ); return LIBMSI_RESULT_SUCCESS; @@ -1105,8 +1105,7 @@ unsigned where_view_create( LibmsiDatabase *db, LibmsiView **view, char *tables, /* fill the structure */ wv->view.ops = &where_ops; - msiobj_addref( &db->hdr ); - wv->db = db; + wv->db = g_object_ref(db); wv->cond = cond; while (*tables) |