diff --git a/daemon/src/account.h b/daemon/src/account.h index 3fecbac3f9e68f4ad9cd7921477e874b2dbdd979..c536c63ac9df63bc8c2a82b6a13fd9f57a8df7f5 100644 --- a/daemon/src/account.h +++ b/daemon/src/account.h @@ -59,7 +59,7 @@ enum RegistrationState { ErrorNetwork , ErrorHost, ErrorExistStun, - ErrorConfStun, + ErrorNotAcceptable, NumberOfStates }; diff --git a/daemon/src/sip/sipvoiplink.cpp b/daemon/src/sip/sipvoiplink.cpp index 4d70a1f4cf4c8e6ddf3b8a267a68211a661871fb..0621c2f4a6822247f40a8c838ad7b3f04aabecfc 100644 --- a/daemon/src/sip/sipvoiplink.cpp +++ b/daemon/src/sip/sipvoiplink.cpp @@ -1572,7 +1572,7 @@ void registration_cb(pjsip_regc_cbparam *param) if (param->code < 0 || param->code >= 300) { switch (param->code) { case 606: - account->setRegistrationState(ErrorConfStun); + account->setRegistrationState(ErrorNotAcceptable); break; case 503: diff --git a/gnome/src/accountlist.c b/gnome/src/accountlist.c index 91b649826b84b6265244fc50a6763472fbb780c7..c0356736d1789172af495ae1548b39201a97eae7 100644 --- a/gnome/src/accountlist.c +++ b/gnome/src/accountlist.c @@ -162,8 +162,8 @@ const gchar * account_state_name(account_state_t s) return _("Network unreachable"); case ACCOUNT_STATE_ERROR_HOST: return _("Host unreachable"); - case ACCOUNT_STATE_ERROR_CONF_STUN: - return _("Stun configuration error"); + case ACCOUNT_STATE_ERROR_NOT_ACCEPTABLE: + return _("Not acceptable"); case ACCOUNT_STATE_ERROR_EXIST_STUN: return _("Stun server invalid"); case ACCOUNT_STATE_IP2IP_READY: diff --git a/gnome/src/accountlist.h b/gnome/src/accountlist.h index 08d8ef917701b2b57c462358724a6a8363ab5491..bb0aac284fd6cc0e6d09618d7531e314f611a369 100644 --- a/gnome/src/accountlist.h +++ b/gnome/src/accountlist.h @@ -58,7 +58,7 @@ typedef enum { /** Stun server is not existing. The account is not registered */ ACCOUNT_STATE_ERROR_EXIST_STUN, /** Stun server configuration error. The account is not registered */ - ACCOUNT_STATE_ERROR_CONF_STUN, + ACCOUNT_STATE_ERROR_NOT_ACCEPTABLE, /** IP2IP Account is always ready */ ACCOUNT_STATE_IP2IP_READY, /** Invalid state */ diff --git a/gnome/src/actions.c b/gnome/src/actions.c index d74a3987709ab3454eba7e42acdbe1798c7ae472..b3fa30a0bcc6a6148fad7500fec0d0f131ca5ca1 100644 --- a/gnome/src/actions.c +++ b/gnome/src/actions.c @@ -227,17 +227,17 @@ void sflphone_fill_account_list(void) acc->state = ACCOUNT_STATE_TRYING; else if (g_strcmp0(status, "ERROR") == 0) acc->state = ACCOUNT_STATE_ERROR; - else if (g_strcmp0(status , "ERROR_AUTH") == 0) + else if (g_strcmp0(status, "ERROR_AUTH") == 0) acc->state = ACCOUNT_STATE_ERROR_AUTH; - else if (g_strcmp0(status , "ERROR_NETWORK") == 0) + else if (g_strcmp0(status, "ERROR_NETWORK") == 0) acc->state = ACCOUNT_STATE_ERROR_NETWORK; - else if (g_strcmp0(status , "ERROR_HOST") == 0) + else if (g_strcmp0(status, "ERROR_HOST") == 0) acc->state = ACCOUNT_STATE_ERROR_HOST; - else if (g_strcmp0(status , "ERROR_CONF_STUN") == 0) - acc->state = ACCOUNT_STATE_ERROR_CONF_STUN; - else if (g_strcmp0(status , "ERROR_EXIST_STUN") == 0) + else if (g_strcmp0(status, "ERROR_NOT_ACCEPTABLE") == 0) + acc->state = ACCOUNT_STATE_ERROR_NOT_ACCEPTABLE; + else if (g_strcmp0(status, "ERROR_EXIST_STUN") == 0) acc->state = ACCOUNT_STATE_ERROR_EXIST_STUN; - else if (g_strcmp0(status , "ACCOUNT_STATE_IP2IP_READY") == 0) + else if (g_strcmp0(status, "ACCOUNT_STATE_IP2IP_READY") == 0) acc->state = ACCOUNT_STATE_IP2IP_READY; else acc->state = ACCOUNT_STATE_INVALID;