From fbee794fe268fbdcf232bbb9625ddc3200003b2a Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep.foundation>
Date: Tue, 9 Aug 2016 00:29:44 +0200
Subject: [PATCH] _str() for Identity

---
 src/identity.cc  | 9 +++++++++
 src/identity.hh  | 1 +
 src/pEpmodule.cc | 1 +
 3 files changed, 11 insertions(+)

diff --git a/src/identity.cc b/src/identity.cc
index d12159c..ea9ba34 100644
--- a/src/identity.cc
+++ b/src/identity.cc
@@ -87,6 +87,15 @@ namespace pEp {
             return build.str();
         }
 
+        string Identity::_str()
+        {
+            if (!(_ident->address && _ident->address[0]))
+                return "";
+            if (!(_ident->username && _ident->username[0]))
+                return _ident->address;
+            return string(_ident->username) + " <" + _ident->address + ">";
+        }
+
         void Identity::lang(string value)
         {
             if (value == "")
diff --git a/src/identity.hh b/src/identity.hh
index 9c0c156..a08f228 100644
--- a/src/identity.hh
+++ b/src/identity.hh
@@ -26,6 +26,7 @@ namespace pEp {
             pEp_identity *detach();
 
             string _repr();
+            string _str();
 
             string address() { return str_attr(_ident->address); }
             void address(string value) { str_attr(_ident->address, value); }
diff --git a/src/pEpmodule.cc b/src/pEpmodule.cc
index 91a4b09..a644028 100644
--- a/src/pEpmodule.cc
+++ b/src/pEpmodule.cc
@@ -63,6 +63,7 @@ BOOST_PYTHON_MODULE(pEp)
         .def(init<string, string, string, string, int>())
         .def(init<string, string, string, string, int, string>())
         .def("__repr__", &Identity::_repr)
+        .def("__str__", &Identity::_str)
         .add_property("address", (string(Identity::*)()) &Identity::address,
                 (void(Identity::*)(string)) &Identity::address,
                 "email address or URI")