From c992cb2fdc11f1cac4bc5cbce26e8e2bb3b57da0 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 26 Jun 2012 16:50:14 +0000
Subject: - microkernel addded; - version bumped to 0.92.2

git-svn-id: http://svn.miranda-ng.org/main/trunk@641 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Svc_dbepp/dbeditorpp_10.vcxproj.filters |  3 --
 plugins/Svc_dbepp/exportimport.cpp              | 13 -------
 plugins/Svc_dbepp/headers.h                     |  3 --
 plugins/Svc_dbepp/watchedvars.cpp               | 47 ++++---------------------
 4 files changed, 7 insertions(+), 59 deletions(-)

(limited to 'plugins/Svc_dbepp')

diff --git a/plugins/Svc_dbepp/dbeditorpp_10.vcxproj.filters b/plugins/Svc_dbepp/dbeditorpp_10.vcxproj.filters
index 7b41fd05dd..f0f8d79957 100644
--- a/plugins/Svc_dbepp/dbeditorpp_10.vcxproj.filters
+++ b/plugins/Svc_dbepp/dbeditorpp_10.vcxproj.filters
@@ -36,9 +36,6 @@
     <ClCompile Include="modules.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="threads.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="modsettingenum.cpp">
       <Filter>Source Files\ModSetting Enuming</Filter>
     </ClCompile>
diff --git a/plugins/Svc_dbepp/exportimport.cpp b/plugins/Svc_dbepp/exportimport.cpp
index 14faf47198..ad9f508a21 100644
--- a/plugins/Svc_dbepp/exportimport.cpp
+++ b/plugins/Svc_dbepp/exportimport.cpp
@@ -365,19 +365,6 @@ HANDLE CheckNewContact(char *myProto, char *uid, char *myName)
 
 }
 
-TCHAR* __stdcall rtrim(TCHAR *string)
-{
-   TCHAR* p = string + _tcslen(string) - 1;
-
-   while (p >= string) {
-		if (*p != ' ' && *p != '\t' && *p != '\n' && *p != '\r')
-         break;
-
-		*p-- = 0;
-   }
-   return string;
-}
-
 HANDLE Clist_GroupExists(WCHAR *tszGroup)
 {
 	unsigned int i = 0;
diff --git a/plugins/Svc_dbepp/headers.h b/plugins/Svc_dbepp/headers.h
index 57663f56e1..e90738306b 100644
--- a/plugins/Svc_dbepp/headers.h
+++ b/plugins/Svc_dbepp/headers.h
@@ -211,9 +211,6 @@ void __cdecl PopulateModuleTreeThreadFunc(LPVOID di);
 void freeTree(HWND hwnd2Tree, HANDLE hContact);
 int findItemInTree(HWND hwnd2Tree, HANDLE hContact, char* module);
 
-// threads.c
-unsigned long forkthread (   void (__cdecl *threadcode)(void*),unsigned long stacksize,void *arg) ;
-
 // settinglist.c
 void setupSettingsList(HWND hwnd2List);
 void saveListSettings(HWND hwnd2List);
diff --git a/plugins/Svc_dbepp/watchedvars.cpp b/plugins/Svc_dbepp/watchedvars.cpp
index 083a23b4b2..b7d2cf6b73 100644
--- a/plugins/Svc_dbepp/watchedvars.cpp
+++ b/plugins/Svc_dbepp/watchedvars.cpp
@@ -204,15 +204,8 @@ INT_PTR CALLBACK WatchDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			ListView_InsertColumn(GetDlgItem(hwnd, IDC_VARS),4,&sLC);
 
 			PopulateWatchedWindow(GetDlgItem(hwnd, IDC_VARS));
-/*			if (DBGetContactSettingByte("NULL", modname, "LoadWatchesOnStartup",0))
-			{
-				MENUITEMINFO mmi;
-				mmi.cbSize = sizeof(MENUITEMINFO);
-				mmi.fMask = MIIM_STATE;
-				mmi.fState = MFS_CHECKED;
-				SetMenuItemInfo(GetMenu(hwnd), MENU_LOADAUTOMATCIALLY, FALSE, &mmi);
-			}
-*/			TranslateMenu(GetMenu(hwnd));
+
+			TranslateMenu(GetMenu(hwnd));
 			TranslateMenu(GetSubMenu(GetMenu(hwnd),0));
 			TranslateDialogDefault(hwnd);
 			// do the icon
@@ -247,43 +240,17 @@ INT_PTR CALLBACK WatchDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				case MENU_REMALL_WATCHES:
 					freeAllWatches();
 					ListView_DeleteAllItems(GetDlgItem(hwnd, IDC_VARS));
-				break;
+					break;
 				case MENU_EXIT:
 				case IDCANCEL:
 					hwnd2watchedVarsWindow = 0;
 					DestroyWindow(hwnd);
-				break;
+					break;
 				case MENU_REFRESH:
 					PopulateWatchedWindow(GetDlgItem(hwnd, IDC_VARS));
-				break;
-			/*	case MENU_LOADAUTOMATCIALLY:
-				{
-					MENUITEMINFO mmi;
-					mmi.cbSize = sizeof(MENUITEMINFO);
-					mmi.fMask = MIIM_STATE;
-					GetMenuItemInfo(GetSubMenu(GetMenu(hwnd),2), MENU_LOADAUTOMATCIALLY, FALSE, &mmi);
-					if (mmi.fState == MFS_CHECKED)
-					{
-						mmi.fState = MFS_UNCHECKED;
-						DBWriteContactSettingByte(NULL,modname, "LoadWatchesOnStartup", 0);
-						SetMenuItemInfo(GetSubMenu(GetMenu(hwnd),2), MENU_LOADAUTOMATCIALLY, FALSE, &mmi);
-					}
-					else if (mmi.fState == MFS_UNCHECKED)
-					{
-						mmi.fState = MFS_CHECKED;
-						DBWriteContactSettingByte(NULL,modname, "LoadWatchesOnStartup", 1);
-						SetMenuItemInfo(GetSubMenu(GetMenu(hwnd),2), MENU_LOADAUTOMATCIALLY, FALSE, &mmi);
-					}
-				}
-				break;
-				case MENU_SAVE_WATCHES:
-					saveWatchedList();
-				break;
-				case MENU_LOAD_WATCHES:
-					loadWatchedList();
-				break;
-		*/	}
-		break;
+			}
+			break;
+
 		case WM_NOTIFY:
 			switch(LOWORD(wParam))
 			{
-- 
cgit v1.2.3