From c625ddaf81f7481bffcd528ed3012fdc3a6bc8e1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 7 Nov 2012 14:53:21 +0000 Subject: EMPTY_EXTRA_ICON applied to all another plugins git-svn-id: http://svn.miranda-ng.org/main/trunk@2232 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CountryFlags/src/extraimg.cpp | 7 +++---- plugins/CountryFlags/src/icons.cpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'plugins/CountryFlags/src') diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp index 3182a41b79..dcb8f33773 100644 --- a/plugins/CountryFlags/src/extraimg.cpp +++ b/plugins/CountryFlags/src/extraimg.cpp @@ -31,9 +31,8 @@ extern struct CountryListEntry *countries; static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam) { - int countryNumber=0xFFFF; - char *pszProto; - pszProto=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,wParam,0); + int countryNumber = 0xFFFF; + char *pszProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,wParam,0); /* ip detect */ if ( db_get_b(NULL,"Flags","UseIpToCountry",SETTING_USEIPTOCOUNTRY_DEFAULT)) countryNumber=ServiceIpToCountry(DBGetContactSettingDword((HANDLE)wParam,pszProto,"RealIP",0),0); @@ -42,7 +41,7 @@ static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam) countryNumber=DBGetContactSettingWord((HANDLE)wParam,pszProto,"Country",0); if (countryNumber == 0 || countryNumber == 0xFFFF) countryNumber=DBGetContactSettingWord((HANDLE)wParam,pszProto,"CompanyCountry",0); - return (countryNumber == 0)?0xFFFF:countryNumber; + return (countryNumber == 0) ? 0xFFFF : countryNumber; } /************************* Extra Image ****************************/ diff --git a/plugins/CountryFlags/src/icons.cpp b/plugins/CountryFlags/src/icons.cpp index 5fb6a54a6d..5e2bcae8a7 100644 --- a/plugins/CountryFlags/src/icons.cpp +++ b/plugins/CountryFlags/src/icons.cpp @@ -148,7 +148,7 @@ HICON FASTCALL LoadFlagIcon(int countryNumber) /* create identifier */ char *szCountry = (char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, countryNumber, 0); if (szCountry == NULL) - szCountry = (char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, countryNumber=0xFFFF, 0); + szCountry = (char*)CallService(MS_UTILS_GETCOUNTRYBYNUMBER, countryNumber = 0xFFFF, 0); char szId[20]; wsprintfA(szId, (countryNumber == 0xFFFF) ? "%s0x%X" : "%s%i", "flags_", countryNumber); /* buffer safe */ -- cgit v1.2.3