X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fforms%2Fmain%2FfrmMain.cpp;h=f7e2c1fa85426040f0cca258ee8439833c7c5e05;hp=11246aedffd42caff1f6adeed7234f452d064ad3;hb=49789773e2797383c866dca470fb99e80cb49e41;hpb=a191ad71a0d6823b9710067c7cccf8905290dc9c

diff --git a/source/forms/main/frmMain.cpp b/source/forms/main/frmMain.cpp
index 11246ae..f7e2c1f 100644
--- a/source/forms/main/frmMain.cpp
+++ b/source/forms/main/frmMain.cpp
@@ -211,11 +211,11 @@ void frmMain::LoadAccountData(){
 	
 		// Build the path.
 		
-		string calendarListFilename = string(GetUserDir().mb_str());
+		string calendarListFilename = string(GetUserDir().ToUTF8());
 		calendarListFilename += "accounts/";
-		calendarListFilename += string(preferences->accounts.GetAccountDirectory(accountSeek).mb_str());
+		calendarListFilename += string(preferences->accounts.GetAccountDirectory(accountSeek).ToUTF8());
 		calendarListFilename += ".";
-		calendarListFilename += string(preferences->accounts.GetAccountType(accountSeek).mb_str());
+		calendarListFilename += string(preferences->accounts.GetAccountType(accountSeek).ToUTF8());
 		
 		// Get the list of calendars.
 		
@@ -235,7 +235,7 @@ void frmMain::LoadAccountData(){
 			
 			// Set the calendar ID.
 			
-			CDSGetCalendarInfo calendarInfo = calendarData.GetCalendar(string(preferences->accounts.GetAccountName(accountSeek).mb_str()), calendarList.calendarShortName[calendarSeek]);
+			CDSGetCalendarInfo calendarInfo = calendarData.GetCalendar(string(preferences->accounts.GetAccountName(accountSeek).ToUTF8()), calendarList.calendarShortName[calendarSeek]);
 			calendarList.calendarStorageID[calendarSeek] = calendarInfo.calendarID;
 			
 			// Find the entries and load each entry.
@@ -629,7 +629,7 @@ void frmMain::ProcessCalendar( wxCommandEvent& event )
 	accountDirectoryPath += "accounts/";
 	accountDirectoryPath += string(preferences->accounts.GetAccountDirectory(calendarInfo->accountPreferencesID).ToUTF8());
 	accountDirectoryPath += ".";
-	accountDirectoryPath += string(preferences->accounts.GetAccountType(calendarInfo->accountPreferencesID).mb_str());
+	accountDirectoryPath += string(preferences->accounts.GetAccountType(calendarInfo->accountPreferencesID).ToUTF8());
 	accountDirectoryPath += "/";
 	
 	// Generate a UUID for the new calendar.