- direct call of MS_SKIN_ADDNEWSOUND replaced with Skin_AddSound() call;

- obsolete structure SKINSOUNDDESC removed 
- dynamically translated hot keys;
- checked correct LPGEN'ing of the sounds creation;
- code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@500 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 12 insertions, 12 deletions

diff --git a/plugins/Svc_dbepp/exportimport.cpp b/plugins/Svc_dbepp/exportimport.cpp
index 2ac8d04e6e..14faf47198 100644
--- a/plugins/Svc_dbepp/exportimport.cpp
+++ b/plugins/Svc_dbepp/exportimport.cpp
@@ -131,7 +131,7 @@ void exportModule(HANDLE hContact, char* module, FILE* file)
 				{

 					int j;

 					char *data = NULL;

-					if (!(data = (char*)mir_alloc( 3*(dbv.cpbVal+1)*sizeof(char)) ))

+					if (!(data = (char*)mir_alloc( 3*(dbv.cpbVal+1)*sizeof(char))))

 						break;

 					data[0] = '\0';

 					for (j=0; j<dbv.cpbVal; j++)

@@ -479,7 +479,7 @@ void importSettings(HANDLE hContact, char *importstring )
 					hContact = temp;

 			}

 		}

-		else if (importstring[i] == '[' && !strchr(&importstring[i+1],'=') )// get the module

+		else if (importstring[i] == '[' && !strchr(&importstring[i+1],'='))// get the module

 		{

 			if (end = strpbrk(&importstring[i+1], "]")) {

 				if ((end+1) != '\0') *end = '\0';

diff --git a/plugins/Svc_dbepp/main.cpp b/plugins/Svc_dbepp/main.cpp
index 7ec81267a3..0c7eec1a0f 100644
--- a/plugins/Svc_dbepp/main.cpp
+++ b/plugins/Svc_dbepp/main.cpp
@@ -101,7 +101,7 @@ int DBSettingChanged(WPARAM wParam,LPARAM lParam)
 

 	for (i=0; i<WatchListArray.count; i++)

 	{

-		if (WatchListArray.item[i].module && (hContact == WatchListArray.item[i].hContact) )

+		if (WatchListArray.item[i].module && (hContact == WatchListArray.item[i].hContact))

 		{

 			if (!mir_strcmp(cws->szModule, WatchListArray.item[i].module))

 			{

diff --git a/plugins/Svc_dbepp/moduletree.cpp b/plugins/Svc_dbepp/moduletree.cpp
index 231275c5c0..c927851ecc 100644
--- a/plugins/Svc_dbepp/moduletree.cpp
+++ b/plugins/Svc_dbepp/moduletree.cpp
@@ -315,8 +315,8 @@ http://www.codeguru.com/Cpp/controls/treeview/treetraversal/comments.php/c683/?t
 				}

 /* back to coduguru's code*/

 			}

-		} while ( (item.hItem = TreeView_GetChild( hwnd2Tree, lastItem )) );

-	while ( (! (item.hItem = TreeView_GetNextSibling( hwnd2Tree, lastItem ))) && (lastItem = item.hItem = TreeView_GetParent( hwnd2Tree, lastItem )) ) {}

+		} while ( (item.hItem = TreeView_GetChild( hwnd2Tree, lastItem )));

+	while ( (! (item.hItem = TreeView_GetNextSibling( hwnd2Tree, lastItem ))) && (lastItem = item.hItem = TreeView_GetParent( hwnd2Tree, lastItem ))) {}

 

 	} while ( item.hItem );

 /*****************************************************************************/

@@ -358,8 +358,8 @@ http://www.codeguru.com/Cpp/controls/treeview/treetraversal/comments.php/c683/?t
 				}

 /* back to coduguru's code*/

 			}

-		} while ( (item.hItem = TreeView_GetChild( hwnd2Tree, lastItem )) );

-	while ( (! (item.hItem = TreeView_GetNextSibling( hwnd2Tree, lastItem ))) && (lastItem = item.hItem = TreeView_GetParent( hwnd2Tree, lastItem )) ) {}

+		} while ( (item.hItem = TreeView_GetChild( hwnd2Tree, lastItem )));

+	while ( (! (item.hItem = TreeView_GetNextSibling( hwnd2Tree, lastItem ))) && (lastItem = item.hItem = TreeView_GetParent( hwnd2Tree, lastItem ))) {}

 

 	} while ( item.hItem );

 /*****************************************************************************/

@@ -405,8 +405,8 @@ http://www.codeguru.com/Cpp/controls/treeview/treetraversal/comments.php/c683/?t
 				}

 /* back to coduguru's code*/

 			}

-		} while ( (item.hItem = TreeView_GetChild( hwnd2Tree, lastItem )) );

-	while ( (! (item.hItem = TreeView_GetNextSibling( hwnd2Tree, lastItem ))) && (lastItem = item.hItem = TreeView_GetParent( hwnd2Tree, lastItem )) ) {}

+		} while ( (item.hItem = TreeView_GetChild( hwnd2Tree, lastItem )));

+	while ( (! (item.hItem = TreeView_GetNextSibling( hwnd2Tree, lastItem ))) && (lastItem = item.hItem = TreeView_GetParent( hwnd2Tree, lastItem ))) {}

 

 	} while ( item.hItem );

 /*****************************************************************************/

@@ -975,7 +975,7 @@ void moduleListRightClick(HWND hwnd, WPARAM wParam,LPARAM lParam) // hwnd here i
 						if (WatchListArray.item)

 							for (i=0; i<WatchListArray.count; i++)

 							{

-								if (WatchListArray.item[i].module && (hContact == WatchListArray.item[i].hContact) )

+								if (WatchListArray.item[i].module && (hContact == WatchListArray.item[i].hContact))

 								{

 									if (!mir_strcmp(module, WatchListArray.item[i].module) && !WatchListArray.item[i].setting)

 									{

diff --git a/plugins/Svc_dbepp/settinglist.cpp b/plugins/Svc_dbepp/settinglist.cpp
index ab2f5652e0..5fff4fed21 100644
--- a/plugins/Svc_dbepp/settinglist.cpp
+++ b/plugins/Svc_dbepp/settinglist.cpp
@@ -126,7 +126,7 @@ void additem(HWND hwnd2Settings,HANDLE hContact, char* module, char* setting, in
 			case DBVT_BLOB:

 			{

 				int j;

-				if (!(data = (char*)mir_realloc(data, 3*(dbv.cpbVal+1)+10) ))

+				if (!(data = (char*)mir_realloc(data, 3*(dbv.cpbVal+1)+10)))

 					{msg(Translate("Couldnt allocate enough memory!"), modFullname); return;}

 				data[0] = '\0';

 				for (j=0; j<dbv.cpbVal; j++)

@@ -1026,7 +1026,7 @@ void SettingsListRightClick(HWND hwnd, WPARAM wParam,LPARAM lParam) // hwnd here
 		// check if the setting is being watched and if it is then check the menu item

 		for (i=0; i<WatchListArray.count; i++)

 		{

-			if (WatchListArray.item[i].module && (hContact == WatchListArray.item[i].hContact) )

+			if (WatchListArray.item[i].module && (hContact == WatchListArray.item[i].hContact))

 			{

 				if (WatchListArray.item[i].WatchModule == WATCH_MODULE) continue;