Skip to content

Commit 056832f

Browse files
sc0wlukefromdc
authored andcommitted
eel-gtk-extensions: Fix memory leaks
'g_strconcat' needs to be freed
1 parent b475e15 commit 056832f

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

eel/eel-gtk-extensions.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ GtkWidget *
448448
eel_image_menu_item_new_from_icon (const gchar *icon_name,
449449
const gchar *label_name)
450450
{
451+
gchar *concat;
451452
GtkWidget *icon;
452453
GSettings *icon_settings;
453454
GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
@@ -460,7 +461,8 @@ eel_image_menu_item_new_from_icon (const gchar *icon_name,
460461
/*Load an empty icon to hold the space*/
461462
icon = gtk_image_new ();
462463

463-
GtkWidget *label_menu = gtk_label_new_with_mnemonic (g_strconcat (label_name, " ", NULL));
464+
concat = g_strconcat (label_name, " ", NULL);
465+
GtkWidget *label_menu = gtk_label_new_with_mnemonic (concat);
464466
GtkWidget *menuitem = gtk_menu_item_new ();
465467

466468
gtk_container_add (GTK_CONTAINER (box), icon);
@@ -471,6 +473,7 @@ eel_image_menu_item_new_from_icon (const gchar *icon_name,
471473
gtk_widget_show_all (menuitem);
472474

473475
g_object_unref(icon_settings);
476+
g_free (concat);
474477

475478
return menuitem;
476479
}
@@ -479,6 +482,7 @@ GtkWidget *
479482
eel_image_menu_item_new_from_pixbuf (GdkPixbuf *icon_pixbuf,
480483
const gchar *label_name)
481484
{
485+
gchar *concat;
482486
GtkWidget *icon;
483487
GtkWidget *box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
484488

@@ -487,7 +491,8 @@ eel_image_menu_item_new_from_pixbuf (GdkPixbuf *icon_pixbuf,
487491
else
488492
icon = gtk_image_new ();
489493

490-
GtkWidget *label_menu = gtk_label_new (g_strconcat (label_name, " ", NULL));
494+
concat = g_strconcat (label_name, " ", NULL);
495+
GtkWidget *label_menu = gtk_label_new (concat);
491496
GtkWidget *menuitem = gtk_menu_item_new ();
492497

493498
gtk_container_add (GTK_CONTAINER (box), icon);
@@ -496,5 +501,7 @@ eel_image_menu_item_new_from_pixbuf (GdkPixbuf *icon_pixbuf,
496501
gtk_container_add (GTK_CONTAINER (menuitem), box);
497502
gtk_widget_show_all (menuitem);
498503

504+
g_free (concat);
505+
499506
return menuitem;
500507
}

0 commit comments

Comments
 (0)