summaryrefslogtreecommitdiff
path: root/plugins/Scriver/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-04-06 23:05:29 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-04-06 23:05:29 +0000
commit6640a8f419a9ef61ad7af41a419615c2d07b872e (patch)
tree6dfecb48ccc82c0c372ced9be59255c7408ebafd /plugins/Scriver/src
parent06823b967ab360de98fa2c9e685695e1dff6f78a (diff)
menu item flag CMIF_ICONFROMICOLIB is ignored by the core from now on
git-svn-id: http://svn.miranda-ng.org/main/trunk@4354 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Scriver/src')
-rw-r--r--plugins/Scriver/src/chat/main.cpp5
-rw-r--r--plugins/Scriver/src/msgs.cpp2
2 files changed, 3 insertions, 4 deletions
diff --git a/plugins/Scriver/src/chat/main.cpp b/plugins/Scriver/src/chat/main.cpp
index 56ca3965ef..23bc536582 100644
--- a/plugins/Scriver/src/chat/main.cpp
+++ b/plugins/Scriver/src/chat/main.cpp
@@ -76,14 +76,14 @@ int Chat_ModulesLoaded(WPARAM wParam,LPARAM lParam)
CLISTMENUITEM mi = { sizeof(mi) };
mi.cbSize = sizeof(mi);
mi.position = -2000090001;
- mi.flags = CMIF_DEFAULT | CMIF_ICONFROMICOLIB;
+ mi.flags = CMIF_DEFAULT;
mi.icolibItem = LoadSkinnedIconHandle( SKINICON_CHAT_JOIN );
mi.pszName = LPGEN("&Join");
mi.pszService = "GChat/JoinChat";
hJoinMenuItem = Menu_AddContactMenuItem(&mi);
mi.position = -2000090000;
- mi.flags = CMIF_NOTOFFLINE | CMIF_ICONFROMICOLIB;
+ mi.flags = CMIF_NOTOFFLINE;
mi.icolibItem = LoadSkinnedIconHandle( SKINICON_CHAT_LEAVE );
mi.pszName = LPGEN("&Leave");
mi.pszService = "GChat/LeaveChat";
@@ -93,7 +93,6 @@ int Chat_ModulesLoaded(WPARAM wParam,LPARAM lParam)
return 0;
}
-
void LoadIcons(void)
{
LoadMsgLogBitmaps();
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 0f3eb1f6f2..6bda0dfb90 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -452,7 +452,7 @@ static int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
CLISTMENUITEM mi = { sizeof(mi) };
mi.position = -2000090000;
- mi.flags = CMIF_ICONFROMICOLIB | CMIF_DEFAULT;
+ mi.flags = CMIF_DEFAULT;
mi.icolibItem = LoadSkinnedIconHandle( SKINICON_EVENT_MESSAGE );
mi.pszName = LPGEN("&Message");
mi.pszService = MS_MSG_SENDMESSAGE;