diff options
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/cli/nmcli.c | 2 | ||||
| -rw-r--r-- | clients/common/tests/test-general.c | 4 | ||||
| -rw-r--r-- | clients/nm-online.c | 2 | ||||
| -rw-r--r-- | clients/tui/newt/nmt-newt-utils.c | 10 |
4 files changed, 2 insertions, 16 deletions
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index b0b31261c0..d1c23249f5 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -626,8 +626,6 @@ main (int argc, char *argv[]) textdomain (GETTEXT_PACKAGE); #endif - nm_g_type_init (); - /* Save terminal settings */ tcgetattr (STDIN_FILENO, &termios_orig); diff --git a/clients/common/tests/test-general.c b/clients/common/tests/test-general.c index a833e263c3..8f96eb262f 100644 --- a/clients/common/tests/test-general.c +++ b/clients/common/tests/test-general.c @@ -86,7 +86,7 @@ test_client_meta_check (void) g_assert (pi->setting_info == info); g_assert (pi->property_name); - g_assert (nm_g_hash_table_add (property_names, (gpointer) pi->property_name)); + g_assert (g_hash_table_add (property_names, (gpointer) pi->property_name)); g_assert_cmpstr (pi->property_name, ==, pi->meta_type->get_name ((const NMMetaAbstractInfo *) pi, FALSE)); g_assert_cmpstr (pi->property_name, ==, pi->meta_type->get_name ((const NMMetaAbstractInfo *) pi, TRUE)); @@ -107,7 +107,7 @@ test_client_meta_check (void) for (i = 0; info->valid_parts[i]; i++) { g_assert (info->valid_parts[i]->setting_info); - g_assert (nm_g_hash_table_add (dup, (gpointer) info->valid_parts[i]->setting_info)); + g_assert (g_hash_table_add (dup, (gpointer) info->valid_parts[i]->setting_info)); if (i == 0) { g_assert (info->valid_parts[i]->setting_info == &nm_meta_setting_infos_editor[NM_META_SETTING_TYPE_CONNECTION]); diff --git a/clients/nm-online.c b/clients/nm-online.c index 5bc80795b9..77a11321d0 100644 --- a/clients/nm-online.c +++ b/clients/nm-online.c @@ -244,8 +244,6 @@ main (int argc, char *argv[]) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); - nm_g_type_init (); - data.start_timestamp_ms = _now_ms (); opt_ctx = g_option_context_new (NULL); diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c index f37a851e6c..213e198b64 100644 --- a/clients/tui/newt/nmt-newt-utils.c +++ b/clients/tui/newt/nmt-newt-utils.c @@ -359,21 +359,11 @@ nmt_newt_edit_string (const char *data) goto done; } -#if GLIB_CHECK_VERSION (2, 34, 0) - G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (!g_spawn_check_exit_status (status, &error)) { nmt_newt_message_dialog (_("Editor failed: %s"), error->message); g_error_free (error); goto done; } - G_GNUC_END_IGNORE_DEPRECATIONS -#else - if (WIFEXITED (status)) { - if (WEXITSTATUS (status) != 0) - nmt_newt_message_dialog (_("Editor failed with status %d"), WEXITSTATUS (status)); - } else if (WIFSIGNALED (status)) - nmt_newt_message_dialog (_("Editor failed with signal %d"), WTERMSIG (status)); -#endif if (!g_file_get_contents (filename, &new_data, NULL, &error)) { nmt_newt_message_dialog (_("Could not re-read file: %s"), error->message); |