diff options
author | dartraiden <wowemuh@gmail.com> | 2019-04-17 22:50:07 +0300 |
---|---|---|
committer | dartraiden <wowemuh@gmail.com> | 2019-04-17 22:50:07 +0300 |
commit | 5747450418fd1c8a457bccd5b4fc2af942c1d116 (patch) | |
tree | 43757466b6135c079d3d596e0f6b127f6181042a | |
parent | 047da8e598a29e3fa31a431a060e4c54266b12d0 (diff) | |
parent | 087ace9a5839200528e15f8335e00ce99cc65140 (diff) |
Merge branch 'master' of https://github.com/miranda-ng/miranda-ng
-rw-r--r-- | plugins/UserInfoEx/IconPacks/ice/src/icons.h | 8 | ||||
-rw-r--r-- | plugins/UserInfoEx/src/svc_email.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/UserInfoEx/IconPacks/ice/src/icons.h b/plugins/UserInfoEx/IconPacks/ice/src/icons.h index 46871836bd..7c2dfa7971 100644 --- a/plugins/UserInfoEx/IconPacks/ice/src/icons.h +++ b/plugins/UserInfoEx/IconPacks/ice/src/icons.h @@ -10,10 +10,10 @@ #define IDI_DLG_EMAIL 103
// dialog infobar & buttons
-#define IDI_ANNIVERSARY 104
-#define IDI_EXPORT 105
-#define IDI_IMPORT 106
-#define IDI_SEARCH 107
+#define IDI_ANNIVERSARY 104
+#define IDI_EXPORT 105
+#define IDI_IMPORT 106
+#define IDI_SEARCH 107
// common icons of details dialog pages
#define IDI_MIRANDA 108
diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp index 2195bf7064..f8ca9bc814 100644 --- a/plugins/UserInfoEx/src/svc_email.cpp +++ b/plugins/UserInfoEx/src/svc_email.cpp @@ -127,7 +127,7 @@ static INT_PTR MenuCommand(WPARAM wParam,LPARAM lParam) static int OnCListApplyIcons(WPARAM wParam, LPARAM)
{
LPSTR val = Get(wParam);
- ExtraIcon_SetIcon(ghExtraIconSvc, wParam, (val) ? g_plugin.getIconHandle(IDI_DLG_EMAIL) : nullptr);
+ ExtraIcon_SetIcon(ghExtraIconSvc, wParam, (val) ? g_plugin.getIconHandle(IDI_BTN_EMAIL) : nullptr);
mir_free(val);
return 0;
}
|