Commit 9c37b3de authored by Jasper St. Pierre's avatar Jasper St. Pierre

gtk: Don't use GObjectClass.constructor

Use the newer constructed instead, which has a fast path in GObject.
parent 66492678
......@@ -349,21 +349,13 @@ add_action_widgets (GtkAssistant *assistant)
}
}
static GObject *
gtk_assistant_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params)
static void
gtk_assistant_constructed (GObject *object)
{
GObject *object;
GtkAssistant *assistant;
GtkAssistantPrivate *priv;
object = G_OBJECT_CLASS (gtk_assistant_parent_class)->constructor (type,
n_construct_properties,
construct_params);
GtkAssistant *assistant = GTK_ASSISTANT (object);
GtkAssistantPrivate *priv = assistant->priv;
assistant = GTK_ASSISTANT (object);
priv = assistant->priv;
G_OBJECT_CLASS (gtk_assistant_parent_class)->constructed (object);
priv->constructed = TRUE;
if (priv->use_header_bar == -1)
......@@ -371,8 +363,6 @@ gtk_assistant_constructor (GType type,
add_action_widgets (assistant);
apply_use_header_bar (assistant);
return object;
}
static void
......@@ -386,7 +376,7 @@ gtk_assistant_class_init (GtkAssistantClass *class)
widget_class = (GtkWidgetClass *) class;
container_class = (GtkContainerClass *) class;
gobject_class->constructor = gtk_assistant_constructor;
gobject_class->constructed = gtk_assistant_constructed;
gobject_class->set_property = gtk_assistant_set_property;
gobject_class->get_property = gtk_assistant_get_property;
......
......@@ -141,9 +141,7 @@ static GType gtk_button_child_type (GtkContainer *container);
static void gtk_button_finish_activate (GtkButton *button,
gboolean do_it);
static GObject* gtk_button_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params);
static void gtk_button_constructed (GObject *object);
static void gtk_button_construct_child (GtkButton *button);
static void gtk_button_state_changed (GtkWidget *widget,
GtkStateType previous_state);
......@@ -205,7 +203,7 @@ gtk_button_class_init (GtkButtonClass *klass)
widget_class = (GtkWidgetClass*) klass;
container_class = (GtkContainerClass*) klass;
gobject_class->constructor = gtk_button_constructor;
gobject_class->constructed = gtk_button_constructed;
gobject_class->dispose = gtk_button_dispose;
gobject_class->set_property = gtk_button_set_property;
gobject_class->get_property = gtk_button_get_property;
......@@ -671,28 +669,18 @@ gtk_button_destroy (GtkWidget *widget)
GTK_WIDGET_CLASS (gtk_button_parent_class)->destroy (widget);
}
static GObject*
gtk_button_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params)
static void
gtk_button_constructed (GObject *object)
{
GObject *object;
GtkButton *button;
GtkButtonPrivate *priv;
object = G_OBJECT_CLASS (gtk_button_parent_class)->constructor (type,
n_construct_properties,
construct_params);
GtkButton *button = GTK_BUTTON (object);
GtkButtonPrivate *priv = button->priv;
button = GTK_BUTTON (object);
priv = button->priv;
G_OBJECT_CLASS (gtk_button_parent_class)->constructed (object);
priv->constructed = TRUE;
if (priv->label_text != NULL)
gtk_button_construct_child (button);
return object;
}
......
......@@ -49,10 +49,8 @@
* they all share the same height but may have variable widths).
*/
static GObject *gtk_cell_view_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties);
static void gtk_cell_view_get_property (GObject *object,
static void gtk_cell_view_constructed (GObject *object);
static void gtk_cell_view_get_property (GObject *object,
guint param_id,
GValue *value,
GParamSpec *pspec);
......@@ -167,7 +165,7 @@ gtk_cell_view_class_init (GtkCellViewClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
gobject_class->constructor = gtk_cell_view_constructor;
gobject_class->constructed = gtk_cell_view_constructed;
gobject_class->get_property = gtk_cell_view_get_property;
gobject_class->set_property = gtk_cell_view_set_property;
gobject_class->finalize = gtk_cell_view_finalize;
......@@ -342,20 +340,13 @@ gtk_cell_view_cell_layout_init (GtkCellLayoutIface *iface)
iface->get_area = gtk_cell_view_cell_layout_get_area;
}
static GObject *
gtk_cell_view_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties)
static void
gtk_cell_view_constructed (GObject *object)
{
GObject *object;
GtkCellView *view;
GtkCellViewPrivate *priv;
object = G_OBJECT_CLASS (gtk_cell_view_parent_class)->constructor
(type, n_construct_properties, construct_properties);
GtkCellView *view = GTK_CELL_VIEW (object);
GtkCellViewPrivate *priv = view->priv;
view = GTK_CELL_VIEW (object);
priv = view->priv;
G_OBJECT_CLASS (gtk_cell_view_parent_class)->constructed (object);
if (!priv->area)
{
......@@ -369,8 +360,6 @@ gtk_cell_view_constructor (GType type,
priv->size_changed_id =
g_signal_connect (priv->context, "notify",
G_CALLBACK (context_size_changed_cb), view);
return object;
}
static void
......
......@@ -254,9 +254,7 @@ static guint combo_box_signals[LAST_SIGNAL] = {0,};
static void gtk_combo_box_cell_layout_init (GtkCellLayoutIface *iface);
static void gtk_combo_box_cell_editable_init (GtkCellEditableIface *iface);
static GObject *gtk_combo_box_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties);
static void gtk_combo_box_constructed (GObject *object);
static void gtk_combo_box_dispose (GObject *object);
static void gtk_combo_box_finalize (GObject *object);
static void gtk_combo_box_destroy (GtkWidget *widget);
......@@ -514,7 +512,7 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
widget_class->direction_changed = gtk_combo_box_direction_changed;
object_class = (GObjectClass *)klass;
object_class->constructor = gtk_combo_box_constructor;
object_class->constructed = gtk_combo_box_constructed;
object_class->dispose = gtk_combo_box_dispose;
object_class->finalize = gtk_combo_box_finalize;
object_class->set_property = gtk_combo_box_set_property;
......@@ -4793,20 +4791,13 @@ gtk_combo_box_format_entry_text (GtkComboBox *combo_box,
}
static GObject *
gtk_combo_box_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties)
static void
gtk_combo_box_constructed (GObject *object)
{
GObject *object;
GtkComboBox *combo_box;
GtkComboBoxPrivate *priv;
object = G_OBJECT_CLASS (gtk_combo_box_parent_class)->constructor
(type, n_construct_properties, construct_properties);
GtkComboBox *combo_box = GTK_COMBO_BOX (object);
GtkComboBoxPrivate *priv = combo_box->priv;
combo_box = GTK_COMBO_BOX (object);
priv = combo_box->priv;
G_OBJECT_CLASS (gtk_combo_box_parent_class)->constructed (object);
if (!priv->area)
{
......@@ -4844,8 +4835,6 @@ gtk_combo_box_constructor (GType type,
g_signal_connect (combo_box, "changed",
G_CALLBACK (gtk_combo_box_entry_active_changed), NULL);
}
return object;
}
......
......@@ -92,16 +92,12 @@ G_DEFINE_TYPE_WITH_CODE (GtkComboBoxText, gtk_combo_box_text, GTK_TYPE_COMBO_BOX
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
gtk_combo_box_text_buildable_interface_init));
static GObject *
gtk_combo_box_text_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties)
static void
gtk_combo_box_text_constructed (GObject *object)
{
GObject *object;
const gint text_column = 0;
object = G_OBJECT_CLASS (gtk_combo_box_text_parent_class)->constructor
(type, n_construct_properties, construct_properties);
G_OBJECT_CLASS (gtk_combo_box_text_parent_class)->constructed (object);
gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (object), text_column);
gtk_combo_box_set_id_column (GTK_COMBO_BOX (object), 1);
......@@ -116,8 +112,6 @@ gtk_combo_box_text_constructor (GType type,
"text", text_column,
NULL);
}
return object;
}
static void
......@@ -136,7 +130,7 @@ gtk_combo_box_text_class_init (GtkComboBoxTextClass *klass)
GObjectClass *object_class;
object_class = (GObjectClass *)klass;
object_class->constructor = gtk_combo_box_text_constructor;
object_class->constructed = gtk_combo_box_text_constructed;
}
static void
......
......@@ -90,9 +90,7 @@ enum {
G_DEFINE_TYPE_WITH_PRIVATE (GtkCustomPaperUnixDialog, gtk_custom_paper_unix_dialog, GTK_TYPE_DIALOG)
static GObject *gtk_custom_paper_unix_dialog_constructor (GType type,
guint n_params,
GObjectConstructParam *params);
static void gtk_custom_paper_unix_dialog_constructed (GObject *object);
static void gtk_custom_paper_unix_dialog_finalize (GObject *object);
static void populate_dialog (GtkCustomPaperUnixDialog *dialog);
static void printer_added_cb (GtkPrintBackend *backend,
......@@ -273,7 +271,7 @@ _gtk_print_save_custom_papers (GtkListStore *store)
static void
gtk_custom_paper_unix_dialog_class_init (GtkCustomPaperUnixDialogClass *class)
{
G_OBJECT_CLASS (class)->constructor = gtk_custom_paper_unix_dialog_constructor;
G_OBJECT_CLASS (class)->constructed = gtk_custom_paper_unix_dialog_constructed;
G_OBJECT_CLASS (class)->finalize = gtk_custom_paper_unix_dialog_finalize;
}
......@@ -317,15 +315,12 @@ gtk_custom_paper_unix_dialog_init (GtkCustomPaperUnixDialog *dialog)
g_signal_connect (dialog, "response", G_CALLBACK (custom_paper_dialog_response_cb), NULL);
}
static GObject *
gtk_custom_paper_unix_dialog_constructor (GType type,
guint n_params,
GObjectConstructParam *params)
static void
gtk_custom_paper_unix_dialog_constructed (GObject *object)
{
GObject *object;
gboolean use_header;
object = G_OBJECT_CLASS (gtk_custom_paper_unix_dialog_parent_class)->constructor (type, n_params, params);
G_OBJECT_CLASS (gtk_custom_paper_unix_dialog_parent_class)->constructed (object);
g_object_get (object, "use-header-bar", &use_header, NULL);
if (!use_header)
......@@ -335,8 +330,6 @@ gtk_custom_paper_unix_dialog_constructor (GType type,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (object), GTK_RESPONSE_CLOSE);
}
return object;
}
static void
......
......@@ -522,21 +522,13 @@ add_action_widgets (GtkDialog *dialog)
}
}
static GObject *
gtk_dialog_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params)
static void
gtk_dialog_constructed (GObject *object)
{
GObject *object;
GtkDialog *dialog;
GtkDialogPrivate *priv;
object = G_OBJECT_CLASS (gtk_dialog_parent_class)->constructor (type,
n_construct_properties,
construct_params);
GtkDialog *dialog = GTK_DIALOG (object);
GtkDialogPrivate *priv = dialog->priv;
dialog = GTK_DIALOG (object);
priv = dialog->priv;
G_OBJECT_CLASS (gtk_dialog_parent_class)->constructed (object);
priv->constructed = TRUE;
if (priv->use_header_bar == -1)
......@@ -544,8 +536,6 @@ gtk_dialog_constructor (GType type,
add_action_widgets (dialog);
apply_use_header_bar (dialog);
return object;
}
static void
......@@ -568,7 +558,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
gobject_class = G_OBJECT_CLASS (class);
widget_class = GTK_WIDGET_CLASS (class);
gobject_class->constructor = gtk_dialog_constructor;
gobject_class->constructed = gtk_dialog_constructed;
gobject_class->set_property = gtk_dialog_set_property;
gobject_class->get_property = gtk_dialog_get_property;
gobject_class->finalize = gtk_dialog_finalize;
......
......@@ -120,9 +120,7 @@ enum
static void gtk_entry_completion_cell_layout_init (GtkCellLayoutIface *iface);
static GtkCellArea* gtk_entry_completion_get_area (GtkCellLayout *cell_layout);
static GObject *gtk_entry_completion_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties);
static void gtk_entry_completion_constructed (GObject *object);
static void gtk_entry_completion_set_property (GObject *object,
guint prop_id,
const GValue *value,
......@@ -204,7 +202,7 @@ gtk_entry_completion_class_init (GtkEntryCompletionClass *klass)
object_class = (GObjectClass *)klass;
object_class->constructor = gtk_entry_completion_constructor;
object_class->constructed = gtk_entry_completion_constructed;
object_class->set_property = gtk_entry_completion_set_property;
object_class->get_property = gtk_entry_completion_get_property;
object_class->dispose = gtk_entry_completion_dispose;
......@@ -503,23 +501,16 @@ gtk_entry_completion_init (GtkEntryCompletion *completion)
priv->filter_model = NULL;
}
static GObject *
gtk_entry_completion_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties)
static void
gtk_entry_completion_constructed (GObject *object)
{
GtkEntryCompletion *completion;
GtkEntryCompletionPrivate *priv;
GObject *object;
GtkEntryCompletion *completion = GTK_ENTRY_COMPLETION (object);
GtkEntryCompletionPrivate *priv = completion->priv;
GtkCellRenderer *cell;
GtkTreeSelection *sel;
GtkWidget *popup_frame;
object = G_OBJECT_CLASS (gtk_entry_completion_parent_class)->constructor
(type, n_construct_properties, construct_properties);
completion = (GtkEntryCompletion *) object;
priv = completion->priv;
G_OBJECT_CLASS (gtk_entry_completion_parent_class)->constructed (object);
if (!priv->cell_area)
{
......@@ -626,8 +617,6 @@ gtk_entry_completion_constructor (GType type,
* been inserted, so we pack the action treeview after the first
* action has been added
*/
return object;
}
......
......@@ -247,9 +247,7 @@ static gboolean gtk_file_chooser_button_remove_shortcut_folder (GtkFileChooser
GError **error);
/* GObject Functions */
static GObject *gtk_file_chooser_button_constructor (GType type,
guint n_params,
GObjectConstructParam *params);
static void gtk_file_chooser_button_constructed (GObject *object);
static void gtk_file_chooser_button_set_property (GObject *object,
guint param_id,
const GValue *value,
......@@ -369,7 +367,7 @@ gtk_file_chooser_button_class_init (GtkFileChooserButtonClass * class)
gobject_class = G_OBJECT_CLASS (class);
widget_class = GTK_WIDGET_CLASS (class);
gobject_class->constructor = gtk_file_chooser_button_constructor;
gobject_class->constructed = gtk_file_chooser_button_constructed;
gobject_class->set_property = gtk_file_chooser_button_set_property;
gobject_class->get_property = gtk_file_chooser_button_get_property;
gobject_class->finalize = gtk_file_chooser_button_finalize;
......@@ -780,21 +778,14 @@ gtk_file_chooser_button_remove_shortcut_folder (GtkFileChooser *chooser,
* GObject Functions *
* ******************* */
static GObject *
gtk_file_chooser_button_constructor (GType type,
guint n_params,
GObjectConstructParam *params)
static void
gtk_file_chooser_button_constructed (GObject *object)
{
GObject *object;
GtkFileChooserButton *button;
GtkFileChooserButtonPrivate *priv;
GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (object);
GtkFileChooserButtonPrivate *priv = button->priv;
GSList *list;
object = G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->constructor (type,
n_params,
params);
button = GTK_FILE_CHOOSER_BUTTON (object);
priv = button->priv;
G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->constructed (object);
if (!priv->dialog)
{
......@@ -877,8 +868,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
update_label_and_image (button);
update_combo_box (button);
return object;
}
static void
......
......@@ -400,9 +400,7 @@ enum {
static void gtk_file_chooser_widget_iface_init (GtkFileChooserIface *iface);
static void gtk_file_chooser_embed_default_iface_init (GtkFileChooserEmbedIface *iface);
static GObject* gtk_file_chooser_widget_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params);
static void gtk_file_chooser_widget_constructed (GObject *object);
static void gtk_file_chooser_widget_finalize (GObject *object);
static void gtk_file_chooser_widget_set_property (GObject *object,
guint prop_id,
......@@ -2159,30 +2157,21 @@ location_toggle_popup_handler (GtkFileChooserWidget *impl)
}
}
static GObject*
gtk_file_chooser_widget_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params)
static void
gtk_file_chooser_widget_constructed (GObject *object)
{
GtkFileChooserWidget *impl;
GtkFileChooserWidgetPrivate *priv;
GObject *object;
GtkFileChooserWidget *impl = GTK_FILE_CHOOSER_WIDGET (object);
GtkFileChooserWidgetPrivate *priv = impl->priv;
profile_start ("start", NULL);
object = G_OBJECT_CLASS (gtk_file_chooser_widget_parent_class)->constructor (type,
n_construct_properties,
construct_params);
impl = GTK_FILE_CHOOSER_WIDGET (object);
priv = impl->priv;
G_OBJECT_CLASS (gtk_file_chooser_widget_parent_class)->constructed (object);
g_assert (priv->file_system);
update_appearance (impl);
profile_end ("end", NULL);
return object;
}
static void
......@@ -6972,7 +6961,7 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
int i;
gobject_class->finalize = gtk_file_chooser_widget_finalize;
gobject_class->constructor = gtk_file_chooser_widget_constructor;
gobject_class->constructed = gtk_file_chooser_widget_constructed;
gobject_class->set_property = gtk_file_chooser_widget_set_property;
gobject_class->get_property = gtk_file_chooser_widget_get_property;
gobject_class->dispose = gtk_file_chooser_widget_dispose;
......
......@@ -117,9 +117,7 @@ enum
/* GObject vfuncs */
static void gtk_icon_view_cell_layout_init (GtkCellLayoutIface *iface);
static void gtk_icon_view_dispose (GObject *object);
static GObject *gtk_icon_view_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties);
static void gtk_icon_view_constructed (GObject *object);
static void gtk_icon_view_set_property (GObject *object,
guint prop_id,
const GValue *value,
......@@ -342,7 +340,7 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
widget_class = (GtkWidgetClass *) klass;
container_class = (GtkContainerClass *) klass;
gobject_class->constructor = gtk_icon_view_constructor;
gobject_class->constructed = gtk_icon_view_constructed;
gobject_class->dispose = gtk_icon_view_dispose;
gobject_class->set_property = gtk_icon_view_set_property;
gobject_class->get_property = gtk_icon_view_get_property;
......@@ -992,22 +990,15 @@ gtk_icon_view_init (GtkIconView *icon_view)
}
/* GObject methods */
static GObject *
gtk_icon_view_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties)
{
GtkIconView *icon_view;
GObject *object;
object = G_OBJECT_CLASS (gtk_icon_view_parent_class)->constructor
(type, n_construct_properties, construct_properties);
static void
gtk_icon_view_constructed (GObject *object)
{
GtkIconView *icon_view = GTK_ICON_VIEW (object);
icon_view = (GtkIconView *) object;
G_OBJECT_CLASS (gtk_icon_view_parent_class)->constructed (object);
gtk_icon_view_ensure_cell_area (icon_view, NULL);
return object;
}
static void
......
......@@ -69,10 +69,7 @@ static void gtk_invisible_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
static GObject *gtk_invisible_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params);
static void gtk_invisible_constructed (GObject *object);
G_DEFINE_TYPE_WITH_PRIVATE (GtkInvisible, gtk_invisible, GTK_TYPE_WIDGET)
......@@ -93,7 +90,7 @@ gtk_invisible_class_init (GtkInvisibleClass *class)
gobject_class->set_property = gtk_invisible_set_property;
gobject_class->get_property = gtk_invisible_get_property;
gobject_class->constructor = gtk_invisible_constructor;
gobject_class->constructed = gtk_invisible_constructed;
g_object_class_install_property (gobject_class,
PROP_SCREEN,
......@@ -322,18 +319,10 @@ gtk_invisible_get_property (GObject *object,
/* We use a constructor here so that we can realize the invisible on
* the correct screen after the “screen” property has been set
*/
static GObject*
gtk_invisible_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params)
static void
gtk_invisible_constructed (GObject *object)
{
GObject *object;
object = G_OBJECT_CLASS (gtk_invisible_parent_class)->constructor (type,
n_construct_properties,
construct_params);
G_OBJECT_CLASS (gtk_invisible_parent_class)->constructed (object);
gtk_widget_realize (GTK_WIDGET (object));
return object;
}
......@@ -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;
}
......
......@@ -118,9 +118,7 @@
#define RULER_RADIUS 2
static GObject *gtk_print_unix_dialog_constructor (GType type,
guint n_params,
GObjectConstructParam *params);
static void gtk_print_unix_dialog_constructed (GObject *object);
static void gtk_print_unix_dialog_destroy (GtkWidget *widget);
static void gtk_print_unix_dialog_finalize (GObject *object);
static void gtk_print_unix_dialog_set_property (GObject *object,
......@@ -394,7 +392,7 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class)
object_class = (GObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
object_class->constructor = gtk_print_unix_dialog_constructor;
object_class->constructed = gtk_print_unix_dialog_constructed;
object_class->finalize = gtk_print_unix_dialog_finalize;
object_class->set_property = gtk_print_unix_dialog_set_property;
object_class->get_property = gtk_print_unix_dialog_get_property;
......@@ -792,15 +790,12 @@ gtk_print_unix_dialog_init (GtkPrintUnixDialog *dialog)
_gtk_print_load_custom_papers (priv->custom_paper_list);
}
static GObject *
gtk_print_unix_dialog_constructor (GType type,
guint n_params,
GObjectConstructParam *params)
static void
gtk_print_unix_dialog_constructed (GObject *object)
{
GObject *object;
gboolean use_header;
object = G_OBJECT_CLASS (gtk_print_unix_dialog_parent_class)->constructor (type, n_params, params);
G_OBJECT_CLASS (gtk_print_unix_dialog_parent_class)->constructed (object);
g_object_get (object, "use-header-bar", &use_header, NULL);
if (use_header)
......@@ -814,8 +809,6 @@ gtk_print_unix_dialog_constructor (GType type,
gtk_header_bar_pack_end (GTK_HEADER_BAR (parent), button);
g_object_unref (button);
}
return object;
}
static void
......
......@@ -92,9 +92,7 @@ static void gtk_recent_chooser_dialog_class_init (GtkRecentChooserDialogClass *k
static void gtk_recent_chooser_dialog_init (GtkRecentChooserDialog *dialog);
static void gtk_recent_chooser_dialog_finalize (GObject *object);
static GObject *gtk_recent_chooser_dialog_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params);
static void gtk_recent_chooser_dialog_constructed (GObject *object);
static void gtk_recent_chooser_dialog_set_property (GObject *object,
guint prop_id,
......@@ -119,7 +117,7 @@ gtk_recent_chooser_dialog_class_init (GtkRecentChooserDialogClass *klass)
gobject_class->set_property = gtk_recent_chooser_dialog_set_property;
gobject_class->get_property = gtk_recent_chooser_dialog_get_property;
gobject_class->constructor = gtk_recent_chooser_dialog_constructor;
gobject_class->constructed = gtk_recent_chooser_dialog_constructed;
gobject_class->finalize = gtk_recent_chooser_dialog_finalize;
_gtk_recent_chooser_install_properties (gobject_class);
......@@ -193,20 +191,15 @@ G_GNUC_END_IGNORE_DEPRECATIONS
g_list_free (children);
}
static GObject *
gtk_recent_chooser_dialog_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_params)
static void
gtk_recent_chooser_dialog_constructed (GObject *object)
{
GtkRecentChooserDialogPrivate *priv;
GtkWidget *content_area;
GObject *object;
object = G_OBJECT_CLASS (gtk_recent_chooser_dialog_parent_class)->constructor (type,
n_construct_properties,
construct_params);
G_OBJECT_CLASS (gtk_recent_chooser_dialog_parent_class)->constructed (object);
priv = GTK_RECENT_CHOOSER_DIALOG_GET_PRIVATE (object);