diff --git a/ChangeLog b/ChangeLog index 5cac70b74a..368b170a5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-10-31 Padraig O'Briain + + * gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free() + call to before return. + 2002-10-29 Matthias Clasen * tests/testgtkrc: Adjust for current gtk-engines. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5cac70b74a..368b170a5f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-10-31 Padraig O'Briain + + * gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free() + call to before return. + 2002-10-29 Matthias Clasen * tests/testgtkrc: Adjust for current gtk-engines. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5cac70b74a..368b170a5f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-10-31 Padraig O'Briain + + * gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free() + call to before return. + 2002-10-29 Matthias Clasen * tests/testgtkrc: Adjust for current gtk-engines. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5cac70b74a..368b170a5f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-10-31 Padraig O'Briain + + * gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free() + call to before return. + 2002-10-29 Matthias Clasen * tests/testgtkrc: Adjust for current gtk-engines. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5cac70b74a..368b170a5f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-10-31 Padraig O'Briain + + * gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free() + call to before return. + 2002-10-29 Matthias Clasen * tests/testgtkrc: Adjust for current gtk-engines. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5cac70b74a..368b170a5f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-10-31 Padraig O'Briain + + * gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free() + call to before return. + 2002-10-29 Matthias Clasen * tests/testgtkrc: Adjust for current gtk-engines. diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index d7f7ae7d43..b3ee85a2ff 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -1138,6 +1138,7 @@ gtk_toolbar_insert_stock (GtkToolbar *toolbar, GtkWidget *image = NULL; const gchar *label; gchar *label_no_mnemonic; + GtkWidget *retval; if (gtk_stock_lookup (stock_id, &item)) { @@ -1149,16 +1150,18 @@ gtk_toolbar_insert_stock (GtkToolbar *toolbar, label_no_mnemonic = elide_underscores (label); - return gtk_toolbar_internal_insert_item (toolbar, - label_no_mnemonic, - tooltip_text, - tooltip_private_text, - image, - callback, - user_data, - position); + retval = gtk_toolbar_internal_insert_item (toolbar, + label_no_mnemonic, + tooltip_text, + tooltip_private_text, + image, + callback, + user_data, + position); g_free (label_no_mnemonic); + + return retval; }