popup code cleaning (cause we have no tchar.h)

3 files changed, 13 insertions, 13 deletions

diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp
index 9d068cf908..515383f672 100755
--- a/plugins/Alarms/src/alarmlist.cpp
+++ b/plugins/Alarms/src/alarmlist.cpp
@@ -611,19 +611,19 @@ static LRESULT CALLBACK PopupAlarmDlgProc(HWND hWnd, UINT message, WPARAM wParam
 

 void ShowPopup(ALARM *alarm)

 {

-	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {

+	if (ServiceExists(MS_POPUP_ADDPOPUPW)) {

 		ALARM *data = new ALARM;

 		memset(data, 0, sizeof(ALARM));

 		copy_alarm_data(data, alarm);

 

-		POPUPDATAT ppd = { 0 };

+		POPUPDATAW ppd = { 0 };

 		ppd.lchIcon = hIconMenuSet;

-		mir_wstrncpy(ppd.lptzContactName, data->szTitle, MAX_CONTACTNAME);

-		mir_wstrncpy(ppd.lptzText, data->szDesc, MAX_SECONDLINE);

+		mir_wstrncpy(ppd.lpwzContactName, data->szTitle, MAX_CONTACTNAME);

+		mir_wstrncpy(ppd.lpwzText, data->szDesc, MAX_SECONDLINE);

 		ppd.PluginWindowProc = PopupAlarmDlgProc;

 		ppd.PluginData = data;

 		ppd.iSeconds = -1;

-		PUAddPopupT(&ppd);

+		PUAddPopupW(&ppd);

 	}

 }

 

@@ -658,7 +658,7 @@ void DoAlarm(ALARM *alarm)
 		}

 

 		if (alarm->action & AAF_POPUP) {

-			if (options.use_popup_module && ServiceExists(MS_POPUP_ADDPOPUPT))

+			if (options.use_popup_module && ServiceExists(MS_POPUP_ADDPOPUPW))

 				ShowPopup(alarm);

 			else {

 				HWND hwndDlg = CreateDialog(g_plugin.getInst(), MAKEINTRESOURCE(IDD_ALARM), GetDesktopWindow(), DlgProcAlarm);

diff --git a/plugins/Alarms/src/alarms.cpp b/plugins/Alarms/src/alarms.cpp
index 50505dff78..d75f9688c4 100644
--- a/plugins/Alarms/src/alarms.cpp
+++ b/plugins/Alarms/src/alarms.cpp
@@ -60,14 +60,14 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 

 void ShowPopup(MCONTACT hContact, const wchar_t *msg)

 {

-	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {

+	if (ServiceExists(MS_POPUP_ADDPOPUPW)) {

 		wchar_t *lpzContactName = Clist_GetContactDisplayName(hContact);

 

-		POPUPDATAT ppd = { 0 };

+		POPUPDATAW ppd = { 0 };

 		ppd.lchContact = hContact; //Be sure to use a GOOD handle, since this will not be checked.

 		ppd.lchIcon = hIconList1;

-		mir_wstrncpy(ppd.lptzContactName, lpzContactName, MAX_CONTACTNAME);

-		mir_wstrncpy(ppd.lptzText, msg, MAX_SECONDLINE);

+		mir_wstrncpy(ppd.lpwzContactName, lpzContactName, MAX_CONTACTNAME);

+		mir_wstrncpy(ppd.lpwzText, msg, MAX_SECONDLINE);

 		ppd.colorBack = GetSysColor(COLOR_BTNFACE);

 		ppd.colorText = RGB(0, 0, 0);

 		ppd.PluginWindowProc = PopupDlgProc;

@@ -75,7 +75,7 @@ void ShowPopup(MCONTACT hContact, const wchar_t *msg)
 		ppd.iSeconds = 3;

 

 		// Now that every field has been filled, we want to see the popup.

-		PUAddPopupT(&ppd);

+		PUAddPopupW(&ppd);

 	}

 }

 

diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp
index bf75d40ced..387275294a 100755
--- a/plugins/Alarms/src/options.cpp
+++ b/plugins/Alarms/src/options.cpp
@@ -941,7 +941,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				EnableWindow(GetDlgItem(hwndDlg, IDC_DEL), FALSE);

 			}

 

-			if (ServiceExists(MS_POPUP_ADDPOPUPT)) {

+			if (ServiceExists(MS_POPUP_ADDPOPUPW)) {

 				CheckDlgButton(hwndDlg, IDC_CHK_POPUPS, temp_options.use_popup_module ? BST_CHECKED : BST_UNCHECKED);

 				if (options.use_popup_module)

 					bChecked = FALSE;

@@ -1179,7 +1179,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			int reminder_period = GetDlgItemInt(hwndDlg, IDC_ED_PERIOD, &translated, FALSE);

 			if (translated) temp_options.reminder_period = reminder_period;

 

-			if (!ServiceExists(MS_POPUP_ADDPOPUPT) || !options.use_popup_module)

+			if (!ServiceExists(MS_POPUP_ADDPOPUPW) || !options.use_popup_module)

 				temp_options.loop_sound = IsDlgButtonChecked(hwndDlg, IDC_CHK_LOOPSOUND) ? true : false;

 

 			options = temp_options;