summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-04-06 14:34:37 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-04-06 14:34:37 +0000
commitb3df7242d18b269b0a651d6bc1812d6cff093d2f (patch)
treea7843f937a2e1d2749d1df096f642f178b5bca64
parentd5d19d668d027a766ee62363e1b9c9fb4965e568 (diff)
fix for expanding contacts' tree in Dbeditor in the service mode
git-svn-id: http://svn.miranda-ng.org/main/trunk@4331 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/DbEditorPP/src/exportimport.cpp1
-rw-r--r--plugins/DbEditorPP/src/moduletree.cpp4
2 files changed, 2 insertions, 3 deletions
diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp
index 4c978e28f2..84f0c188dd 100644
--- a/plugins/DbEditorPP/src/exportimport.cpp
+++ b/plugins/DbEditorPP/src/exportimport.cpp
@@ -337,7 +337,6 @@ HANDLE CheckNewContact(char *myProto, char *uid, char *myName)
while (hContact)
{
- //szProto = GetContactProto(hContact);
if (DBGetContactSettingStringStatic(hContact, "Protocol", "p", szProto, 256))
{
if (!mir_strcmp(szProto, myProto))
diff --git a/plugins/DbEditorPP/src/moduletree.cpp b/plugins/DbEditorPP/src/moduletree.cpp
index 4c6d4a0e47..f1e4f348c7 100644
--- a/plugins/DbEditorPP/src/moduletree.cpp
+++ b/plugins/DbEditorPP/src/moduletree.cpp
@@ -27,8 +27,8 @@ int doContacts(HWND hwnd2Tree,HTREEITEM contactsRoot,ModuleSettingLL *modlist, H
tvi.item.cChildren = 1;
while (hContact && hwnd2mainWindow) { // break after null contact
- char *szProto = GetContactProto(hContact);
- if (szProto) {
+ char szProto[100];
+ if (DBGetContactSettingStringStatic(hContact, "Protocol", "p", szProto, SIZEOF(szProto))) {
icon = GetProtoIcon(szProto);
loaded = (icon != DEF_ICON);
}