diff --git a/ChangeLog b/ChangeLog index d4e8e5f335..fa17613448 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-05-02 Michael Natterer + + * gtk/gtkmain.c (do_post_parse_initialization): return silently if + "gtk_initialized" is TRUE. Re-enables calling GTK's init functions + multiple times when using gtk_get_option_group(), just as one can + call gtk_init() multiple times without doing any harm. + 2005-05-01 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_expose_event): Propagate diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d4e8e5f335..fa17613448 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-05-02 Michael Natterer + + * gtk/gtkmain.c (do_post_parse_initialization): return silently if + "gtk_initialized" is TRUE. Re-enables calling GTK's init functions + multiple times when using gtk_get_option_group(), just as one can + call gtk_init() multiple times without doing any harm. + 2005-05-01 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_expose_event): Propagate diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d4e8e5f335..fa17613448 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2005-05-02 Michael Natterer + + * gtk/gtkmain.c (do_post_parse_initialization): return silently if + "gtk_initialized" is TRUE. Re-enables calling GTK's init functions + multiple times when using gtk_get_option_group(), just as one can + call gtk_init() multiple times without doing any harm. + 2005-05-01 Matthias Clasen * gtk/gtktextview.c (gtk_text_view_expose_event): Propagate diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 68785b4464..1d53bf087b 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -452,6 +452,9 @@ static void do_post_parse_initialization (int *argc, char ***argv) { + if (gtk_initialized) + return; + if (g_fatal_warnings) { GLogLevelFlags fatal_mask;