diff options
| -rw-r--r-- | protocols/JabberG/src/jabber.cpp | 4 | ||||
| -rw-r--r-- | protocols/MRA/src/MraIcons.cpp | 3 | ||||
| -rw-r--r-- | protocols/MRA/src/MraProto.h | 1 | ||||
| -rw-r--r-- | protocols/MRA/src/Mra_functions.cpp | 2 | ||||
| -rw-r--r-- | protocols/MRA/src/Mra_svcs.cpp | 15 |
5 files changed, 17 insertions, 8 deletions
diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp index 3962a360fe..055d67929d 100644 --- a/protocols/JabberG/src/jabber.cpp +++ b/protocols/JabberG/src/jabber.cpp @@ -193,8 +193,8 @@ static int OnModulesLoaded(WPARAM, LPARAM) ColourRegister(&colourid);
// Init extra icons
- hExtraActivity = ExtraIcon_Register("activity", "Jabber Activity" /* No icons registered, "working" */);
- hExtraMood = ExtraIcon_Register("mood", "Jabber Mood" /* No icons registered, "amazed" */);
+ hExtraActivity = ExtraIcon_Register("activity", "Jabber Activity", "jabber_dancing");
+ hExtraMood = ExtraIcon_Register("mood", "Jabber Mood", "jabber_contemplative");
return 0;
}
diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp index 504aebf7fa..f24ffb42f3 100644 --- a/protocols/MRA/src/MraIcons.cpp +++ b/protocols/MRA/src/MraIcons.cpp @@ -69,7 +69,8 @@ static void AddIcoLibItems(LPWSTR lpwszSubSectionName, GUI_DISPLAY_ITEM *pgdiIte sid.pwszDescription = pgdiItems[i].lpwszDescr;
sid.iDefaultIndex = -pgdiItems[i].defIcon;
sid.hDefaultIcon = (HICON)LoadImage(masMraSettings.hInstance, MAKEINTRESOURCE(pgdiItems[i].defIcon), IMAGE_ICON, 0, 0, LR_SHARED);
- if (sid.hDefaultIcon == NULL) sid.hDefaultIcon = (HICON)LoadImage(NULL, MAKEINTRESOURCE(pgdiItems[i].defIcon), IMAGE_ICON, 0, 0, LR_SHARED);
+ if (sid.hDefaultIcon == NULL)
+ sid.hDefaultIcon = (HICON)LoadImage(NULL, MAKEINTRESOURCE(pgdiItems[i].defIcon), IMAGE_ICON, 0, 0, LR_SHARED);
pgdiItems[i].hIconHandle = Skin_AddIcon(&sid);
}
}
diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h index 18007f3b72..fca74708d9 100644 --- a/protocols/MRA/src/MraProto.h +++ b/protocols/MRA/src/MraProto.h @@ -216,7 +216,6 @@ struct CMraProto : public PROTO_INTERFACE, public MZeroedObject HANDLE hMainMenuItems[MAIN_MENU_ITEMS_COUNT+4];
HANDLE hContactMenuItems[CONTACT_MENU_ITEMS_COUNT+4];
- HANDLE hAdvancedStatusItems[ADV_ICON_MAX+4];
HWND hWndEMailPopupStatus;
DWORD dwEmailMessagesTotal, dwEmailMessagesUnread;
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index cbb9fd585b..07ed22270d 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -1155,8 +1155,6 @@ void CMraProto::CListShowMenuItem(HANDLE hMenuItem, BOOL bShow) int ExtraSetIcon(HANDLE hExtraIcon, HANDLE hContact, HANDLE hImage)
{
- if (hImage == NULL)
- hImage = INVALID_HANDLE_VALUE;
return ExtraIcon_SetIcon(hExtraIcon, hContact, hImage);
}
diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp index dce170c9d7..bc84af7703 100644 --- a/protocols/MRA/src/Mra_svcs.cpp +++ b/protocols/MRA/src/Mra_svcs.cpp @@ -157,8 +157,19 @@ void CMraProto::SetExtraIcons(HANDLE hContact) if (dwBlogStatusMsgSize) dwIconID = ADV_ICON_BLOGSTATUS;
}
- //ExtraSetIcon(hExtraXstatusIcon, hContact, (( IsXStatusValid(dwXStatus) || dwXStatus == MRA_MIR_XSTATUS_UNKNOWN)? hXStatusAdvancedStatusItems[dwXStatus]:NULL));
- ExtraSetIcon(hExtraInfo, hContact, ((dwIconID != -1) ? hAdvancedStatusItems[dwIconID]:NULL));
+ if ( IsXStatusValid(dwXStatus) || dwXStatus == MRA_MIR_XSTATUS_UNKNOWN) {
+ char szSetting[40];
+ mir_snprintf(szSetting, SIZEOF(szSetting), "mra_xstatus%d", dwXStatus);
+ ExtraSetIcon(hExtraXstatusIcon, hContact, szSetting);
+ }
+ else ExtraSetIcon(hExtraXstatusIcon, hContact, NULL);
+
+ if (dwIconID != -1) {
+ char szSetting[40];
+ mir_snprintf(szSetting, SIZEOF(szSetting), "MRA_%s", gdiExtraStatusIconsItems[dwIconID].lpszName);
+ ExtraSetIcon(hExtraInfo, hContact, szSetting);
+ }
+ else ExtraSetIcon(hExtraInfo, hContact, NULL);
}
INT_PTR CMraProto::MraXStatusMenu(WPARAM wParam, LPARAM lParam, LPARAM param)
|