[ekiga] Use different C++ std function so that ekiga does not crash on gdb on Windows



commit b90c15d85062511d13d4e857cfb1e463171bc0b0
Author: Michael Rickmann <mrickma gwdg de>
Date:   Tue Aug 4 00:05:10 2009 +0200

    Use different C++ std function so that ekiga does not crash on gdb on Windows
    
    It seems that list::remove is not correctly implemented, so use
    list::erase instead.

 lib/engine/components/opal/sip-endpoint.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index cf335b0..fc4c370 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -652,7 +652,7 @@ Opal::Sip::EndPoint::OnRegistered (const PString & _aor,
       return;
 
     if (was_registering) {
-      for (std::list<std::string>::const_iterator iter = to_subscribe_uris.begin ();
+      for (std::list<std::string>::iterator iter = to_subscribe_uris.begin ();
            iter != to_subscribe_uris.end () ; ) {
 
         found = (*iter).find (server, 0);
@@ -661,14 +661,14 @@ Opal::Sip::EndPoint::OnRegistered (const PString & _aor,
           Subscribe (SIPSubscribe::Presence, 300, PString ((*iter).c_str ()));
           Subscribe (SIPSubscribe::Dialog, 300, PString ((*iter).c_str ()));
           subscribed_uris.push_back (*iter);
-          to_subscribe_uris.remove (*iter++);
+          iter = to_subscribe_uris.erase (iter);
         }
         else
           ++iter;
       }
     }
     else {
-      for (std::list<std::string>::const_iterator iter = subscribed_uris.begin ();
+      for (std::list<std::string>::iterator iter = subscribed_uris.begin ();
            iter != subscribed_uris.end () ; ) {
 
         found = (*iter).find (server, 0);
@@ -677,7 +677,7 @@ Opal::Sip::EndPoint::OnRegistered (const PString & _aor,
           Unsubscribe (SIPSubscribe::Presence, PString ((*iter).c_str ()));
           Unsubscribe (SIPSubscribe::Dialog, PString ((*iter).c_str ()));
           to_subscribe_uris.push_back (*iter);
-          subscribed_uris.remove (*iter++);
+          iter = subscribed_uris.erase (iter);
         }
         else
           iter++;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]