fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 13:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: minor refactoring to highlight mutable property no_auto_default of NMConfig

Browse source 
(cherry picked from commit 83996c621c)
This commit is contained in:
Thomas Haller 2014-12-16 15:47:04 +01:00 • committed by Lubomir Rintel
parent 8ba5e062b2
commit c2d7454760
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nm-config.c
View file

@ -76,10 +76,13 @@ typedef struct {
char *debug;
char **no_auto_default;
char **no_auto_default_orig;
char **ignore_carrier;
gboolean configure_and_quit;
/* MUTABLE properties: */
char **no_auto_default; /* mutable via merge_no_auto_default_state() */
} NMConfigPrivate;
enum {
@ -814,12 +817,11 @@ nm_config_new (const NMConfigCmdLineOptions *cli, GError **error)
/* Initialize read only private members */
priv->no_auto_default = g_key_file_get_string_list (priv->keyfile, "main", "no-auto-default", NULL, NULL);
if (priv->cli.no_auto_default_file)
priv->no_auto_default_file = g_strdup (priv->cli.no_auto_default_file);
else
priv->no_auto_default_file = g_strdup (NM_NO_AUTO_DEFAULT_STATE_FILE);
merge_no_auto_default_state (self);
priv->no_auto_default_orig = g_key_file_get_string_list (priv->keyfile, "main", "no-auto-default", NULL, NULL);
priv->plugins = g_key_file_get_string_list (priv->keyfile, "main", "plugins", NULL, NULL);
if (!priv->plugins)
@ -854,6 +856,9 @@ nm_config_new (const NMConfigCmdLineOptions *cli, GError **error)
g_free (connectivity_uri);
g_free (connectivity_response);
priv->no_auto_default = g_strdupv (priv->no_auto_default_orig);
merge_no_auto_default_state (self);
return self;
}
@ -883,6 +888,7 @@ finalize (GObject *gobject)
g_free (priv->log_level);
g_free (priv->log_domains);
g_free (priv->debug);
g_strfreev (priv->no_auto_default_orig);
g_strfreev (priv->no_auto_default);
g_strfreev (priv->ignore_carrier);