From 9f42c6df9a289430a5a114b4ed7361f38810d70e Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 27 Mar 2015 09:04:41 -0400 Subject: [PATCH] core: use _nm_dbus_error_has_name() --- .../nm-supplicant-interface.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index 700312e87a..a190afb452 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -404,19 +404,6 @@ nm_supplicant_interface_credentials_reply (NMSupplicantInterface *self, return !!reply; } -static gboolean -_dbus_error_has_name (GError *error, const char *dbus_error_name) -{ - gs_free char *error_name = NULL; - gboolean is_error = FALSE; - - if (error && g_dbus_error_is_remote_error (error)) { - error_name = g_dbus_error_get_remote_error (error); - is_error = !g_strcmp0 (error_name, dbus_error_name); - } - return is_error; -} - static void iface_check_netreply_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) { @@ -439,7 +426,7 @@ iface_check_netreply_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_ self = NM_SUPPLICANT_INTERFACE (user_data); priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self); - if (variant || _dbus_error_has_name (error, "fi.w1.wpa_supplicant1.InvalidArgs")) + if (variant || _nm_dbus_error_has_name (error, "fi.w1.wpa_supplicant1.InvalidArgs")) priv->has_credreq = TRUE; nm_log_dbg (LOGD_SUPPLICANT, "Supplicant %s network credentials requests", @@ -734,7 +721,7 @@ interface_add_cb (GDBusProxy *proxy, GAsyncResult *result, gpointer user_data) if (variant) { g_variant_get (variant, "(&o)", &path); interface_add_done (self, path); - } else if (_dbus_error_has_name (error, WPAS_ERROR_EXISTS_ERROR)) { + } else if (_nm_dbus_error_has_name (error, WPAS_ERROR_EXISTS_ERROR)) { /* Interface already added, just get its object path */ g_dbus_proxy_call (priv->wpas_proxy, "GetInterface",