diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-10-26 00:01:16 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-10-26 00:01:16 +0000 |
| commit | 1fcc1afe0d54bc1034dd500837050dd972e45161 (patch) | |
| tree | 273a9aa0b3af2fe36294336fa4e88a4809766af5 /plugins/NewXstatusNotify/src/utils.cpp | |
| parent | 57e1d54a667e66b9409db2ea4137e883ba1187ac (diff) | |
- old crap killed in NewXStatusNotify
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@2081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/NewXstatusNotify/src/utils.cpp')
| -rw-r--r-- | plugins/NewXstatusNotify/src/utils.cpp | 76 |
1 files changed, 34 insertions, 42 deletions
diff --git a/plugins/NewXstatusNotify/src/utils.cpp b/plugins/NewXstatusNotify/src/utils.cpp index bfa8184ddf..ee8dbbc150 100644 --- a/plugins/NewXstatusNotify/src/utils.cpp +++ b/plugins/NewXstatusNotify/src/utils.cpp @@ -4,19 +4,19 @@ Copyright (c) 2005-2007 Vasilich
Copyright (c) 2007-2011 yaho
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "common.h"
@@ -28,16 +28,14 @@ extern STATUS StatusList[STATUS_COUNT]; TCHAR *db2t(DBVARIANT *dbv)
{
TCHAR *buff;
- switch (dbv->type)
- {
+ switch (dbv->type) {
case DBVT_ASCIIZ: buff = mir_a2t(dbv->pszVal); break;
case DBVT_WCHAR: buff = mir_tstrdup(dbv->ptszVal); break;
case DBVT_UTF8: buff = mir_utf8decodeT(dbv->pszVal); break;
- default: buff = mir_tstrdup(_T(""));
+ default: return NULL;
}
- if (buff[0] == 0)
- {
+ if (buff[0] == 0) {
mir_free(buff);
buff = NULL;
}
@@ -48,8 +46,7 @@ TCHAR *db2t(DBVARIANT *dbv) int DBGetStringDefault(HANDLE hContact, const char *szModule, const char *szSetting, TCHAR *setting, int size, const TCHAR *defaultValue)
{
DBVARIANT dbv;
- if (!DBGetContactSettingTString(hContact, szModule, szSetting, &dbv))
- {
+ if ( !DBGetContactSettingTString(hContact, szModule, szSetting, &dbv)) {
_tcsncpy(setting, dbv.ptszVal, size);
DBFreeVariant(&dbv);
return 0;
@@ -85,40 +82,35 @@ int ProtoServiceExists(const char *szModule, const char *szService) BOOL StatusHasAwayMessage(char *szProto, int status)
{
- if (szProto != NULL)
- {
+ if (szProto != NULL) {
unsigned long iSupportsSM = (unsigned long)CallProtoService(szProto, PS_GETCAPS, (WPARAM)PFLAGNUM_3, (LPARAM)0);
return (iSupportsSM & Proto_Status2Flag(status)) ? TRUE : FALSE;
}
- else
- {
- switch (status)
- {
- case ID_STATUS_AWAY:
- case ID_STATUS_NA:
- case ID_STATUS_OCCUPIED:
- case ID_STATUS_DND:
- case ID_STATUS_FREECHAT:
- case ID_STATUS_ONTHEPHONE:
- case ID_STATUS_OUTTOLUNCH:
- return TRUE;
- default:
- return FALSE;
- }
+
+ switch (status) {
+ case ID_STATUS_AWAY:
+ case ID_STATUS_NA:
+ case ID_STATUS_OCCUPIED:
+ case ID_STATUS_DND:
+ case ID_STATUS_FREECHAT:
+ case ID_STATUS_ONTHEPHONE:
+ case ID_STATUS_OUTTOLUNCH:
+ return TRUE;
+
+ default:
+ return FALSE;
}
}
void LogToFile(TCHAR *stzText)
{
FILE *fp = _tfopen(opt.LogFilePath, _T("a+b, ccs=UTF-8"));
- if (fp)
- {
+ if (fp) {
char *encodedText = mir_utf8encodeT(stzText);
- if (encodedText)
- {
+ if (encodedText) {
fprintf(fp, encodedText);
mir_free(encodedText);
}
fclose(fp);
}
-}
\ No newline at end of file +}
|