From 96be34116ea68310ef9b39b928248ed230873b4b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 24 Feb 2005 03:43:23 +0000 Subject: [PATCH] Move initialization code from _new to _init. (#168249, Murray Cumming) 2005-02-23 Matthias Clasen * gtk/gtkaboutdialog.c (gtk_about_dialog_init) (gtk_about_dialog_new): Move initialization code from _new to _init. (#168249, Murray Cumming) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkaboutdialog.c | 19 +++++++++---------- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1923e44d50..8565e2d5f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-02-23 Matthias Clasen + + * gtk/gtkaboutdialog.c (gtk_about_dialog_init) + (gtk_about_dialog_new): Move initialization code from _new to + _init. (#168249, Murray Cumming) + Wed Feb 23 17:34:01 2005 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_node_queue_redraw): Patch from diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1923e44d50..8565e2d5f1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-02-23 Matthias Clasen + + * gtk/gtkaboutdialog.c (gtk_about_dialog_init) + (gtk_about_dialog_new): Move initialization code from _new to + _init. (#168249, Murray Cumming) + Wed Feb 23 17:34:01 2005 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_node_queue_redraw): Patch from diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1923e44d50..8565e2d5f1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-02-23 Matthias Clasen + + * gtk/gtkaboutdialog.c (gtk_about_dialog_init) + (gtk_about_dialog_new): Move initialization code from _new to + _init. (#168249, Murray Cumming) + Wed Feb 23 17:34:01 2005 Jonathan Blandford * gtk/gtktreeview.c (gtk_tree_view_node_queue_redraw): Patch from diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index df61d3c15b..47728a72a3 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -158,6 +158,8 @@ static void display_credits_dialog (GtkWidget gpointer data); static void display_license_dialog (GtkWidget *button, gpointer data); +static void close_cb (GtkAboutDialog *about); + static GtkAboutDialogActivateLinkFunc activate_email_hook = NULL; @@ -506,6 +508,13 @@ gtk_about_dialog_init (GtkAboutDialog *about) gtk_window_set_resizable (GTK_WINDOW (about), FALSE); gtk_widget_pop_composite_child (); + + /* force defaults */ + gtk_about_dialog_set_name (about, NULL); + gtk_about_dialog_set_logo (about, NULL); + + /* Close dialog on user response */ + g_signal_connect (about, "response", G_CALLBACK (close_cb), NULL); } static void @@ -2091,16 +2100,6 @@ gtk_about_dialog_new (void) { GtkAboutDialog *dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG, NULL); - /* force defaults */ - gtk_about_dialog_set_name (dialog, NULL); - gtk_about_dialog_set_logo (dialog, NULL); - - /* Close dialog on user response */ - g_signal_connect (dialog, - "response", - G_CALLBACK (close_cb), - NULL); - return GTK_WIDGET (dialog); }