[ekiga: 1/2] Renamed some variables for better readability

[Julien Puydt <jpuydt src gnome org>]

commit 00139bf758684e8adf2ad033cfb8a03a320967db
Author: Snark <jpuydt gnome org>
Date:   Wed Mar 30 17:19:23 2011 +0200

    Renamed some variables for better readability

 lib/engine/components/opal/opal-account.cpp |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-account.cpp b/lib/engine/components/opal/opal-account.cpp
index 85d0805..f443dc2 100644
--- a/lib/engine/components/opal/opal-account.cpp
+++ b/lib/engine/components/opal/opal-account.cpp
@@ -644,7 +644,7 @@ Opal::Account::OnPresenceChange (OpalPresentity& /*presentity*/,
 				 const OpalPresenceInfo& info)
 {
   std::string presence = "unknown";
-  std::string statusdeux;
+  std::string new_status;
 
   /* we could do something precise */
   switch (info.m_state) {
@@ -710,7 +710,7 @@ Opal::Account::OnPresenceChange (OpalPresentity& /*presentity*/,
       presence = "freeforchat";
 
     if ((j = note.Find (" - ")) != P_MAX_INDEX)
-      statusdeux = (const char *) info.m_note.Mid (j + 3);
+      new_status = (const char *) info.m_note.Mid (j + 3);
   }
 
   SIPURL sip_uri = SIPURL (info.m_entity);
@@ -727,9 +727,9 @@ Opal::Account::OnPresenceChange (OpalPresentity& /*presentity*/,
   // If presence is unknown (notification with empty body), and it is not the
   // first notification, and we can conclude it is a ping back from the server
   // to indicate the presence status did not change, hence we do nothing.
-  if (presence != "unknown" && (old_presence != presence || old_status != statusdeux)) {
+  if (presence != "unknown" && (old_presence != presence || old_status != new_status)) {
     presence_infos[uri].presence = presence;
-    presence_infos[uri].status = statusdeux;
+    presence_infos[uri].status = new_status;
     Ekiga::Runtime::run_in_main (boost::bind (&Opal::Account::presence_status_in_main, this, uri, presence_infos[uri].presence, presence_infos[uri].status));
   }
 }
@@ -737,9 +737,9 @@ Opal::Account::OnPresenceChange (OpalPresentity& /*presentity*/,
 
 void
 Opal::Account::presence_status_in_main (std::string uri,
-					std::string presence,
-					std::string statusdeux)
+					std::string uri_presence,
+					std::string uri_status)
 {
-  presence_received (uri, presence);
-  status_received (uri, statusdeux);
+  presence_received (uri, uri_presence);
+  status_received (uri, uri_status);
 }