packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repo: Use constructed, not constructor 

It's simpler to do this after the object is constructed, rather
than in the middle of construction.

https://bugzilla.gnome.org/show_bug.cgi?id=707582
This commit is contained in:
Jasper St. Pierre 2013-09-05 00:05:04 -04:00
parent 33f232f76c
commit eb6f017ef8
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libostree/ostree-repo.c
View File

@ -154,21 +154,13 @@ ostree_repo_get_property(GObject *object,
} }
} }
static GObject * static void
ostree_repo_constructor (GType gtype, ostree_repo_constructed (GObject *object)
guint n_properties,
GObjectConstructParam *properties)
{ {
OstreeRepo *self; OstreeRepo *self = OSTREE_REPO (object);
GObject *object;
GObjectClass *parent_class;
parent_class = G_OBJECT_CLASS (ostree_repo_parent_class);
object = parent_class->constructor (gtype, n_properties, properties);
self = (OstreeRepo*)object;
g_assert (self->repodir != NULL); g_assert (self->repodir != NULL);
self->tmp_dir = g_file_resolve_relative_path (self->repodir, "tmp"); self->tmp_dir = g_file_resolve_relative_path (self->repodir, "tmp");
self->pending_dir = g_file_resolve_relative_path (self->repodir, "tmp/pending"); self->pending_dir = g_file_resolve_relative_path (self->repodir, "tmp/pending");
self->local_heads_dir = g_file_resolve_relative_path (self->repodir, "refs/heads"); self->local_heads_dir = g_file_resolve_relative_path (self->repodir, "refs/heads");
@ -179,7 +171,7 @@ ostree_repo_constructor (GType gtype,
self->remote_cache_dir = g_file_get_child (self->repodir, "remote-cache"); self->remote_cache_dir = g_file_get_child (self->repodir, "remote-cache");
self->config_file = g_file_get_child (self->repodir, "config"); self->config_file = g_file_get_child (self->repodir, "config");
return object; G_OBJECT_CLASS (ostree_repo_parent_class)->constructed (object);
} }
static void static void
@ -187,7 +179,7 @@ ostree_repo_class_init (OstreeRepoClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->constructor = ostree_repo_constructor; object_class->constructed = ostree_repo_constructed;
object_class->get_property = ostree_repo_get_property; object_class->get_property = ostree_repo_get_property;
object_class->set_property = ostree_repo_set_property; object_class->set_property = ostree_repo_set_property;
object_class->finalize = ostree_repo_finalize; object_class->finalize = ostree_repo_finalize;