From 91eb23f044911477f615e7e25e1425b667c3f1fa Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 12 Apr 2013 21:28:12 +0000
Subject: pascal sources sync

git-svn-id: http://svn.miranda-ng.org/main/trunk@4435 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Actman/ua/i_uaplaces.inc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/Actman/ua')

diff --git a/plugins/Actman/ua/i_uaplaces.inc b/plugins/Actman/ua/i_uaplaces.inc
index 1d923e25a3..9ee2a79b0c 100644
--- a/plugins/Actman/ua/i_uaplaces.inc
+++ b/plugins/Actman/ua/i_uaplaces.inc
@@ -380,7 +380,7 @@ begin
   begin
     FillChar(clmi,SizeOf(clmi),0);
     clmi.cbSize:=SizeOf(clmi);
-    clmi.flags :=CMIF_UNICODE or CMIF_ICONFROMICOLIB;
+    clmi.flags :=CMIF_UNICODE;
 
     if (UAMenuItem.szMenuPopup<>nil) and (UAMenuItem.szMenuPopup^<>#0) then
       clmi.szName.w:=ParseVarString(UAMenuItem.szMenuPopup)
@@ -417,7 +417,7 @@ begin
 {}{}
   FillChar(clmi,SizeOf(clmi),0);
   clmi.cbSize:=SizeOf(clmi);
-  clmi.flags:=CMIF_UNICODE or CMIF_ICONFROMICOLIB;
+  clmi.flags:=CMIF_UNICODE;
   if (ActionItem.flags and (UAF_2STATE+UAF_PRESSED))<>(UAF_2STATE+UAF_PRESSED) then
   begin
     clmi.hIcon:=ActionItem.hIcolibIcon;
@@ -426,7 +426,7 @@ begin
   else
   begin
     clmi.hIcon:=ActionItem.hIcolibIconPressed;
-    clmi.flags:=CMIF_UNICODE or CMIF_ICONFROMICOLIB or CMIF_CHECKED;
+    clmi.flags:=CMIF_UNICODE or CMIF_CHECKED;
     extra:='1';
   end;
 
@@ -504,7 +504,7 @@ begin
           if (mi.flags and CMIF_HIDDEN)=0 then
           begin
             //!!!! icon (check for contact menu)
-            mi.flags:=mi.flags or CMIM_ICON or CMIM_FLAGS or CMIF_ICONFROMICOLIB;
+            mi.flags:=mi.flags or CMIM_ICON or CMIM_FLAGS;
 
             if (mtype=contact_menu) and IsLocalItem(UActionList[i]) then
             begin
@@ -625,8 +625,8 @@ begin
     if ActionItem.szTTBTooltip =nil then
       pc1:=pc
     else pc1:=ActionItem.szTTBTooltip;
-    
-    if ((ActionItem.flags and UAF_2STATE)=0) or 
+
+    if ((ActionItem.flags and UAF_2STATE)=0) or
        (ActionItem.szTTBTooltipPressed=nil) then
       pc2:=pc1
     else
-- 
cgit v1.2.3