diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdmsg/src/chat_options.cpp | 11 | ||||
| -rw-r--r-- | src/core/stdmsg/src/globals.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/ei_services.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/meta_main.cpp | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp index 778d8f1af8..a5f0428519 100644 --- a/src/core/stdmsg/src/chat_options.cpp +++ b/src/core/stdmsg/src/chat_options.cpp @@ -135,7 +135,7 @@ static INT CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM p // add icons to the skinning module -static IconItem iconList[] = +static IconItem iconList1[] = { { LPGEN("Window icon"), "chat_window", IDI_CHANMGR, 0 }, { LPGEN("Text color"), "chat_fgcol", IDI_COLOR, 0 }, @@ -158,8 +158,11 @@ static IconItem iconList[] = { LPGEN("Status 3 (10x10)"), "chat_status2", IDI_STATUS2, 10 }, { LPGEN("Status 4 (10x10)"), "chat_status3", IDI_STATUS3, 10 }, { LPGEN("Status 5 (10x10)"), "chat_status4", IDI_STATUS4, 10 }, - { LPGEN("Status 6 (10x10)"), "chat_status5", IDI_STATUS5, 10 }, + { LPGEN("Status 6 (10x10)"), "chat_status5", IDI_STATUS5, 10 } +}; +static IconItem iconList2[] = +{ { LPGEN("Message in (10x10)"), "chat_log_message_in", IDI_MESSAGE, 10 }, { LPGEN("Message out (10x10)"), "chat_log_message_out", IDI_MESSAGEOUT, 10 }, { LPGEN("Action (10x10)"), "chat_log_action", IDI_ACTION, 10 }, @@ -178,8 +181,8 @@ static IconItem iconList[] = void AddIcons(void) { - Icon_Register(g_plugin.getInst(), LPGEN("Messaging") "/" LPGEN("Group chats"), iconList, 21); - Icon_Register(g_plugin.getInst(), LPGEN("Messaging") "/" LPGEN("Group chats log"), iconList + 21, 14); + g_plugin.registerIcon(LPGEN("Messaging") "/" LPGEN("Group chats"), iconList1); + g_plugin.registerIcon(LPGEN("Messaging") "/" LPGEN("Group chats log"), iconList2); } // load icons from the skinning module if available diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp index dd0ab36221..08a91a5d3b 100644 --- a/src/core/stdmsg/src/globals.cpp +++ b/src/core/stdmsg/src/globals.cpp @@ -30,7 +30,7 @@ IconItem iconList[] = static void InitIcons(void)
{
- Icon_Register(g_plugin.getInst(), LPGEN("Messaging"), iconList, _countof(iconList), "SRMM");
+ g_plugin.registerIcon(LPGEN("Messaging"), iconList, "SRMM");
}
static int IconsChanged(WPARAM, LPARAM)
diff --git a/src/mir_app/src/ei_services.cpp b/src/mir_app/src/ei_services.cpp index 58db24bada..d1a7b7e395 100644 --- a/src/mir_app/src/ei_services.cpp +++ b/src/mir_app/src/ei_services.cpp @@ -487,7 +487,7 @@ void LoadExtraIconsModule() hEventExtraImageListRebuilding = CreateHookableEvent(ME_CLIST_EXTRA_LIST_REBUILD); // Icons - Icon_Register(g_plugin.getInst(), LPGEN("Contact list"), iconList, _countof(iconList)); + g_plugin.registerIcon(LPGEN("Contact list"), iconList); // Hooks HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded); diff --git a/src/mir_app/src/meta_main.cpp b/src/mir_app/src/meta_main.cpp index 06b3249d06..0527101346 100644 --- a/src/mir_app/src/meta_main.cpp +++ b/src/mir_app/src/meta_main.cpp @@ -64,7 +64,7 @@ static int RegisterMeta(WPARAM, LPARAM) int LoadMetacontacts(void)
{
- Icon_Register(g_plugin.getInst(), LPGEN("MetaContacts"), iconList, _countof(iconList), "mc");
+ g_plugin.registerIcon(LPGEN("MetaContacts"), iconList, "mc");
db_set_resident(META_PROTO, "Status");
db_set_resident(META_PROTO, "IdleTS");
|