restructuring Messafge constructor

src/identity.cc

@@ -11,8 +11,8 @@ namespace pEp {
     namespace PythonAdapter {
         using namespace std;
 
-        Identity::Identity(string address, string fpr, string user_id, string
+        Identity::Identity(string address, string username, string user_id,
-                username, int comm_type, string lang)
+                string fpr, int comm_type, string lang)
             : _ident(new_identity(address.c_str(), fpr.c_str(),
                         user_id.c_str(), username.c_str()), &::free_identity)
         {

src/identity.hh

@@ -17,8 +17,9 @@ namespace pEp {
             shared_ptr< pEp_identity > _ident;
 
         public:
-            Identity(string address = "", string fpr = "", string user_id = "",
+            Identity(string address = "", string username = "",
-                    string username = "", int comm_type = 0, string lang = "");
+                    string user_id = "", string fpr = "", int comm_type = 0,
+                    string lang = "");
 
             Identity(const Identity& second);
             Identity(pEp_identity *ident);