summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/delphi/m_protocols.inc14
-rw-r--r--plugins/Utils.pas/mirutils.pas2
2 files changed, 7 insertions, 9 deletions
diff --git a/include/delphi/m_protocols.inc b/include/delphi/m_protocols.inc
index bcc31ae386..9cf6007b4f 100644
--- a/include/delphi/m_protocols.inc
+++ b/include/delphi/m_protocols.inc
@@ -261,15 +261,13 @@ type
szModuleName :PAnsiChar; // unique physical account name (matches database module name)
tszAccountName :TChar; // user-defined account name
szProtoName :PAnsiChar; // physical protocol name
- bIsEnabled :byte; // is account enabled?
- bIsVisible :byte; // is account visible?
- bIsVirtual :byte; // is account virtual?
- bOldProto :byte; // old-styled account (one instance per dll)
- bDynDisabled :byte; // dynamic disable flag, is never written to db
-
- bAccMgrUIChanged:byte;
+ bIsEnabled :ByteBool; // is account enabled?
+ bIsVisible :ByteBool; // is account visible?
+ bIsVirtual :ByteBool; // is account virtual?
+ bOldProto :ByteBool; // old-styled account (one instance per dll)
+ bDynDisabled :ByteBool; // dynamic disable flag, is never written to db
+ bAccMgrUIChanged:ByteBool;
hwndAccMgrUI :HWND;
-
iOrder :int; // account order in various menus & lists
ppro :PPROTO_INTERFACE; // pointer to the underlying object
end;
diff --git a/plugins/Utils.pas/mirutils.pas b/plugins/Utils.pas/mirutils.pas
index dbd80d991e..567be873dc 100644
--- a/plugins/Utils.pas/mirutils.pas
+++ b/plugins/Utils.pas/mirutils.pas
@@ -707,7 +707,7 @@ begin
p:=PPROTOACCOUNT(CallService(MS_PROTO_GETACCOUNT,0,lparam(@name)));
if p=nil then
result:=-2 // deleted
- else if (p^.bIsEnabled=0) or (p^.bDynDisabled<>0) then
+ else if p^.bIsEnabled or p^.bDynDisabled then
result:=-1; // disabled
end
else