[ekiga] Fixed bug #588185
- From: Julien Puydt <jpuydt src gnome org>
- To: svn-commits-list gnome org
- Subject: [ekiga] Fixed bug #588185
- Date: Mon, 13 Jul 2009 12:00:26 +0000 (UTC)
commit cdd75a645fe5e6805b6133756732b417cefd31c4
Author: Julien Puydt <jpuydt gnome org>
Date: Mon Jul 13 14:00:08 2009 +0200
Fixed bug #588185
"active" doesn't mean "usable" as one could reasonably
think ; it really means "should be enabled at startup"...
.../components/loudmouth/loudmouth-account.cpp | 18 +++++++++++++++++-
lib/engine/components/opal/opal-account.cpp | 2 +-
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/lib/engine/components/loudmouth/loudmouth-account.cpp b/lib/engine/components/loudmouth/loudmouth-account.cpp
index 126241b..15ca635 100644
--- a/lib/engine/components/loudmouth/loudmouth-account.cpp
+++ b/lib/engine/components/loudmouth/loudmouth-account.cpp
@@ -376,7 +376,23 @@ LM::Account::get_status () const
bool
LM::Account::is_active () const
{
- return lm_connection_is_open (connection);
+ bool result = false;
+ xmlChar* xml_str = xmlGetProp (node, BAD_CAST "startup");
+
+ if (xml_str != NULL) {
+
+ if (xmlStrEqual (xml_str, BAD_CAST "true")) {
+
+ result = true;
+ } else {
+
+ result = false;
+ }
+
+ xmlFree (xml_str);
+ }
+
+ return result;
}
const std::string
diff --git a/lib/engine/components/opal/opal-account.cpp b/lib/engine/components/opal/opal-account.cpp
index 726df3f..0a50ec3 100644
--- a/lib/engine/components/opal/opal-account.cpp
+++ b/lib/engine/components/opal/opal-account.cpp
@@ -303,7 +303,7 @@ bool Opal::Account::is_enabled () const
bool Opal::Account::is_active () const
{
- return (state == Registered);
+ return enabled;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]