[ekiga] Fix presence when receiving old presentity type without note
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Fix presence when receiving old presentity type without note
- Date: Fri, 29 Jul 2011 11:50:42 +0000 (UTC)
commit f305cc7467beae7eb9fc043de7981473d06099a1
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date: Fri Jul 29 13:49:44 2011 +0200
Fix presence when receiving old presentity type without note
lib/engine/components/opal/opal-account.cpp | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-account.cpp b/lib/engine/components/opal/opal-account.cpp
index 9f99e09..e35259f 100644
--- a/lib/engine/components/opal/opal-account.cpp
+++ b/lib/engine/components/opal/opal-account.cpp
@@ -689,9 +689,12 @@ Opal::Account::OnPresenceChange (OpalPresentity& /*presentity*/,
uri.replace (0, 5, "sip:"); // replace "pres:" sith "sip:"
if (info.m_state == OpalPresenceInfo::Available
- && (info.m_note.Find ("online - ") != P_MAX_INDEX
- || info.m_note.Find ("away - ") != P_MAX_INDEX
- || info.m_note.Find ("dnd - ") != P_MAX_INDEX)) { // old presentity type (ekiga <= 3.2.x, using .6 ptlib/opal branches)
+ && (info.m_note.Find ("online") != P_MAX_INDEX
+ || info.m_note.Find ("away") != P_MAX_INDEX
+ || info.m_note.Find ("dnd") != P_MAX_INDEX)) { // old presentity type (ekiga <= 3.2.x, using .6 ptlib/opal branches)
+ // adding support for old presentity creates a bug:
+ // if the user selects online or away or dnd as note, then this will
+ // replace the real status
old_presentity (info.m_note, new_presence, new_status);
Ekiga::Runtime::run_in_main (boost::bind (&Opal::Account::presence_status_in_main, this, uri, new_presence, new_status));
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]