Merge branch 'sipregistration' of...

Merge branch 'sipregistration' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into sipregistration

daemon/src/account.h

@@ -59,7 +59,7 @@ enum RegistrationState {
     ErrorNetwork ,
     ErrorHost,
     ErrorExistStun,
-    ErrorConfStun,
+    ErrorNotAcceptable,
     NumberOfStates
 };
 

daemon/src/sip/sipvoiplink.cpp

@@ -1599,7 +1599,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:

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:

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 */

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;