summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/CountryFlags/src/extraimg.cpp165
-rw-r--r--plugins/CountryFlags/src/flags.h2
-rw-r--r--plugins/CountryFlags/src/icons.cpp2
-rw-r--r--plugins/CountryFlags/src/main.cpp2
-rw-r--r--plugins/FingerprintNG/src/fingerprint.cpp16
-rw-r--r--plugins/UserInfoEx/src/Flags/svc_flags.cpp45
-rw-r--r--protocols/JabberG/src/jabber.cpp32
-rw-r--r--protocols/JabberG/src/jabber_proto.cpp43
8 files changed, 142 insertions, 165 deletions
diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp
index 99a737cfd5..7da037909a 100644
--- a/plugins/CountryFlags/src/extraimg.cpp
+++ b/plugins/CountryFlags/src/extraimg.cpp
@@ -34,13 +34,13 @@ static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam)
int countryNumber = 0xFFFF;
char *pszProto = GetContactProto((HANDLE)wParam);
/* ip detect */
- if ( db_get_b(NULL,"Flags","UseIpToCountry",SETTING_USEIPTOCOUNTRY_DEFAULT))
- countryNumber=ServiceIpToCountry(db_get_dw((HANDLE)wParam,pszProto,"RealIP",0),0);
+ if ( db_get_b(NULL, MODULENAME, "UseIpToCountry", SETTING_USEIPTOCOUNTRY_DEFAULT))
+ countryNumber = ServiceIpToCountry(db_get_dw((HANDLE)wParam,pszProto,"RealIP",0),0);
/* fallback */
if (countryNumber == 0xFFFF)
- countryNumber=db_get_w((HANDLE)wParam,pszProto,"Country",0);
+ countryNumber = db_get_w((HANDLE)wParam,pszProto,"Country",0);
if (countryNumber == 0 || countryNumber == 0xFFFF)
- countryNumber=db_get_w((HANDLE)wParam,pszProto,"CompanyCountry",0);
+ countryNumber = db_get_w((HANDLE)wParam,pszProto,"CompanyCountry",0);
return (countryNumber == 0) ? 0xFFFF : countryNumber;
}
@@ -52,7 +52,7 @@ static HANDLE hExtraIcon;
static void CALLBACK SetExtraImage(HANDLE hContact)
{
- if ( !db_get_b(NULL, "Flags", "ShowExtraImgFlag", SETTING_SHOWEXTRAIMGFLAG_DEFAULT))
+ if ( !db_get_b(NULL, MODULENAME, "ShowExtraImgFlag", SETTING_SHOWEXTRAIMGFLAG_DEFAULT))
return;
int countryNumber = ServiceDetectContactOriginCountry((WPARAM)hContact, 0);
@@ -77,7 +77,7 @@ static void EnsureExtraImages(void)
static void CALLBACK UpdateExtraImages(LPARAM lParam)
{
- if ( db_get_b(NULL,"Flags","ShowExtraImgFlag",SETTING_SHOWEXTRAIMGFLAG_DEFAULT))
+ if ( db_get_b(NULL, MODULENAME, "ShowExtraImgFlag", SETTING_SHOWEXTRAIMGFLAG_DEFAULT))
EnsureExtraImages();
else
RemoveExtraImages();
@@ -85,7 +85,7 @@ static void CALLBACK UpdateExtraImages(LPARAM lParam)
static int ExtraImageApply(WPARAM wParam,LPARAM lParam)
{
- if ( db_get_b(NULL,"Flags","ShowExtraImgFlag",SETTING_SHOWEXTRAIMGFLAG_DEFAULT))
+ if ( db_get_b(NULL, MODULENAME, "ShowExtraImgFlag", SETTING_SHOWEXTRAIMGFLAG_DEFAULT))
SetExtraImage((HANDLE)wParam); /* unbuffered */
return 0;
}
@@ -97,92 +97,67 @@ static int ExtraImageApply(WPARAM wParam,LPARAM lParam)
// always call in context of main thread
static void __fastcall SetStatusIcon(HANDLE hContact,int countryNumber)
{
- HICON hIcon = NULL;
-
StatusIconData sid = { sizeof(sid) };
- sid.szModule = "Flags";
-
- if (countryNumber != 0xFFFF || db_get_b(NULL, "Flags", "UseUnknownFlag", SETTING_USEUNKNOWNFLAG_DEFAULT)) {
+ sid.szModule = MODULENAME;
+
+ if (countryNumber != 0xFFFF || db_get_b(NULL, MODULENAME, "UseUnknownFlag", SETTING_USEUNKNOWNFLAG_DEFAULT)) {
/* copy icon as status icon API will call DestroyIcon() on it */
- hIcon = LoadFlagIcon(countryNumber);
- sid.hIcon = (hIcon != NULL) ? CopyIcon(hIcon) : NULL;
- Skin_ReleaseIcon(hIcon); /* does NULL check */
- hIcon = sid.hIcon;
- /* ensure status icon is registered */
- sid.dwId = countryNumber;
+ sid.hIcon = LoadFlagIcon(countryNumber);
sid.szTooltip = Translate((char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER,countryNumber,0));
- if (CallService(MS_MSG_MODIFYICON, 0, (LPARAM)&sid)) /* not yet registered? */
- CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);
}
+ else sid.flags = MBF_HIDDEN;
- /* disable all other flags for this contact */
- sid.hIcon = NULL;
- sid.szTooltip = NULL;
- sid.flags = MBF_HIDDEN;
- for (int i=0; i < nCountriesCount; ++i) {
- sid.dwId = countries[i].id;
- if (countryNumber == countries[i].id && hIcon != NULL)
- sid.flags = 0;
- else
- sid.flags = MBF_HIDDEN;
- CallService(MS_MSG_MODIFYICON, (WPARAM)hContact, (LPARAM)&sid);
- }
+ CallService(MS_MSG_MODIFYICON, (WPARAM)hContact, (LPARAM)&sid);
+
+ if (sid.hIcon)
+ Skin_ReleaseIcon(sid.hIcon);
}
// always call in context of main thread
-static void __fastcall UnsetStatusIcon(HANDLE hContact,int countryNumber)
+static void __fastcall UnsetStatusIcon(HANDLE hContact)
{
- StatusIconData sid;
- sid.cbSize=sizeof(sid);
- sid.szModule="Flags";
- sid.dwId=countryNumber;
- sid.hIconDisabled=sid.hIcon=NULL;
- sid.szTooltip=NULL;
- sid.flags=MBF_HIDDEN;
- CallService(MS_MSG_MODIFYICON,(WPARAM)hContact,(LPARAM)&sid); /* registered? */
- /* can't call MS_MSG_REMOVEICON here as the icon might be
- * in use by other contacts simultanously, removing them all at exit */
+ StatusIconData sid = { sizeof(sid) };
+ sid.szModule = MODULENAME;
+ sid.flags = MBF_HIDDEN;
+ CallService(MS_MSG_MODIFYICON, (WPARAM)hContact, (LPARAM)&sid);
}
static int MsgWndEvent(WPARAM wParam,LPARAM lParam)
{
MessageWindowEventData *msgwe=(MessageWindowEventData*)lParam;
switch(msgwe->uType) {
- case MSG_WINDOW_EVT_OPENING:
- case MSG_WINDOW_EVT_CLOSE:
- { int countryNumber;
- if (msgwe->hContact == NULL || !ServiceExists(MS_MSG_ADDICON)) break; /* sanity check */
- countryNumber=ServiceDetectContactOriginCountry((WPARAM)msgwe->hContact,0);
- if ( db_get_b(NULL,"Flags","ShowStatusIconFlag",SETTING_SHOWSTATUSICONFLAG_DEFAULT)) {
- if (msgwe->uType == MSG_WINDOW_EVT_OPENING) SetStatusIcon(msgwe->hContact,countryNumber);
- else UnsetStatusIcon(msgwe->hContact,countryNumber);
- }
- /* ensure it is hidden, RemoveStatusIcons() only enums currently opened ones */
- else UnsetStatusIcon(msgwe->hContact,countryNumber);
+ case MSG_WINDOW_EVT_OPENING:
+ case MSG_WINDOW_EVT_CLOSE:
+ if ( db_get_b(NULL, MODULENAME, "ShowStatusIconFlag", SETTING_SHOWSTATUSICONFLAG_DEFAULT)) {
+ int countryNumber = ServiceDetectContactOriginCountry((WPARAM)msgwe->hContact, 0);
+ if (msgwe->uType == MSG_WINDOW_EVT_OPENING && countryNumber != 0xFFFF)
+ SetStatusIcon(msgwe->hContact,countryNumber);
+ else
+ UnsetStatusIcon(msgwe->hContact);
}
+ /* ensure it is hidden, RemoveStatusIcons() only enums currently opened ones */
+ else UnsetStatusIcon(msgwe->hContact);
}
return 0;
}
static void CALLBACK UpdateStatusIcons(LPARAM lParam)
{
- MessageWindowInputData msgwi; /* input */
- MessageWindowData msgw; /* output */
- BOOL fShow;
- int countryNumber;
-
- msgwi.cbSize=sizeof(msgwi);
- msgw.cbSize=sizeof(msgw);
- msgwi.uFlags=MSG_WINDOW_UFLAG_MSG_BOTH;
- /* enum all opened message windows */
- fShow=db_get_b(NULL,"Flags","ShowStatusIconFlag",SETTING_SHOWSTATUSICONFLAG_DEFAULT);
- msgwi.hContact=db_find_first();
+ BOOL fShow = db_get_b(NULL,MODULENAME,"ShowStatusIconFlag",SETTING_SHOWSTATUSICONFLAG_DEFAULT);
+
+ MessageWindowInputData msgwi = { sizeof(msgwi) };
+ msgwi.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;
+ msgwi.hContact = db_find_first();
while (msgwi.hContact != NULL) {
/* is a message window opened for this contact? */
- if (!CallService(MS_MSG_GETWINDOWDATA,(WPARAM)&msgwi,(LPARAM)&msgw) && msgw.uState&MSG_WINDOW_STATE_EXISTS) {
- countryNumber=ServiceDetectContactOriginCountry((WPARAM)msgwi.hContact,0);
- if (fShow) SetStatusIcon(msgwi.hContact,countryNumber);
- else UnsetStatusIcon(msgwi.hContact,countryNumber);
+ MessageWindowData msgw; /* output */
+ msgw.cbSize = sizeof(msgw);
+ if (!CallService(MS_MSG_GETWINDOWDATA,(WPARAM)&msgwi,(LPARAM)&msgw) && msgw.uState & MSG_WINDOW_STATE_EXISTS) {
+ if (fShow) {
+ int countryNumber = ServiceDetectContactOriginCountry((WPARAM)msgwi.hContact, 0);
+ SetStatusIcon(msgwi.hContact, countryNumber);
+ }
+ else UnsetStatusIcon(msgwi.hContact);
}
msgwi.hContact = db_find_next(msgw.hContact);
}
@@ -191,8 +166,8 @@ static void CALLBACK UpdateStatusIcons(LPARAM lParam)
static int StatusIconsChanged(WPARAM wParam,LPARAM lParam)
{
if (ServiceExists(MS_MSG_ADDICON))
- if ( db_get_b(NULL,"Flags","ShowStatusIconFlag",SETTING_SHOWSTATUSICONFLAG_DEFAULT))
- CallFunctionBuffered(UpdateStatusIcons,0,FALSE,STATUSICON_REFRESHDELAY);
+ if ( db_get_b(NULL, MODULENAME, "ShowStatusIconFlag", SETTING_SHOWSTATUSICONFLAG_DEFAULT))
+ CallFunctionBuffered(UpdateStatusIcons, 0, FALSE, STATUSICON_REFRESHDELAY);
return 0;
}
@@ -209,17 +184,19 @@ static INT_PTR CALLBACK ExtraImgOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,L
{
BOOL val;
/* Status Icon */
- if (ServiceExists(MS_MSG_ADDICON)) val=db_get_b(NULL,"Flags","ShowStatusIconFlag",SETTING_SHOWSTATUSICONFLAG_DEFAULT) != 0;
- else EnableWindow(GetDlgItem(hwndDlg,IDC_CHECK_SHOWSTATUSICONFLAG),val=FALSE);
+ if (ServiceExists(MS_MSG_ADDICON))
+ val = db_get_b(NULL, MODULENAME, "ShowStatusIconFlag", SETTING_SHOWSTATUSICONFLAG_DEFAULT) != 0;
+ else
+ EnableWindow(GetDlgItem(hwndDlg,IDC_CHECK_SHOWSTATUSICONFLAG),val=FALSE);
CheckDlgButton(hwndDlg,IDC_CHECK_SHOWSTATUSICONFLAG,val);
/* Extra Image */
- val=db_get_b(NULL,"Flags","ShowExtraImgFlag",SETTING_SHOWEXTRAIMGFLAG_DEFAULT) != 0;
+ val = db_get_b(NULL,MODULENAME,"ShowExtraImgFlag",SETTING_SHOWEXTRAIMGFLAG_DEFAULT) != 0;
CheckDlgButton(hwndDlg,IDC_CHECK_SHOWEXTRAIMGFLAG,val);
/* Unknown Flag */
- val=db_get_b(NULL,"Flags","UseUnknownFlag",SETTING_USEUNKNOWNFLAG_DEFAULT) != 0;
+ val = db_get_b(NULL,MODULENAME,"UseUnknownFlag",SETTING_USEUNKNOWNFLAG_DEFAULT) != 0;
CheckDlgButton(hwndDlg,IDC_CHECK_USEUNKNOWNFLAG,val);
/* IP-to-country */
- val=db_get_b(NULL,"Flags","UseIpToCountry",SETTING_USEIPTOCOUNTRY_DEFAULT) != 0;
+ val = db_get_b(NULL,MODULENAME,"UseIpToCountry",SETTING_USEIPTOCOUNTRY_DEFAULT) != 0;
CheckDlgButton(hwndDlg,IDC_CHECK_USEIPTOCOUNTRY,val);
}
SendMessage(hwndDlg,M_ENABLE_SUBCTLS,0,0);
@@ -244,14 +221,14 @@ static INT_PTR CALLBACK ExtraImgOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,L
case WM_NOTIFY:
switch(((NMHDR*)lParam)->code) {
case PSN_APPLY: /* setting change hook will pick these up */
- db_set_b(NULL,"Flags","UseUnknownFlag",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_USEUNKNOWNFLAG) != 0));
- db_set_b(NULL,"Flags","UseIpToCountry",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_USEIPTOCOUNTRY) != 0));
+ db_set_b(NULL,MODULENAME,"UseUnknownFlag",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_USEUNKNOWNFLAG) != 0));
+ db_set_b(NULL,MODULENAME,"UseIpToCountry",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_USEIPTOCOUNTRY) != 0));
/* Status Icon */
if (IsWindowEnabled(GetDlgItem(hwndDlg,IDC_CHECK_SHOWSTATUSICONFLAG)))
- db_set_b(NULL,"Flags","ShowStatusIconFlag",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SHOWSTATUSICONFLAG) != 0));
+ db_set_b(NULL,MODULENAME,"ShowStatusIconFlag",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SHOWSTATUSICONFLAG) != 0));
/* Extra Image */
if (IsWindowEnabled(GetDlgItem(hwndDlg,IDC_CHECK_SHOWEXTRAIMGFLAG)))
- db_set_b(NULL,"Flags","ShowExtraImgFlag",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SHOWEXTRAIMGFLAG) != 0));
+ db_set_b(NULL,MODULENAME,"ShowExtraImgFlag",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SHOWEXTRAIMGFLAG) != 0));
return TRUE;
}
break;
@@ -261,8 +238,7 @@ static INT_PTR CALLBACK ExtraImgOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,L
static int ExtraImgOptInit(WPARAM wParam,LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = { 0 };
- odp.cbSize = sizeof(odp);
+ OPTIONSDIALOGPAGE odp = { sizeof(odp) };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_EXTRAIMG);
odp.position = 900000002;
@@ -279,7 +255,7 @@ static int ExtraImgSettingChanged(WPARAM wParam,LPARAM lParam)
{
DBCONTACTWRITESETTING *dbcws=(DBCONTACTWRITESETTING*)lParam;
if ((HANDLE)wParam == NULL) {
- if (!lstrcmpA(dbcws->szModule,"Flags")) {
+ if (!lstrcmpA(dbcws->szModule,MODULENAME)) {
/* Extra Image */
if (!lstrcmpA(dbcws->szSetting,"ShowExtraImgFlag") ||
!lstrcmpA(dbcws->szSetting,"ExtraImgFlagColumn") ||
@@ -313,23 +289,38 @@ static int ExtraImgModulesLoaded(WPARAM wParam,LPARAM lParam)
{
/* Options */
if (ServiceExists("DBEditorpp/RegisterSingleModule"))
- CallService("DBEditorpp/RegisterSingleModule",(WPARAM)"Flags",0);
+ CallService("DBEditorpp/RegisterSingleModule",(WPARAM)MODULENAME,0);
/* Extra Image */
hExtraIcon = ExtraIcon_Register("flags_extra", LPGEN("Country flag"));
HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY,ExtraImageApply);
+ StatusIconData sid = { sizeof(sid) };
+ sid.szModule = MODULENAME; // dwID = 0
+ sid.flags = MBF_HIDDEN;
+ CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);
+
/* Status Icon */
- HookEvent(ME_MSG_WINDOWEVENT,MsgWndEvent);
+ HookEvent(ME_MSG_WINDOWEVENT, MsgWndEvent);
+ return 0;
+}
+
+static int ExtraImgShutdown(WPARAM, LPARAM)
+{
+ StatusIconData sid = { sizeof(sid) };
+ sid.szModule = MODULENAME; // dwID = 0
+ sid.flags = MBF_HIDDEN;
+ CallService(MS_MSG_REMOVEICON, 0, (LPARAM)&sid);
return 0;
}
void InitExtraImg(void)
{
/* Services */
- hServiceDetectContactOrigin=CreateServiceFunction(MS_FLAGS_DETECTCONTACTORIGINCOUNTRY,ServiceDetectContactOriginCountry);
+ hServiceDetectContactOrigin = CreateServiceFunction(MS_FLAGS_DETECTCONTACTORIGINCOUNTRY,ServiceDetectContactOriginCountry);
/* Misc */
- HookEvent(ME_SYSTEM_MODULESLOADED,ExtraImgModulesLoaded);
+ HookEvent(ME_SYSTEM_MODULESLOADED, ExtraImgModulesLoaded);
+ HookEvent(ME_SYSTEM_PRESHUTDOWN, ExtraImgShutdown);
/* Status icon */
HookEvent(ME_SKIN2_ICONSCHANGED,StatusIconsChanged);
/* Options */
diff --git a/plugins/CountryFlags/src/flags.h b/plugins/CountryFlags/src/flags.h
index 66308023a0..9ebee77f24 100644
--- a/plugins/CountryFlags/src/flags.h
+++ b/plugins/CountryFlags/src/flags.h
@@ -36,6 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define FLAGS_NOHELPERFUNCTIONS
#include <m_flags.h>
+#define MODULENAME "Flags"
+
#include "resource.h"
#include "version.h"
diff --git a/plugins/CountryFlags/src/icons.cpp b/plugins/CountryFlags/src/icons.cpp
index 34324005ad..7e37254ada 100644
--- a/plugins/CountryFlags/src/icons.cpp
+++ b/plugins/CountryFlags/src/icons.cpp
@@ -96,7 +96,7 @@ static int __fastcall CountryNumberToBitmapIndex(int countryNumber)
// only operates on color icons, which isn't a problem here
static HICON __fastcall ResizeIconCentered(HICON hIcon,int cx,int cy)
{
- HICON hResIcon=NULL;
+ HICON hResIcon = NULL;
HDC hdc = CreateCompatibleDC(NULL);
if (hdc != NULL) {
ICONINFO icoi;
diff --git a/plugins/CountryFlags/src/main.cpp b/plugins/CountryFlags/src/main.cpp
index 4bd819143a..d72c9937d7 100644
--- a/plugins/CountryFlags/src/main.cpp
+++ b/plugins/CountryFlags/src/main.cpp
@@ -69,4 +69,4 @@ extern "C" __declspec(dllexport) int Unload(void)
UninitIpToCountry();
UninitIcons();
return 0;
-} \ No newline at end of file
+}
diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp
index 893318071f..df1a7aca71 100644
--- a/plugins/FingerprintNG/src/fingerprint.cpp
+++ b/plugins/FingerprintNG/src/fingerprint.cpp
@@ -145,7 +145,6 @@ static void SetSrmmIcon(HANDLE hContact, LPTSTR ptszMirver)
StatusIconData sid = { sizeof(sid) };
sid.szModule = MODULENAME;
sid.dwId = 1;
- sid.flags = MBF_OWNERSTATE;
sid.szTooltip = LPGEN("Client icon");
if ( lstrlen(ptszMirver))
@@ -1163,7 +1162,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
if (db_get_b(NULL, MODULENAME, "StatusBarIcon", 1) && ServiceExists(MS_MSG_ADDICON)) {
StatusIconData sid = { sizeof(sid) };
sid.szModule = MODULENAME;
- sid.flags = MBF_OWNERSTATE | MBF_HIDDEN;
+ sid.flags = MBF_HIDDEN;
sid.dwId = 1;
CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);
}
@@ -1178,12 +1177,13 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
static int OnPreShutdown(WPARAM wParam, LPARAM lParam)
{
- if (ServiceExists(MS_MSG_REMOVEICON)) {
- StatusIconData sid = { sizeof(sid) };
- sid.szModule = MODULENAME;
- CallService(MS_MSG_REMOVEICON, 0, (LPARAM)&sid);
- }
-
+ if (ServiceExists(MS_MSG_REMOVEICON)) {
+ StatusIconData sid = { sizeof(sid) };
+ sid.szModule = MODULENAME;
+ sid.dwId = 1;
+ CallService(MS_MSG_REMOVEICON, 0, (LPARAM)&sid);
+ }
+
return 0;
}
diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index ced26a1b07..75cdf0f5cf 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -336,46 +336,25 @@ MsgWndData::~MsgWndData() {
FlagsIconUnset(); //check if realy need
}
-void
-MsgWndData::FlagsIconSet() {
- HICON hIcon = NULL;
- StatusIconData sid = {0};
- sid.cbSize = sizeof(sid);
- sid.szModule = MODNAMEFLAGS;
+void MsgWndData::FlagsIconSet()
+{
/* ensure status icon is registered */
- if ( m_countryID!=0xFFFF || gFlagsOpts.bUseUnknownFlag) {
- /* copy icon as status icon API will call DestroyIcon() on it */
- hIcon = LoadFlagIcon(m_countryID);
- sid.hIcon = (hIcon!=NULL)?CopyIcon(hIcon):NULL;
- Skin_ReleaseIcon(hIcon); /* does NULL check */
- hIcon = sid.hIcon;
- sid.dwId = (DWORD)m_countryID;
- sid.hIconDisabled = sid.hIcon/*NULL*/;
- sid.szTooltip = Translate((char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER,m_countryID,0));
- sid.flags = 0;
+ if (m_countryID != 0xFFFF || gFlagsOpts.bUseUnknownFlag) {
+ StatusIconData sid = { sizeof(sid) };
+ sid.szModule = MODNAMEFLAGS;
+ sid.hIconDisabled = sid.hIcon = LoadFlagIcon(m_countryID);
+ sid.szTooltip = Translate((char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER,m_countryID,0));
if(CallService(MS_MSG_MODIFYICON,(WPARAM)m_hContact,(LPARAM)&sid) !=0) /* not yet registered? */
CallService(MS_MSG_ADDICON,0,(LPARAM)&sid);
}
- sid.hIcon = NULL;
- sid.szTooltip = NULL;
- sid.hIconDisabled = NULL;
- for(int i=0;i<nCountriesCount;++i) {
- sid.dwId = (DWORD)countries[i].id;
- sid.flags = (m_countryID==countries[i].id && hIcon!=NULL)? 0:MBF_HIDDEN;
- CallService(MS_MSG_MODIFYICON,(WPARAM)m_hContact,(LPARAM)&sid);
- }
}
-void
-MsgWndData::FlagsIconUnset() {
- StatusIconData sid = {0};
- sid.cbSize = sizeof(sid);
- sid.szModule = MODNAMEFLAGS;
- sid.dwId = (DWORD)m_countryID;
- sid.flags = MBF_HIDDEN;
+void MsgWndData::FlagsIconUnset()
+{
+ StatusIconData sid = { sizeof(sid) };
+ sid.szModule = MODNAMEFLAGS;
+ sid.flags = MBF_HIDDEN;
CallService(MS_MSG_MODIFYICON,(WPARAM)m_hContact,(LPARAM)&sid);
- /* can't call MS_MSG_REMOVEICON here as the icon might be
- * in use by other contacts simultanously, removing them all at exit */
}
static int CompareMsgWndData(const MsgWndData* p1, const MsgWndData* p2)
diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index 43190cdfd7..2c76951eb0 100644
--- a/protocols/JabberG/src/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
@@ -104,38 +104,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX *MirandaPluginInfoEx(DWORD miranda
extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};
///////////////////////////////////////////////////////////////////////////////
-// OnPreShutdown - prepares Miranda to be shut down
-
-int __cdecl CJabberProto::OnPreShutdown(WPARAM, LPARAM)
-{
- UI_SAFE_CLOSE_HWND(m_hwndAgentRegInput);
- UI_SAFE_CLOSE_HWND(m_hwndRegProgress);
- UI_SAFE_CLOSE_HWND(m_hwndMucVoiceList);
- UI_SAFE_CLOSE_HWND(m_hwndMucMemberList);
- UI_SAFE_CLOSE_HWND(m_hwndMucModeratorList);
- UI_SAFE_CLOSE_HWND(m_hwndMucBanList);
- UI_SAFE_CLOSE_HWND(m_hwndMucAdminList);
- UI_SAFE_CLOSE_HWND(m_hwndMucOwnerList);
- UI_SAFE_CLOSE_HWND(m_hwndJabberChangePassword);
- UI_SAFE_CLOSE_HWND(m_hwndJabberAddBookmark);
- UI_SAFE_CLOSE_HWND(m_hwndPrivacyRule);
-
- UI_SAFE_CLOSE(m_pDlgPrivacyLists);
- UI_SAFE_CLOSE(m_pDlgBookmarks);
- UI_SAFE_CLOSE(m_pDlgServiceDiscovery);
- UI_SAFE_CLOSE(m_pDlgJabberJoinGroupchat);
- UI_SAFE_CLOSE(m_pDlgNotes);
-
- m_iqManager.ExpireAll();
- m_iqManager.Shutdown();
- m_messageManager.Shutdown();
- m_presenceManager.Shutdown();
- m_sendManager.Shutdown();
- ConsoleUninit();
- return 0;
-}
-
-///////////////////////////////////////////////////////////////////////////////
// OnModulesLoaded - execute some code when all plugins are initialized
static INT_PTR g_SvcParseXmppUri(WPARAM w, LPARAM l)
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index aa705faea9..8f68e215aa 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -295,13 +295,12 @@ int CJabberProto::OnModulesLoadedEx(WPARAM, LPARAM)
}
if (ServiceExists(MS_MSG_ADDICON)) {
- StatusIconData sid = {0};
- sid.cbSize = sizeof(sid);
+ StatusIconData sid = { sizeof(sid) };
sid.szModule = m_szModuleName;
sid.hIcon = sid.hIconDisabled = LoadIconEx("main");
sid.flags = MBF_HIDDEN;
sid.szTooltip = Translate("Jabber Resource");
- CallService(MS_MSG_ADDICON, 0, (LPARAM) &sid);
+ CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);
Skin_ReleaseIcon(sid.hIcon);
JHookEvent(ME_MSG_ICONPRESSED, &CJabberProto::OnProcessSrmmIconClick);
@@ -349,6 +348,44 @@ int CJabberProto::OnModulesLoadedEx(WPARAM, LPARAM)
return 0;
}
+///////////////////////////////////////////////////////////////////////////////
+// OnPreShutdown - prepares Miranda to be shut down
+
+int __cdecl CJabberProto::OnPreShutdown(WPARAM, LPARAM)
+{
+ UI_SAFE_CLOSE_HWND(m_hwndAgentRegInput);
+ UI_SAFE_CLOSE_HWND(m_hwndRegProgress);
+ UI_SAFE_CLOSE_HWND(m_hwndMucVoiceList);
+ UI_SAFE_CLOSE_HWND(m_hwndMucMemberList);
+ UI_SAFE_CLOSE_HWND(m_hwndMucModeratorList);
+ UI_SAFE_CLOSE_HWND(m_hwndMucBanList);
+ UI_SAFE_CLOSE_HWND(m_hwndMucAdminList);
+ UI_SAFE_CLOSE_HWND(m_hwndMucOwnerList);
+ UI_SAFE_CLOSE_HWND(m_hwndJabberChangePassword);
+ UI_SAFE_CLOSE_HWND(m_hwndJabberAddBookmark);
+ UI_SAFE_CLOSE_HWND(m_hwndPrivacyRule);
+
+ UI_SAFE_CLOSE(m_pDlgPrivacyLists);
+ UI_SAFE_CLOSE(m_pDlgBookmarks);
+ UI_SAFE_CLOSE(m_pDlgServiceDiscovery);
+ UI_SAFE_CLOSE(m_pDlgJabberJoinGroupchat);
+ UI_SAFE_CLOSE(m_pDlgNotes);
+
+ m_iqManager.ExpireAll();
+ m_iqManager.Shutdown();
+ m_messageManager.Shutdown();
+ m_presenceManager.Shutdown();
+ m_sendManager.Shutdown();
+ ConsoleUninit();
+
+ if (ServiceExists(MS_MSG_REMOVEICON)) {
+ StatusIconData sid = { sizeof(sid) };
+ sid.szModule = m_szModuleName;
+ CallService(MS_MSG_REMOVEICON, 0, (LPARAM)&sid);
+ }
+ return 0;
+}
+
////////////////////////////////////////////////////////////////////////////////////////
// JabberAddToList - adds a contact to the contact list
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 00:42:45 +0000