Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

menuitem: Fix small memory leak in get_label

Browse Source 
g_object_get returs a newly allocated string so we can't use it here.
This commit is contained in:
Timm Bäder
2017-08-31 13:14:33 +02:00
parent 745a9426b0
commit 2cd9f43d2f
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkmenuitem.c
View File

@@ -1306,15 +1306,10 @@ gtk_real_menu_item_get_label (GtkMenuItem *menu_item)
gtk_menu_item_ensure_label (menu_item);
child = gtk_bin_get_child (GTK_BIN (menu_item));
if (GTK_IS_LABEL (child) ||
GTK_IS_ACCEL_LABEL (child))
{
const char *label;
g_object_get (child, "label", &label, NULL);
return label;
}
if (GTK_IS_LABEL (child))
return gtk_label_get_label (GTK_LABEL (child));
else if (GTK_IS_ACCEL_LABEL (child))
return gtk_accel_label_get_label (GTK_ACCEL_LABEL (child));
return NULL;
}