diff options
Diffstat (limited to 'src/modules/clist')
| -rw-r--r-- | src/modules/clist/clc.cpp | 4 | ||||
| -rw-r--r-- | src/modules/clist/clistcore.cpp | 4 | ||||
| -rw-r--r-- | src/modules/clist/clisttray.cpp | 6 | ||||
| -rw-r--r-- | src/modules/clist/clui.cpp | 2 | ||||
| -rw-r--r-- | src/modules/clist/groups.cpp | 2 | ||||
| -rw-r--r-- | src/modules/clist/movetogroup.cpp | 4 |
6 files changed, 13 insertions, 9 deletions
diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp index e3bb5c01ef..ec5b36b624 100644 --- a/src/modules/clist/clc.cpp +++ b/src/modules/clist/clc.cpp @@ -123,13 +123,13 @@ static int ClcSettingChanged(WPARAM wParam, LPARAM lParam) static int ClcAccountsChanged(WPARAM, LPARAM)
{
int i, cnt;
- for (i=0, cnt=0; i < accounts.getCount(); ++i)
+ for (i=0, cnt=0; i < accounts.getCount(); i++)
if (Proto_IsAccountEnabled(accounts[i])) ++cnt;
cli.hClcProtoCount = cnt;
cli.clcProto = (ClcProtoStatus *) mir_realloc(cli.clcProto, sizeof(ClcProtoStatus) * cli.hClcProtoCount);
- for (i=0, cnt=0; i < accounts.getCount(); ++i) {
+ for (i=0, cnt=0; i < accounts.getCount(); i++) {
if (Proto_IsAccountEnabled(accounts[i])) {
cli.clcProto[cnt].szProto = accounts[i]->szModuleName;
cli.clcProto[cnt].dwStatus = CallProtoServiceInt(NULL,accounts[i]->szModuleName, PS_GETSTATUS, 0, 0);
diff --git a/src/modules/clist/clistcore.cpp b/src/modules/clist/clistcore.cpp index 12fbcc032e..19fb928247 100644 --- a/src/modules/clist/clistcore.cpp +++ b/src/modules/clist/clistcore.cpp @@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "..\..\core\commonheaders.h"
#include "clc.h"
#include "genmenu.h"
+#include "..\extraicons\extraicons.h"
CLIST_INTERFACE cli = { 0 };
@@ -207,6 +208,9 @@ static INT_PTR srvRetrieveInterface(WPARAM, LPARAM lParam) cli.pfnGetProtocolMenu = fnGetProtocolMenu;
cli.pfnConvertMenu = fnConvertMenu;
+ cli.pfnReloadExtraIcons = fnReloadExtraIcons;
+ cli.pfnSetAllExtraIcons = fnSetAllExtraIcons;
+
cli.hInst = (HMODULE)lParam;
rc = LoadContactListModule2();
diff --git a/src/modules/clist/clisttray.cpp b/src/modules/clist/clisttray.cpp index aaf7d79fcd..e2833d27fc 100644 --- a/src/modules/clist/clisttray.cpp +++ b/src/modules/clist/clisttray.cpp @@ -288,7 +288,7 @@ int fnTrayIconInit(HWND hwnd) (averageMode < 0 || db_get_b(NULL, "CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT)))
{
cli.trayIconCount = netProtoCount;
- for (int i=0; i < accounts.getCount(); ++i)
+ for (int i=0; i < accounts.getCount(); i++)
{
int j = cli.pfnGetAccountIndexByPos(i);
if (j >= 0)
@@ -748,14 +748,14 @@ INT_PTR fnTrayIconProcessMessage(WPARAM wParam, LPARAM lParam) POINT pt;
HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS, 0, 0);
- for (int i=0; i < cli.trayIconCount; ++i)
+ for (int i=0; i < cli.trayIconCount; i++)
{
if ((unsigned)cli.trayIcon[i].id == msg->wParam)
{
if ( !cli.trayIcon[i].szProto) break;
int ind = 0;
- for (int j = 0; j < accounts.getCount(); ++j)
+ for (int j = 0; j < accounts.getCount(); j++)
{
int k = cli.pfnGetAccountIndexByPos(j);
if (k >= 0)
diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp index 3d24e77a92..0e569f7ccb 100644 --- a/src/modules/clist/clui.cpp +++ b/src/modules/clist/clui.cpp @@ -948,7 +948,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
unsigned int cpnl = 0;
int mcnt = GetMenuItemCount(hMenu);
- for (int i=0; i<mcnt; ++i) {
+ for (int i=0; i<mcnt; i++) {
HMENU hMenus = GetSubMenu(hMenu, i);
if (hMenus && cpnl++ == nPanel) {
hMenu = hMenus;
diff --git a/src/modules/clist/groups.cpp b/src/modules/clist/groups.cpp index cc3d79f280..1351289f49 100644 --- a/src/modules/clist/groups.cpp +++ b/src/modules/clist/groups.cpp @@ -93,7 +93,7 @@ static INT_PTR CreateGroup(WPARAM wParam, LPARAM lParam) else {
i = 1;
while (GroupNameExists(newName + 1, -1))
- mir_sntprintf(newName + 1, SIZEOF(newName) - 1, _T("%s (%d)"), newBaseName, ++i);
+ mir_sntprintf(newName + 1, SIZEOF(newName) - 1, _T("%s (%d)"), newBaseName, i++);
}
if (i) {
const CLISTGROUPCHANGE grpChg = { sizeof(CLISTGROUPCHANGE), NULL, newName };
diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp index eaf4bc1906..83c233cefd 100644 --- a/src/modules/clist/movetogroup.cpp +++ b/src/modules/clist/movetogroup.cpp @@ -112,7 +112,7 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM) pos += 100000; // Separator
- for (i=0; ; ++i)
+ for (i=0; ; i++)
{
char intname[20];
_itoa(i, intname, 10);
@@ -127,7 +127,7 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM) mir_free(dbv.ptszVal);
}
- for (i=0; i < groups.getCount(); ++i)
+ for (i=0; i < groups.getCount(); i++)
{
bool checked = szContactGroup && !_tcscmp(szContactGroup, groups[i].name);
AddGroupItem(hMoveToGroupItem, groups[i].name, ++pos, groups[i].position, checked);
|