From 25ec54ea27a7099f33573b260a620ed7273176fe Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 30 Jun 2013 12:16:44 +0000 Subject: - db_set_blob used everywhere for writing blobs - DBCONTACTWRITESETTING left only in the event handlers git-svn-id: http://svn.miranda-ng.org/main/trunk@5191 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MetaContacts/src/meta_services.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/MetaContacts/src/meta_services.cpp') diff --git a/plugins/MetaContacts/src/meta_services.cpp b/plugins/MetaContacts/src/meta_services.cpp index 349227c4da..79f40b5ca2 100755 --- a/plugins/MetaContacts/src/meta_services.cpp +++ b/plugins/MetaContacts/src/meta_services.cpp @@ -618,7 +618,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) Meta_IsEnabled() && db_get_b((HANDLE)wParam, META_PROTO, "Hidden", 0) == 0 && !Miranda_Terminated()) { if ((dcws->value.type == DBVT_ASCIIZ || dcws->value.type == DBVT_UTF8) && !Meta_IsHiddenGroup(dcws->value.pszVal)) { // subcontact group reassigned - copy to saved group - MyDBWriteContactSetting((HANDLE)wParam, META_PROTO, "OldCListGroup", &dcws->value); + db_set((HANDLE)wParam, META_PROTO, "OldCListGroup", &dcws->value); db_set_s((HANDLE)wParam, "CList", "Group", META_HIDDEN_GROUP); } else if (dcws->value.type == DBVT_DELETED) { db_unset((HANDLE)wParam, META_PROTO, "OldCListGroup"); @@ -655,18 +655,18 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) } } else if ( !strcmp(dcws->szSetting, "Nick") && !dcws->value.type == DBVT_DELETED) { - DBVARIANT dbv; HANDLE most_online; // subcontact nick has changed - update metacontact strcpy(buffer, "Nick"); strcat(buffer, _itoa(contact_number, szId, 10)); - MyDBWriteContactSetting(hMeta, META_PROTO, buffer, &dcws->value); + db_set(hMeta, META_PROTO, buffer, &dcws->value); + DBVARIANT dbv; if (Mydb_get((HANDLE)wParam, "CList", "MyHandle", &dbv)) { strcpy(buffer, "CListName"); strcat(buffer, _itoa(contact_number, szId, 10)); - MyDBWriteContactSetting(hMeta, META_PROTO, buffer, &dcws->value); + db_set(hMeta, META_PROTO, buffer, &dcws->value); } else db_free(&dbv); @@ -692,13 +692,13 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) HANDLE most_online; if (dcws->value.type == DBVT_DELETED) { - DBVARIANT dbv; - char *proto = GetContactProto((HANDLE)wParam); strcpy(buffer, "CListName"); strcat(buffer, _itoa(contact_number, szId, 10)); + + DBVARIANT dbv; if (proto && !Mydb_get((HANDLE)wParam, proto, "Nick", &dbv)) { - MyDBWriteContactSetting(hMeta, META_PROTO, buffer, &dbv); + db_set(hMeta, META_PROTO, buffer, &dbv); db_free(&dbv); } else { db_unset(hMeta, META_PROTO, buffer); @@ -708,7 +708,7 @@ int Meta_SettingChanged(WPARAM wParam, LPARAM lParam) strcpy(buffer, "CListName"); strcat(buffer, _itoa(contact_number, szId, 10)); - MyDBWriteContactSetting(hMeta, META_PROTO, buffer, &dcws->value); + db_set(hMeta, META_PROTO, buffer, &dcws->value); } // copy nick to metacontact, if it's the most online -- cgit v1.2.3