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

network: Accept empty values for the cloned mac address

Browse source 
Empty is a valid value here. It means the setting is not set. Two places
need to be updated:

  - the validation function
  - when retrieving the value from the combo, empty strings need to be
    mapped to a setting value of NULL

Closes #677
This commit is contained in:
Iain Lane 2019-10-05 11:57:48 +01:00
parent fd93886f6f
commit e4508e0130
No known key found for this signature in database
GPG key ID: E352D5C51C5041D4
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
panels/network/connection-editor/ce-page.c
View file

@ -416,13 +416,19 @@ ce_page_setup_cloned_mac_combo (GtkComboBoxText *combo, const char *current)
char *
ce_page_cloned_mac_get (GtkComboBoxText *combo)
{
g_autofree gchar *active_text = NULL;
const char *id;
id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (combo));
if (id)
return g_strdup (id);
return gtk_combo_box_text_get_active_text (combo);
active_text = gtk_combo_box_text_get_active_text (combo);
if (active_text[0] == '\0')
return NULL;
return g_steal_pointer (&active_text);
}
gboolean
@ -471,7 +477,7 @@ ce_page_cloned_mac_combo_valid (GtkComboBoxText *combo)
active_text = gtk_combo_box_text_get_active_text (combo);
return ce_page_address_is_valid (active_text);
return active_text[0] == '\0' || ce_page_address_is_valid (active_text);
}
const gchar *