From 0f2fc64d9bf3ccfae88631014946da4a3665b6e7 Mon Sep 17 00:00:00 2001
From: Pierre-Luc Beaudoin <plbeaudoin@powerbook.(none)>
Date: Thu, 4 Oct 2007 21:27:32 -0400
Subject: [PATCH] Account in ERROR
---
sflphone-gtk/src/accountlist.c | 3 +++
sflphone-gtk/src/accountlist.h | 3 ++-
sflphone-gtk/src/actions.c | 4 ++++
src/managerimpl.cpp | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/sflphone-gtk/src/accountlist.c b/sflphone-gtk/src/accountlist.c
index 89561baf2d..e48e8e5a3d 100644
--- a/sflphone-gtk/src/accountlist.c
+++ b/sflphone-gtk/src/accountlist.c
@@ -123,6 +123,9 @@ const gchar * account_state_name(account_state_t s)
case ACCOUNT_STATE_TRYING:
state = "Trying...";
break;
+ case ACCOUNT_STATE_ERROR:
+ state = "Error";
+ break;
default:
state = "Invalid";
break;
diff --git a/sflphone-gtk/src/accountlist.h b/sflphone-gtk/src/accountlist.h
index 0649353a67..be480f1a8e 100644
--- a/sflphone-gtk/src/accountlist.h
+++ b/sflphone-gtk/src/accountlist.h
@@ -50,7 +50,8 @@ typedef enum
ACCOUNT_STATE_INVALID = 0,
ACCOUNT_STATE_REGISTERED,
ACCOUNT_STATE_UNREGISTERED,
- ACCOUNT_STATE_TRYING
+ ACCOUNT_STATE_TRYING,
+ ACCOUNT_STATE_ERROR
} account_state_t;
/** @struct account_t
diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c
index 73c0a66060..39362098d0 100644
--- a/sflphone-gtk/src/actions.c
+++ b/sflphone-gtk/src/actions.c
@@ -121,6 +121,10 @@ sflphone_fill_account_list()
{
a->state = ACCOUNT_STATE_TRYING;
}
+ else if(strcmp(status, "ERROR") == 0)
+ {
+ a->state = ACCOUNT_STATE_ERROR;
+ }
else
{
a->state = ACCOUNT_STATE_INVALID;
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 8169663785..70bda70433 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -1582,7 +1582,7 @@ ManagerImpl::getAccountDetails(const AccountID& accountID)
(state == VoIPLink::Registered ? "REGISTERED":
(state == VoIPLink::Unregistered ? "UNREGISTERED":
(state == VoIPLink::Trying ? "TRYING":
- (state == VoIPLink::Error ? "ERROR": "UNKNOWN"))))
+ (state == VoIPLink::Error ? "ERROR": "ERROR"))))
)
);
a.insert(
--
GitLab