[ekiga/v4_0] Allow to enter addresses without host part
- From: Eugen Dedu <ededu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/v4_0] Allow to enter addresses without host part
- Date: Mon, 14 Jan 2013 17:49:37 +0000 (UTC)
commit 7d1bf5e7c9c02ed6df931461dde958d1c65ae843
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date: Sun Jan 6 16:57:21 2013 +0100
Allow to enter addresses without host part
The host of these addresses can be chosen upon calling/sending
message. This revert back part of commit 6bbfb94.
.../components/local-roster/local-presentity.cpp | 5 +----
.../components/local-roster/local-presentity.h | 1 -
2 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/lib/engine/components/local-roster/local-presentity.cpp b/lib/engine/components/local-roster/local-presentity.cpp
index 3c467ec..2e1a065 100644
--- a/lib/engine/components/local-roster/local-presentity.cpp
+++ b/lib/engine/components/local-roster/local-presentity.cpp
@@ -55,12 +55,9 @@ canonize_uri (std::string uri)
const size_t end_str = uri.find_last_not_of (" \t");
const size_t range = end_str - begin_str + 1;
uri = uri.substr (begin_str, range);
- size_t pos = uri.find (":");
+ const size_t pos = uri.find (":");
if (pos == std::string::npos)
uri = uri.insert (0, "sip:");
- pos = uri.find ("@");
- if (pos == std::string::npos)
- uri = uri + "@ekiga.net";
return uri;
}
diff --git a/lib/engine/components/local-roster/local-presentity.h b/lib/engine/components/local-roster/local-presentity.h
index 4577fac..9b315b3 100644
--- a/lib/engine/components/local-roster/local-presentity.h
+++ b/lib/engine/components/local-roster/local-presentity.h
@@ -49,7 +49,6 @@
// remove leading and trailing spaces (useful for copy/paste)
// also, if no protocol specified, add leading "sip:"
-// and if no server specified, append "@ekiga.net"
std::string canonize_uri (std::string uri);
namespace Local
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]