summaryrefslogtreecommitdiff
path: root/protocols/MSN/src
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/MSN/src')
-rw-r--r--protocols/MSN/src/msn_lists.cpp3
-rw-r--r--protocols/MSN/src/msn_proto.cpp11
2 files changed, 4 insertions, 10 deletions
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)