Add back Me property to pEpIdentity struct sync
authorThomas
Fri, 08 Feb 2019 12:04:46 +0100
branchsync
changeset 33254d5b01490d6
parent 331 f595fa083473
child 333 e207e206341c
Add back Me property to pEpIdentity struct
pEpCOMServerAdapter.idl
pEp_utility.cpp
pEp_utility.h
     1.1 --- a/pEpCOMServerAdapter.idl	Fri Feb 08 08:57:31 2019 +0100
     1.2 +++ b/pEpCOMServerAdapter.idl	Fri Feb 08 12:04:46 2019 +0100
     1.3 @@ -239,6 +239,7 @@
     1.4  		BSTR UserName;
     1.5  		pEpComType CommType;
     1.6  		BSTR Lang;
     1.7 +		VARIANT_BOOL Me;
     1.8  		pEpIdentityFlags Flags;
     1.9  	};
    1.10  
     2.1 --- a/pEp_utility.cpp	Fri Feb 08 08:57:31 2019 +0100
     2.2 +++ b/pEp_utility.cpp	Fri Feb 08 12:04:46 2019 +0100
     2.3 @@ -20,6 +20,7 @@
     2.4                  username = _ident->username;
     2.5              comm_type = (pEpComType)_ident->comm_type;
     2.6              lang = _ident->lang;
     2.7 +			me = _ident->me;
     2.8              flags = (int)_ident->flags;
     2.9          }
    2.10  
    2.11 @@ -39,6 +40,7 @@
    2.12              comm_type = _ident->CommType;
    2.13              if (_ident->Lang)
    2.14                  lang = utf8_string(_ident->Lang);
    2.15 +			me = _ident->UserName;
    2.16              flags = (int)_ident->Flags;
    2.17          }
    2.18  
    2.19 @@ -58,6 +60,7 @@
    2.20                  _ident->lang[1] = this->lang[1];
    2.21              }
    2.22  
    2.23 +			_ident->me = this->me;
    2.24              _ident->flags = (identity_flags) this->flags;
    2.25  
    2.26              return _ident;
    2.27 @@ -76,6 +79,7 @@
    2.28              _ident->Lang = utf16_bstr(this->lang);
    2.29              _ident->UserName = utf16_bstr(this->username);
    2.30              _ident->UserId = utf16_bstr(this->user_id);
    2.31 +			_ident->Me = this->me;
    2.32              _ident->Flags = (pEpIdentityFlags) this->flags;
    2.33  
    2.34              return _ident;
    2.35 @@ -100,6 +104,7 @@
    2.36                  ident_s->CommType = (pEpComType)ident->comm_type;
    2.37                  if (ident->lang)
    2.38                      ident_s->Lang = utf16_bstr(ident->lang);
    2.39 +				ident_s->Me = ident->me;
    2.40                  ident_s->Flags = (pEpIdentityFlags)ident->flags;
    2.41              }
    2.42          }
    2.43 @@ -160,6 +165,7 @@
    2.44                  }
    2.45              }
    2.46  
    2.47 +			_ident->me = ident->Me;
    2.48              _ident->flags = (identity_flags_t)ident->Flags;
    2.49  
    2.50              return _ident;
     3.1 --- a/pEp_utility.h	Fri Feb 08 08:57:31 2019 +0100
     3.2 +++ b/pEp_utility.h	Fri Feb 08 12:04:46 2019 +0100
     3.3 @@ -16,6 +16,7 @@
     3.4              string username;
     3.5              pEpComType comm_type;
     3.6              string lang;
     3.7 +			bool me;
     3.8              int flags;
     3.9  
    3.10              pEp_identity_cpp(
    3.11 @@ -24,8 +25,9 @@
    3.12                  string _user_id = string(),
    3.13                  string _username = string(),
    3.14                  pEpComType _comm_type = pEpCtUnknown,
    3.15 +				bool _me = false,
    3.16                  string _lang = string()
    3.17 -            ) : address(_address), fpr(_fpr), user_id(_user_id), username(_username), comm_type(_comm_type), lang(_lang)
    3.18 +            ) : address(_address), fpr(_fpr), user_id(_user_id), username(_username), comm_type(_comm_type), me(_me), lang(_lang)
    3.19              { }
    3.20  
    3.21              pEp_identity_cpp(const ::pEp_identity *_ident);