diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-20 14:33:10 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-20 14:33:10 +0000 |
| commit | 83fa989e4ec503c4a8e82c097d4d464ff5495184 (patch) | |
| tree | 85b67826287db1d6d4fe726c8fdd1c6311387c59 /protocols/JabberG/src/jabber_thread.cpp | |
| parent | 28de716d3ad748ffb6ee5987991ec011cdc63aa1 (diff) | |
- PS_GETCUSTOMSTATUSEX service for Jabber;
- further code cleaning.
git-svn-id: http://svn.miranda-ng.org/main/trunk@2393 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 12bb41479a..e4c946a2ad 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -911,7 +911,7 @@ void CJabberProto::OnProcessSuccess(HXML node, ThreadData* info) }
Log("Success: Logged-in.");
- if (DBGetContactSettingString(NULL, m_szModuleName, "Nick", &dbv))
+ if ( DBGetContactSettingString(NULL, m_szModuleName, "Nick", &dbv))
JSetStringT(NULL, "Nick", info->username);
else
db_free(&dbv);
@@ -1570,7 +1570,7 @@ void CJabberProto::UpdateJidDbSettings(const TCHAR *jid) if (item->itemResource.statusMessage)
db_set_ts(hContact, "CList", "StatusMsg", item->itemResource.statusMessage);
else
- DBDeleteContactSetting(hContact, "CList", "StatusMsg");
+ db_unset(hContact, "CList", "StatusMsg");
}
// Determine status to show for the contact based on the remaining resources
@@ -1594,7 +1594,7 @@ void CJabberProto::UpdateJidDbSettings(const TCHAR *jid) if (item->resource[nSelectedResource].statusMessage)
db_set_ts(hContact, "CList", "StatusMsg", item->resource[nSelectedResource].statusMessage);
else
- DBDeleteContactSetting(hContact, "CList", "StatusMsg");
+ db_unset(hContact, "CList", "StatusMsg");
UpdateMirVer(hContact, &item->resource[nSelectedResource]);
}
else JDeleteSetting(hContact, DBSETTING_DISPLAY_UID);
@@ -1799,7 +1799,7 @@ void CJabberProto::OnProcessPresence(HXML node, ThreadData* info) if ((hContact=AddToListByJID(from, 0)) != NULL) {
// Trigger actual add by removing the "NotOnList" added by AddToListByJID()
// See AddToListByJID() and JabberDbSettingChanged().
- DBDeleteContactSetting(hContact, "CList", "NotOnList");
+ db_unset(hContact, "CList", "NotOnList");
} } }
RebuildInfoFrame();
}
|