PFLAG_UNIQUEIDSETTING removed, its functionality transferred to Proto_SetUniqueId / Proto_GetUniqueId

1 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Utils.pas/mircontacts.pas b/plugins/Utils.pas/mircontacts.pas
index 8847ea96f0..44a8441857 100644
--- a/plugins/Utils.pas/mircontacts.pas
+++ b/plugins/Utils.pas/mircontacts.pas
@@ -127,8 +127,8 @@ begin
   begin

     if Proto = nil then

       Proto := GetContactProto(hContact);

-    uid := PAnsiChar(CallProtoService(Proto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0));

-    if (uid <> PAnsiChar(CALLSERVICE_NOTFOUND)) and (uid <> nil) then

+    uid := Proto_GetUniqueId(Proto);

+    if (uid <> nil) then

     begin

       // db_get_s comparing to DBGetContactSetting don't translate strings

       // when uType=0 (DBVT_ASIS)

@@ -275,8 +275,8 @@ begin
   uid:=nil;

   if not is_chat then

   begin

-    uid:=PAnsiChar(CallProtoService(Proto,PS_GETCAPS,PFLAG_UNIQUEIDSETTING,0));

-    if uid=PAnsiChar(CALLSERVICE_NOTFOUND) then exit;

+    uid:=Proto_GetUniqueId(Proto);

+    if uid=nil then exit;

   end;

 

   hContact:=db_find_first();

@@ -371,8 +371,8 @@ begin
     end

     else

     begin

-      uid:=PAnsiChar(CallProtoService(Proto,PS_GETCAPS,PFLAG_UNIQUEIDSETTING,0));

-      if uid<>PAnsiChar(CALLSERVICE_NOTFOUND) then

+      uid:=Proto_GetUniqueId(Proto);

+      if uid<>nil then

       begin

         if DBReadSetting(hContact,Proto,uid,@cws)=0 then

         begin

@@ -540,8 +540,8 @@ begin
         end

         else

         begin

-          uid:=PAnsiChar(CallProtoService(acc,PS_GETCAPS,PFLAG_UNIQUEIDSETTING,0));

-          if uid<>PAnsiChar(CALLSERVICE_NOTFOUND) then

+          uid:=Proto_GetUniqueId(acc);

+          if uid<>nil then

           begin

             if DBReadSetting(hContact,acc,uid,@ldbv)=0 then

             begin