diff options
| author | Alexey Kulakov <panda75@bk.ru> | 2014-03-15 09:36:30 +0000 |
|---|---|---|
| committer | Alexey Kulakov <panda75@bk.ru> | 2014-03-15 09:36:30 +0000 |
| commit | 9ba2c4ec23e4079b69988719b56d8dd2f5d132ae (patch) | |
| tree | c9334a70b41b86ac4943d1aa525defd62cf8f808 | |
| parent | d2a2bfdd7c8eed0df63ad5f0c423da54c26509cc (diff) | |
ghazan version fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@8612 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | include/delphi/m_protocols.inc | 14 | ||||
| -rw-r--r-- | plugins/Utils.pas/mirutils.pas | 2 |
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
|