callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inspector: do not leak seat capabilities descriprion

Browse Source 
Factor out an utility function for readability and free the string
with the list of capabilities
This commit is contained in:
Paolo Borelli
2016-04-24 11:46:38 +02:00
parent 0b88d7976c
commit 6225d435e6
1 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
gtk/inspector/general.c
View File

@ -452,12 +452,9 @@ add_device (GtkInspectorGeneral *gen,
} }
} }
static void static char *
add_seat (GtkInspectorGeneral *gen, get_seat_capabilities (GdkSeat *seat)
GdkSeat *seat,
int num)
{ {
GdkSeatCapabilities capabilities;
struct { struct {
GdkSeatCapabilities cap; GdkSeatCapabilities cap;
const char *name; const char *name;
@ -469,18 +466,8 @@ add_seat (GtkInspectorGeneral *gen,
{ 0, NULL } { 0, NULL }
}; };
GString *str; GString *str;
char *text; GdkSeatCapabilities capabilities;
int i; int i;
GList *list, *l;
if (!g_object_get_data (G_OBJECT (seat), "inspector-connected"))
{
g_object_set_data (G_OBJECT (seat), "inspector-connected", GINT_TO_POINTER (1));
g_signal_connect_swapped (seat, "device-added", G_CALLBACK (populate_seats), gen);
g_signal_connect_swapped (seat, "device-removed", G_CALLBACK (populate_seats), gen);
}
text = g_strdup_printf ("Seat %d", num);
str = g_string_new (""); str = g_string_new ("");
capabilities = gdk_seat_get_capabilities (seat); capabilities = gdk_seat_get_capabilities (seat);
@ -494,9 +481,31 @@ add_seat (GtkInspectorGeneral *gen,
} }
} }
add_label_row (GTK_LIST_BOX (gen->priv->device_box), text, str->str, 0); return g_string_free (str, FALSE);
}
static void
add_seat (GtkInspectorGeneral *gen,
GdkSeat *seat,
int num)
{
char *text;
char *caps;
GList *list, *l;
if (!g_object_get_data (G_OBJECT (seat), "inspector-connected"))
{
g_object_set_data (G_OBJECT (seat), "inspector-connected", GINT_TO_POINTER (1));
g_signal_connect_swapped (seat, "device-added", G_CALLBACK (populate_seats), gen);
g_signal_connect_swapped (seat, "device-removed", G_CALLBACK (populate_seats), gen);
}
text = g_strdup_printf ("Seat %d", num);
caps = get_seat_capabilities (seat);
add_label_row (GTK_LIST_BOX (gen->priv->device_box), text, caps, 0);
g_free (text); g_free (text);
g_string_free (str, FALSE); g_free (caps);
list = gdk_seat_get_slaves (seat, GDK_SEAT_CAPABILITY_ALL); list = gdk_seat_get_slaves (seat, GDK_SEAT_CAPABILITY_ALL);