[gnome-photos] error-box: Set the "contents" in constructed not init
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] error-box: Set the "contents" in constructed not init
- Date: Sat, 17 Nov 2012 13:27:51 +0000 (UTC)
commit 05a40abfb858bdcc3f1431ba7699a5cc27bee579
Author: Debarshi Ray <debarshir gnome org>
Date: Sat Nov 17 13:19:22 2012 +0100
error-box: Set the "contents" in constructed not init
Since "contents" is a construct property of GtkClutterActor, it can
only be set during g_object_new or in constructed. Setting it in init
will overwrite it.
src/photos-error-box.c | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
---
diff --git a/src/photos-error-box.c b/src/photos-error-box.c
index c95929b..c835e5e 100644
--- a/src/photos-error-box.c
+++ b/src/photos-error-box.c
@@ -57,27 +57,14 @@ photos_error_box_move_out_completed (PhotosErrorBox *self)
static void
-photos_error_box_dispose (GObject *object)
+photos_error_box_constructed (GObject *object)
{
PhotosErrorBox *self = PHOTOS_ERROR_BOX (object);
PhotosErrorBoxPrivate *priv = self->priv;
-
- G_OBJECT_CLASS (photos_error_box_parent_class)->dispose (object);
-}
-
-
-static void
-photos_error_box_init (PhotosErrorBox *self)
-{
- PhotosErrorBoxPrivate *priv;
GtkWidget *bin;
GtkWidget *widget;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_ERROR_BOX, PhotosErrorBoxPrivate);
- priv = self->priv;
-
- clutter_actor_set_x_expand (CLUTTER_ACTOR (self), TRUE);
- clutter_actor_set_y_expand (CLUTTER_ACTOR (self), TRUE);
+ G_OBJECT_CLASS (photos_error_box_parent_class)->constructed (object);
widget = gtk_grid_new ();
gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
@@ -113,10 +100,31 @@ photos_error_box_init (PhotosErrorBox *self)
static void
+photos_error_box_dispose (GObject *object)
+{
+ PhotosErrorBox *self = PHOTOS_ERROR_BOX (object);
+ PhotosErrorBoxPrivate *priv = self->priv;
+
+ G_OBJECT_CLASS (photos_error_box_parent_class)->dispose (object);
+}
+
+
+static void
+photos_error_box_init (PhotosErrorBox *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, PHOTOS_TYPE_ERROR_BOX, PhotosErrorBoxPrivate);
+
+ clutter_actor_set_x_expand (CLUTTER_ACTOR (self), TRUE);
+ clutter_actor_set_y_expand (CLUTTER_ACTOR (self), TRUE);
+}
+
+
+static void
photos_error_box_class_init (PhotosErrorBoxClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
+ object_class->constructed = photos_error_box_constructed;
object_class->dispose = photos_error_box_dispose;
g_type_class_add_private (class, sizeof (PhotosErrorBoxPrivate));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]