From bcb27264ba737778e5d3edad36088bacf74f0236 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 9 Apr 2013 20:03:46 +0000 Subject: - short function names allows to write database loops in one string; - 'continue' operator can be used then; - multiple bugs fixed in clists; - code becomes much more compact; git-svn-id: http://svn.miranda-ng.org/main/trunk@4403 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Popup/src/config.cpp | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) (limited to 'plugins/Popup/src/config.cpp') diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp index 811bead19a..c8cca233be 100644 --- a/plugins/Popup/src/config.cpp +++ b/plugins/Popup/src/config.cpp @@ -103,18 +103,6 @@ void PopUpPreview() ppd.cbSize = sizeof(ppd); ppd.flags = PU2_TCHAR; -#if defined(_DEBUG) - // test per-contact popups - for (HANDLE hContact = db_find_first(); hContact; - hContact = db_find_next(hContact)) - { - if (db_get_dw(hContact, "ICQ", "UIN", 0) == 256771455) - { - ppd.lchContact = hContact; - break; - } - } -#endif ppd.lptzTitle = lptzTitle1Eng; ppd.lptzText = lptzText1Eng; ppd.lchIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE); @@ -128,30 +116,7 @@ void PopUpPreview() ppd.lptzText = lptzText2; ppd.lchIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA); ppd.hbmAvatar = hbmNoAvatar; -#if defined(_DEBUG) -//remove testactions - POPUPACTION actions[3]; - actions[0].cbSize = sizeof(POPUPACTION); - actions[0].flags = PAF_ENABLED; - lstrcpyA(actions[0].lpzTitle, "Popup Plus/Test action"); - actions[0].lchIcon = IcoLib_GetIcon(ICO_POPUP_ON,0); - actions[0].wParam = actions[0].lParam = -1; - - actions[1].cbSize = sizeof(POPUPACTION); - actions[1].flags = PAF_ENABLED; - lstrcpyA(actions[1].lpzTitle, "Popup Plus/Second test action"); - actions[1].lchIcon = IcoLib_GetIcon(ICO_ACT_CLOSE,0); - actions[1].wParam = actions[1].lParam = -1; - - actions[2].cbSize = sizeof(POPUPACTION); - actions[2].flags = PAF_ENABLED; - lstrcpyA(actions[2].lpzTitle, "Popup Plus/One more action"); - actions[2].lchIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA); - actions[2].wParam = actions[2].lParam = -1; - - ppd.lpActions = actions; - ppd.actionCount = SIZEOF(actions); -#endif + CallService(MS_POPUP_ADDPOPUP2, (WPARAM)&ppd, APF_NO_HISTORY); if (PopUpOptions.UseAnimations || PopUpOptions.UseEffect) Sleep((ANIM_TIME*2)/3); //Pause -- cgit v1.2.3