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/update.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/update.c')
| -rw-r--r-- | libmsi/update.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libmsi/update.c b/libmsi/update.c index 9b63fd6..95effb4 100644 --- a/libmsi/update.c +++ b/libmsi/update.c @@ -111,8 +111,8 @@ static unsigned update_view_execute( LibmsiView *view, LibmsiRecord *record ) } done: - if ( where ) msiobj_release( &where->hdr ); - if ( values ) msiobj_release( &values->hdr ); + if ( where ) g_object_unref(where); + if ( values ) g_object_unref(values); return r; } @@ -171,7 +171,7 @@ static unsigned update_view_delete( LibmsiView *view ) wv = uv->wv; if( wv ) wv->ops->delete( wv ); - msiobj_release( &uv->db->hdr ); + g_object_unref(uv->db); msi_free( uv ); return LIBMSI_RESULT_SUCCESS; @@ -240,8 +240,7 @@ unsigned update_view_create( LibmsiDatabase *db, LibmsiView **view, char *table, /* fill the structure */ uv->view.ops = &update_ops; - msiobj_addref( &db->hdr ); - uv->db = db; + uv->db = g_object_ref(db); uv->vals = columns; uv->wv = sv; *view = (LibmsiView*) uv; |