diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2014-08-29 10:41:36 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2014-08-29 10:55:29 +0200 |
| commit | 5ee189766df034d8d9b3527a05c763e7ac548a3c (patch) | |
| tree | 64317a1dbe9c59860bb8bbec3a70c16f2dfcc044 | |
| parent | 5f72bbae854eca4ba0c0f974d4447497e7830945 (diff) | |
| download | NetworkManager-5ee189766df034d8d9b3527a05c763e7ac548a3c.tar.gz | |
fixup! cli: support connection.autoconnect-priority property
| -rw-r--r-- | clients/cli/connections.c | 19 | ||||
| -rw-r--r-- | clients/cli/settings.c | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index b78a20e96e..89c2057a59 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -63,7 +63,7 @@ static NmcOutputField nmc_fields_con_show[] = { {"TIMESTAMP", N_("TIMESTAMP"), 12}, /* 3 */ {"TIMESTAMP-REAL", N_("TIMESTAMP-REAL"), 34}, /* 4 */ {"AUTOCONNECT", N_("AUTOCONNECT"), 13}, /* 5 */ - {"AUTOCONNECT_PRIORITY", N_("AUTOCONNECT_PRIORITY"), 10}, /* 6 */ + {"AUTOCONNECT-PRIORITY", N_("AUTOCONNECT-PRIORITY"), 10}, /* 6 */ {"READONLY", N_("READONLY"), 10}, /* 7 */ {"DBUS-PATH", N_("DBUS-PATH"), 42}, /* 8 */ {"ACTIVE", N_("ACTIVE"), 10}, /* 9 */ @@ -72,7 +72,7 @@ static NmcOutputField nmc_fields_con_show[] = { {"ACTIVE-PATH", N_("ACTIVE-PATH"), 51}, /* 12 */ {NULL, NULL, 0} }; -#define NMC_FIELDS_CON_SHOW_ALL "NAME,UUID,TYPE,TIMESTAMP,TIMESTAMP-REAL,AUTOCONNECT,AUTOCONNECT_PRIORITY,READONLY,DBUS-PATH,"\ +#define NMC_FIELDS_CON_SHOW_ALL "NAME,UUID,TYPE,TIMESTAMP,TIMESTAMP-REAL,AUTOCONNECT,AUTOCONNECT-PRIORITY,READONLY,DBUS-PATH,"\ "ACTIVE,DEVICE,STATE,ACTIVE-PATH" #define NMC_FIELDS_CON_SHOW_COMMON "NAME,UUID,TYPE,DEVICE" @@ -772,6 +772,7 @@ fill_output_connection (gpointer data, gpointer user_data, gboolean active_only) time_t timestamp_real; char *timestamp_str; char *timestamp_real_str = ""; + char *prio_str; NmcOutputField *arr; NMActiveConnection *ac = NULL; const char *ac_path = NULL; @@ -799,6 +800,7 @@ fill_output_connection (gpointer data, gpointer user_data, gboolean active_only) timestamp_real_str = g_malloc0 (64); strftime (timestamp_real_str, 64, "%c", localtime (×tamp_real)); } + prio_str = g_strdup_printf ("%d", nm_setting_connection_get_autoconnect_priority (s_con)); arr = nmc_dup_fields_array (nmc_fields_con_show, sizeof (nmc_fields_con_show), @@ -809,12 +811,13 @@ fill_output_connection (gpointer data, gpointer user_data, gboolean active_only) set_val_str (arr, 3, timestamp_str); set_val_str (arr, 4, timestamp ? timestamp_real_str : g_strdup (_("never"))); set_val_strc (arr, 5, nm_setting_connection_get_autoconnect (s_con) ? _("yes") : _("no")); - set_val_strc (arr, 6, nm_setting_connection_get_read_only (s_con) ? _("yes") : _("no")); - set_val_strc (arr, 7, nm_connection_get_path (connection)); - set_val_strc (arr, 8, ac ? _("yes") : _("no")); - set_val_str (arr, 9, ac_dev); - set_val_strc (arr, 10, ac_state); - set_val_strc (arr, 11, ac_path); + set_val_str (arr, 6, prio_str); + set_val_strc (arr, 7, nm_setting_connection_get_read_only (s_con) ? _("yes") : _("no")); + set_val_strc (arr, 8, nm_connection_get_path (connection)); + set_val_strc (arr, 9, ac ? _("yes") : _("no")); + set_val_str (arr, 10, ac_dev); + set_val_strc (arr, 11, ac_state); + set_val_strc (arr, 12, ac_path); g_ptr_array_add (nmc->output_data, arr); } diff --git a/clients/cli/settings.c b/clients/cli/settings.c index cd5376d604..45c063e8a9 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -5016,7 +5016,7 @@ nmc_properties_init (void) NULL); nmc_add_prop_funcs (GLUE (CONNECTION, AUTOCONNECT_PRIORITY), nmc_property_connection_get_autoconnect_priority, - nmc_property_set_int, + nmc_property_set_uint, NULL, NULL, NULL, |