forked from AuroraMiddleware/gtk
Move g_free() call to before return.
* gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free() call to before return.
This commit is contained in:
parent
0083c5e0dd
commit
16b3f88618
@ -1,3 +1,8 @@
|
||||
2002-10-31 Padraig O'Briain <padraig.obriain@sun.com>
|
||||
|
||||
* gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free()
|
||||
call to before return.
|
||||
|
||||
2002-10-29 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* tests/testgtkrc: Adjust for current gtk-engines.
|
||||
|
@ -1,3 +1,8 @@
|
||||
2002-10-31 Padraig O'Briain <padraig.obriain@sun.com>
|
||||
|
||||
* gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free()
|
||||
call to before return.
|
||||
|
||||
2002-10-29 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* tests/testgtkrc: Adjust for current gtk-engines.
|
||||
|
@ -1,3 +1,8 @@
|
||||
2002-10-31 Padraig O'Briain <padraig.obriain@sun.com>
|
||||
|
||||
* gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free()
|
||||
call to before return.
|
||||
|
||||
2002-10-29 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* tests/testgtkrc: Adjust for current gtk-engines.
|
||||
|
@ -1,3 +1,8 @@
|
||||
2002-10-31 Padraig O'Briain <padraig.obriain@sun.com>
|
||||
|
||||
* gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free()
|
||||
call to before return.
|
||||
|
||||
2002-10-29 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* tests/testgtkrc: Adjust for current gtk-engines.
|
||||
|
@ -1,3 +1,8 @@
|
||||
2002-10-31 Padraig O'Briain <padraig.obriain@sun.com>
|
||||
|
||||
* gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free()
|
||||
call to before return.
|
||||
|
||||
2002-10-29 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* tests/testgtkrc: Adjust for current gtk-engines.
|
||||
|
@ -1,3 +1,8 @@
|
||||
2002-10-31 Padraig O'Briain <padraig.obriain@sun.com>
|
||||
|
||||
* gtk/gtktoolbar.c (gtk_toolbar_insert_stock): Move g_free()
|
||||
call to before return.
|
||||
|
||||
2002-10-29 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* tests/testgtkrc: Adjust for current gtk-engines.
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user