summaryrefslogtreecommitdiff
path: root/protocols/IcqOscarJ/src/icq_proto.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-04-14 17:13:05 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-04-14 17:13:05 +0000
commit1681b4828192e02e34c74a65387562a8b2215faa (patch)
tree5b9a60b80eabdd7a873b75cc5d78240bf403f69f /protocols/IcqOscarJ/src/icq_proto.cpp
parent4c0a9cfe95004f1fc934b69aa65cf2bd8a3f46ac (diff)
some minor problems in ICQ
git-svn-id: http://svn.miranda-ng.org/main/trunk@12821 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IcqOscarJ/src/icq_proto.cpp')
-rw-r--r--protocols/IcqOscarJ/src/icq_proto.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index c811a77704..1e4289a9f4 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -1531,9 +1531,10 @@ char* CIcqProto::PrepareStatusNote(int nStatus)
// use custom status message as status note
if (bXStatus)
- szStatusNote = getSettingStringUtf(NULL, DBSETTING_XSTATUS_MSG, "");
+ szStatusNote = getSettingStringUtf(NULL, DBSETTING_XSTATUS_MSG, NULL);
- if (!szStatusNote || !szStatusNote[0]) { // get standard status message (no custom status defined)
+ // get standard status message (no custom status defined)
+ if (szStatusNote == NULL) {
mir_cslock l(m_modeMsgsMutex);
char **pszStatusNote = MirandaStatusToAwayMsg(nStatus);
@@ -1541,8 +1542,7 @@ char* CIcqProto::PrepareStatusNote(int nStatus)
szStatusNote = null_strdup(*pszStatusNote);
}
- if (!szStatusNote)
- // nothing available set empty status note
+ if (szStatusNote == NULL) // nothing available. set empty status note
szStatusNote = null_strdup("");
return szStatusNote;