diff options
author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-06-26 18:22:42 -0400 |
---|---|---|
committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-06-26 19:06:43 -0400 |
commit | 9c37b3de7466a22d4c784657a86c522e2a4f118a (patch) | |
tree | 8efe1f75cef57d9af8484324dca0c35714a1ca16 /gtk/gtkprintjob.c | |
parent | 66492678b5a3043f4acd77a6a41405bc4f8097b3 (diff) | |
download | gtk+-9c37b3de7466a22d4c784657a86c522e2a4f118a.tar.gz |
gtk: Don't use GObjectClass.constructor
Use the newer constructed instead, which has a fast path in GObject.
Diffstat (limited to 'gtk/gtkprintjob.c')
-rw-r--r-- | gtk/gtkprintjob.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c index 05772ad6f2..baae02f82b 100644 --- a/gtk/gtkprintjob.c +++ b/gtk/gtkprintjob.c @@ -95,9 +95,7 @@ static void gtk_print_job_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static GObject* gtk_print_job_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_params); +static void gtk_print_job_constructed (GObject *object); enum { STATUS_CHANGED, @@ -124,7 +122,7 @@ gtk_print_job_class_init (GtkPrintJobClass *class) object_class = (GObjectClass *) class; object_class->finalize = gtk_print_job_finalize; - object_class->constructor = gtk_print_job_constructor; + object_class->constructed = gtk_print_job_constructed; object_class->set_property = gtk_print_job_set_property; object_class->get_property = gtk_print_job_get_property; @@ -228,23 +226,14 @@ gtk_print_job_init (GtkPrintJob *job) } -static GObject* -gtk_print_job_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_params) +static void +gtk_print_job_constructed (GObject *object) { - GtkPrintJob *job; - GtkPrintJobPrivate *priv; - GObject *object; - - object = - G_OBJECT_CLASS (gtk_print_job_parent_class)->constructor (type, - n_construct_properties, - construct_params); + GtkPrintJob *job = GTK_PRINT_JOB (object); + GtkPrintJobPrivate *priv = job->priv; - job = GTK_PRINT_JOB (object); + G_OBJECT_CLASS (gtk_print_job_parent_class)->constructed (object); - priv = job->priv; g_assert (priv->printer_set && priv->settings_set && priv->page_setup_set); @@ -253,8 +242,6 @@ gtk_print_job_constructor (GType type, job, priv->settings, priv->page_setup); - - return object; } |