applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

keyboard: Use g_auto for variables

Browse source
This commit is contained in:
Robert Ancell 2018-01-23 16:03:19 +13:00
parent 690f15b69d
commit a90e13f12c
5 changed files with 28 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

17
panels/keyboard/cc-keyboard-panel.c
View file

@ -118,13 +118,11 @@ transform_binding_to_accel (GBinding *binding,
/* Embolden the label when the shortcut is modified */
if (!cc_keyboard_item_is_value_default (item))
{
gchar *tmp;
g_autofree gchar *tmp = NULL;
tmp = convert_keysym_state_to_string (combo);
accelerator = g_strdup_printf ("<b>%s</b>", tmp);
g_free (tmp);
}
else
{
@ -507,7 +505,7 @@ header_function (GtkListBoxRow *row,
if (add_header)
{
GtkWidget *box, *label;
gchar *markup;
g_autofree gchar *markup = NULL;
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_set_margin_top (box, before ? 18 : 6);
@ -528,8 +526,6 @@ header_function (GtkListBoxRow *row,
gtk_list_box_row_set_header (row, box);
gtk_widget_show_all (box);
g_free (markup);
}
else
{
@ -545,8 +541,9 @@ filter_function (GtkListBoxRow *row,
CcKeyboardItem *item;
RowData *data;
gboolean retval;
gchar *search, *name;
gchar **terms;
g_autofree gchar *search = NULL;
g_autofree gchar *name = NULL;
g_auto(GStrv) terms = NULL;
guint i;
if (gtk_entry_get_text_length (GTK_ENTRY (self->search_entry)) == 0)
@ -569,10 +566,6 @@ filter_function (GtkListBoxRow *row,
break;
}
g_free (search);
g_free (name);
g_strfreev (terms);
return retval;
}