From bcb27264ba737778e5d3edad36088bacf74f0236 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 9 Apr 2013 20:03:46 +0000 Subject: - short function names allows to write database loops in one string; - 'continue' operator can be used then; - multiple bugs fixed in clists; - code becomes much more compact; git-svn-id: http://svn.miranda-ng.org/main/trunk@4403 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_lists.cpp | 3 +-- protocols/MSN/src/msn_proto.cpp | 11 +++-------- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'protocols/MSN/src') diff --git a/protocols/MSN/src/msn_lists.cpp b/protocols/MSN/src/msn_lists.cpp index bf23f84ce2..74961195f7 100644 --- a/protocols/MSN/src/msn_lists.cpp +++ b/protocols/MSN/src/msn_lists.cpp @@ -256,8 +256,7 @@ void CMsnProto::Lists_Populate(void) else Lists_Add(0, NETID_UNKNOWN, szEmail, hContact); } - else - CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0); + else CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0); } hContact = hContactN; } diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index bdf55a975f..a9da564cf3 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -92,17 +92,13 @@ CMsnProto::CMsnProto(const char* aProtoName, const TCHAR* aUserName) : LoadOptions(); - HANDLE hContact = db_find_first(); - while (hContact != NULL) - { - if (MSN_IsMyContact(hContact)) - { + for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { + if (MSN_IsMyContact(hContact)) { deleteSetting(hContact, "Status"); deleteSetting(hContact, "IdleTS"); deleteSetting(hContact, "p2pMsgId"); deleteSetting(hContact, "AccList"); } - hContact = db_find_next(hContact); } deleteSetting(NULL, "MobileEnabled"); deleteSetting(NULL, "MobileAllowed"); @@ -112,8 +108,7 @@ CMsnProto::CMsnProto(const char* aProtoName, const TCHAR* aUserName) : strcmp(path, MSN_DEFAULT_GATEWAY) == 0)) deleteSetting(NULL, "LoginServer"); - if (MyOptions.SlowSend) - { + if (MyOptions.SlowSend) { if (db_get_dw(NULL, "SRMsg", "MessageTimeout", 10000) < 60000) db_set_dw(NULL, "SRMsg", "MessageTimeout", 60000); if (db_get_dw(NULL, "SRMM", "MessageTimeout", 10000) < 60000) -- cgit v1.2.3