diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-07-11 11:28:19 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-07-11 11:28:19 +0000 |
| commit | 1b97a92df3c1000cc52b3daaf52bf8a1e1772fd6 (patch) | |
| tree | 9adb32601aa470af7fae6cc2a0ae842f7a58df37 | |
| parent | 6193282b03090dedd443b9d203846f299216181b (diff) | |
fix for an endless cycle in AIM
git-svn-id: http://svn.miranda-ng.org/main/trunk@5326 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | include/m_protoint.h | 4 | ||||
| -rw-r--r-- | protocols/AimOscar/src/utility.cpp | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/include/m_protoint.h b/include/m_protoint.h index 902b4f7142..89218c00f4 100644 --- a/include/m_protoint.h +++ b/include/m_protoint.h @@ -60,8 +60,8 @@ struct PROTO_INTERFACE : public MZeroedObject __forceinline INT_PTR ProtoBroadcastAck(HANDLE hContact, int type, int hResult, HANDLE hProcess, LPARAM lParam)
{ return ::ProtoBroadcastAck(m_szModuleName, hContact, type, hResult, hProcess, lParam); }
- __forceinline void delSetting(const char *name) { db_unset(NULL, m_szModuleName, name); }
- __forceinline void delSetting(HANDLE hContact, const char *name) { db_unset(hContact, m_szModuleName, name); }
+ __forceinline int delSetting(const char *name) { return db_unset(NULL, m_szModuleName, name); }
+ __forceinline int delSetting(HANDLE hContact, const char *name) { return db_unset(hContact, m_szModuleName, name); }
__forceinline bool getBool(const char *name, bool defaultValue) { return ProtoGetBool0(this, name, defaultValue); }
__forceinline bool getBool(HANDLE hContact, const char *name, bool defaultValue) { return ProtoGetBool(this, hContact, name, defaultValue); }
diff --git a/protocols/AimOscar/src/utility.cpp b/protocols/AimOscar/src/utility.cpp index 2e4ed835c3..1600e3dc3a 100644 --- a/protocols/AimOscar/src/utility.cpp +++ b/protocols/AimOscar/src/utility.cpp @@ -516,8 +516,7 @@ int CAimProto::deleteBuddyId(HANDLE hContact, int i) {
char item[sizeof(AIM_KEY_BI)+10];
mir_snprintf(item, sizeof(AIM_KEY_BI)+10, AIM_KEY_BI"%d", i);
- delSetting(hContact, item);
- return 0;
+ return delSetting(hContact, item);
}
unsigned short CAimProto::getGroupId(HANDLE hContact, int i)
@@ -538,8 +537,7 @@ int CAimProto::deleteGroupId(HANDLE hContact, int i) {
char item[sizeof(AIM_KEY_GI)+10];
mir_snprintf(item, sizeof(AIM_KEY_GI)+10, AIM_KEY_GI"%d", i);
- delSetting(hContact, item);
- return 0;
+ return delSetting(hContact, item);
}
/////////////////////////////////////////////////////////////////////////////////////////
|