diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-08-10 16:56:21 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-08-13 10:06:42 +0200 |
| commit | b9f00dbb19de9120658c001d3e97cba67c5060f2 (patch) | |
| tree | 832b5502f73dba494fa7c4f901b93d8c2d33b080 /src/main.c | |
| parent | bccc1af51b768cd5a2f9268f6cf57d5cc06a9a54 (diff) | |
| download | NetworkManager-b9f00dbb19de9120658c001d3e97cba67c5060f2.tar.gz | |
manager: remove WiMAX rfkill flag from NMManger
WiMAX support was dropped in commit 721e917cb6c3f6bea7e856aaed0cd49626887db1.
Also, remove support for the WiMAX rfkill flag and only preserve the
D-Bus property for backward compatibility.
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/main.c b/src/main.c index 59d39f763a..6a6b9f5417 100644 --- a/src/main.c +++ b/src/main.c @@ -79,17 +79,15 @@ parse_state_file (const char *filename, gboolean *net_enabled, gboolean *wifi_enabled, gboolean *wwan_enabled, - gboolean *wimax_enabled, GError **error) { GKeyFile *state_file; GError *tmp_error = NULL; - gboolean wifi, net, wwan, wimax; + gboolean wifi, net, wwan; g_return_val_if_fail (net_enabled != NULL, FALSE); g_return_val_if_fail (wifi_enabled != NULL, FALSE); g_return_val_if_fail (wwan_enabled != NULL, FALSE); - g_return_val_if_fail (wimax_enabled != NULL, FALSE); state_file = g_key_file_new (); g_key_file_set_list_separator (state_file, ','); @@ -111,7 +109,6 @@ parse_state_file (const char *filename, g_key_file_set_boolean (state_file, "main", "NetworkingEnabled", *net_enabled); g_key_file_set_boolean (state_file, "main", "WirelessEnabled", *wifi_enabled); g_key_file_set_boolean (state_file, "main", "WWANEnabled", *wwan_enabled); - g_key_file_set_boolean (state_file, "main", "WimaxEnabled", *wimax_enabled); data = g_key_file_to_data (state_file, &len, NULL); if (data) @@ -143,11 +140,6 @@ parse_state_file (const char *filename, *wwan_enabled = wwan; g_clear_error (&tmp_error); - wimax = g_key_file_get_boolean (state_file, "main", "WimaxEnabled", &tmp_error); - if (tmp_error == NULL) - *wimax_enabled = wimax; - g_clear_error (&tmp_error); - g_key_file_free (state_file); return TRUE; } @@ -255,7 +247,7 @@ do_early_setup (int *argc, char **argv[], NMConfigCmdLineOptions *config_cli) int main (int argc, char *argv[]) { - gboolean wifi_enabled = TRUE, net_enabled = TRUE, wwan_enabled = TRUE, wimax_enabled = TRUE; + gboolean wifi_enabled = TRUE, net_enabled = TRUE, wwan_enabled = TRUE; gboolean success = FALSE; NMManager *manager = NULL; NMConfig *config; @@ -389,7 +381,7 @@ main (int argc, char *argv[]) nm_log_info (LOGD_CORE, "NetworkManager (version " NM_DIST_VERSION ") is starting..."); /* Parse the state file */ - if (!parse_state_file (global_opt.state_file, &net_enabled, &wifi_enabled, &wwan_enabled, &wimax_enabled, &error)) { + if (!parse_state_file (global_opt.state_file, &net_enabled, &wifi_enabled, &wwan_enabled, &error)) { nm_log_err (LOGD_CORE, "State file %s parsing failed: (%d) %s", global_opt.state_file, error ? error->code : -1, @@ -413,8 +405,7 @@ main (int argc, char *argv[]) manager = nm_manager_setup (global_opt.state_file, net_enabled, wifi_enabled, - wwan_enabled, - wimax_enabled); + wwan_enabled); if (!nm_bus_manager_get_connection (nm_bus_manager_get ())) { nm_log_warn (LOGD_CORE, "Failed to connect to D-Bus; only private bus is available"); |