added newlines

removed warnings
fix for icons and options error

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@185 4f64403b-2f21-0410-a795-97e2b3489a10

1 files changed, 10 insertions, 10 deletions

diff --git a/ping_protocol/options.cpp b/ping_protocol/options.cpp
index 50e1061..101be95 100644
--- a/ping_protocol/options.cpp
+++ b/ping_protocol/options.cpp
@@ -8,7 +8,7 @@ static BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 {

 	HWND hw;

 	OPENFILENAME ofn = {0};

-	char *strptr;

+	//char *strptr;

 

 	switch ( msg ) {

 	case WM_INITDIALOG: {

@@ -25,7 +25,7 @@ static BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		CheckDlgButton(hwndDlg, IDC_CHK_USESTATUSMSG, options.use_status_msg);

 		hw = GetDlgItem(hwndDlg, IDC_TSTATUS);

 		EnableWindow(hw, options.no_test_status? FALSE : TRUE);

-

+		/*

 		for(int i = ID_STATUS_OFFLINE; i != ID_STATUS_OUTTOLUNCH; i++) {

 			strptr = (char *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)i, (LPARAM)0);

 			hw = GetDlgItem(hwndDlg, IDC_RSTATUS);

@@ -45,7 +45,7 @@ static BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		SendMessage(hw, CB_SETCURSEL, (WPARAM)(options.tstatus - ID_STATUS_OFFLINE), 0);

 		hw = GetDlgItem(hwndDlg, IDC_DSTATUS);

 		SendMessage(hw, CB_SETCURSEL, (WPARAM)(options.off_status - ID_STATUS_OFFLINE), 0);

-

+		*/

 		SetDlgItemInt(hwndDlg, IDC_RPT, options.retries, FALSE);

 

 		SetDlgItemText(hwndDlg, IDC_ED_FILENAME, options.log_filename);

@@ -129,8 +129,8 @@ static BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		break;

 

 	case WM_NOTIFY:

-		if (((LPNMHDR)lParam)->code == PSN_APPLY ) {

-

+		if (((LPNMHDR)lParam)->code == (unsigned)PSN_APPLY ) {

+			/*

 			{

 				int sel1, sel2, sel3, sel4;

 

@@ -158,7 +158,7 @@ static BOOL CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				if(sel3 != -1)

 					options.tstatus = ID_STATUS_OFFLINE + sel3;

 			}			

-			

+			*/

 			BOOL trans_success;

 

 			DWORD new_ping_period = GetDlgItemInt( hwndDlg, IDC_PPM, &trans_success, FALSE);

@@ -227,7 +227,7 @@ BOOL CALLBACK DlgProcDestEdit(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 			DBVARIANT dbv;

 			if(!DBGetContactSetting(0, PROTO, "DefaultPingGroup", &dbv))

 				selgroup = true;

-			int gi = 1, selind = -1, selind_defgroup;

+			int gi = 1, selind = -1, selind_defgroup = -1;

 			do {

 				strptr = (char *)CallService(MS_CLIST_GROUPGETNAME2, (WPARAM)gi, 0);

 				if(strptr) {

@@ -357,7 +357,6 @@ BOOL CALLBACK DlgProcDestEdit(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 // ping destinations list window

 static BOOL CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	OPENFILENAME ofn = {0};

 	HWND hw;

 	int sel;

 

@@ -372,7 +371,8 @@ static BOOL CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 			hw = GetDlgItem(hwndDlg, IDC_LST_DEST);

 			for(PINGLIST::iterator i = temp_list.begin(); i != temp_list.end(); i++) {

-				int index = SendMessage(hw, LB_INSERTSTRING, (WPARAM)-1, (LPARAM)i->pszLabel);

+				//int index = 

+					SendMessage(hw, LB_INSERTSTRING, (WPARAM)-1, (LPARAM)i->pszLabel);

 			}

 

 		}

@@ -544,7 +544,7 @@ static BOOL CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		break;

 

 	case WM_NOTIFY:

-		if (((LPNMHDR)lParam)->code == PSN_APPLY ) {

+		if (((LPNMHDR)lParam)->code == (unsigned)PSN_APPLY ) {

 			CallService(PROTO "/SetAndSavePingList", (WPARAM)&temp_list, 0);

 			CallService(PROTO "/GetPingList", 0, (LPARAM)&temp_list);

 			// the following will be affected due to list rebuild event