ekiga r7655 - in trunk: . lib/engine/components/local-roster src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Wed Feb 11 21:13:21 2009
New Revision: 7655
URL: http://svn.gnome.org/viewvc/ekiga?rev=7655&view=rev

Log:
Better fix.


Modified:
   trunk/ChangeLog
   trunk/lib/engine/components/local-roster/local-heap.cpp
   trunk/lib/engine/components/local-roster/local-presentity.cpp
   trunk/src/gui/main.cpp

Modified: trunk/lib/engine/components/local-roster/local-heap.cpp
==============================================================================
--- trunk/lib/engine/components/local-roster/local-heap.cpp	(original)
+++ trunk/lib/engine/components/local-roster/local-heap.cpp	Wed Feb 11 21:13:21 2009
@@ -318,7 +318,9 @@
     else
       uri = result.text ("uri");
 
-    uri.erase (std::remove (uri.begin(), uri.end(), ' '));
+    size_t pos = uri.find_first_of (' ');
+    if (pos != std::string::npos)
+      uri = uri.substr (0, pos);
     if (presence_core->is_supported_uri (uri)
 	&& !has_presentity_with_uri (uri)) {
 

Modified: trunk/lib/engine/components/local-roster/local-presentity.cpp
==============================================================================
--- trunk/lib/engine/components/local-roster/local-presentity.cpp	(original)
+++ trunk/lib/engine/components/local-roster/local-presentity.cpp	Wed Feb 11 21:13:21 2009
@@ -253,7 +253,9 @@
     const std::set<std::string> new_groups = result.editable_set ("groups");
     std::string new_uri = result.text ("uri");
     std::map<std::string, xmlNodePtr> future_group_nodes;
-    new_uri.erase (std::remove (new_uri.begin(), new_uri.end(), ' '));
+    size_t pos = new_uri.find_first_of (' ');
+    if (pos != std::string::npos)
+      new_uri = new_uri.substr (0, pos);
 
     name = new_name;
     if (uri != new_uri) {

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Wed Feb 11 21:13:21 2009
@@ -1472,7 +1472,9 @@
       uri = uri + "@" + (*it);
       ekiga_main_window_set_call_url (mw, uri.c_str ());
     }
-    uri.erase (std::remove (uri.begin(), uri.end(), ' '));
+    pos = uri.find_first_of (' ');
+    if (pos != std::string::npos)
+      uri = uri.substr (0, pos);
     if (call_core->dial (uri)) {
 
       pos = uri.find ("@");