X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fobjects%2Fcalendarlist%2FCalendarList.cpp;h=403270cd0a3e109e25fe3e35d89248ab7548753f;hp=98fe763d4960bc4429f462d970501071972e283e;hb=49789773e2797383c866dca470fb99e80cb49e41;hpb=cba151c4b833a26c63984769f921bab5e755decd

diff --git a/source/objects/calendarlist/CalendarList.cpp b/source/objects/calendarlist/CalendarList.cpp
index 98fe763..403270c 100644
--- a/source/objects/calendarlist/CalendarList.cpp
+++ b/source/objects/calendarlist/CalendarList.cpp
@@ -26,7 +26,7 @@ XCAccountCalendarList::XCAccountCalendarList(string calendarListFilename){
 	
 	wxString calendarListFilenameFull;
 	
-	calendarListFilenameFull.Append(calendarListFilename);
+	calendarListFilenameFull.Append(wxString(calendarListFilename.c_str(), wxConvUTF8));
 	calendarListFilenameFull.Append(wxT("/calendarlist.db"));
 
 	wxFileConfig *calendarListFile = new wxFileConfig("", "", calendarListFilenameFull);
@@ -46,13 +46,13 @@ XCAccountCalendarList::XCAccountCalendarList(string calendarListFilename){
 		
 		calendarListFile->SetPath(accountName);
 
-		calendarShortName.push_back(string(accountName.mb_str()));
+		calendarShortName.push_back(string(accountName.ToUTF8()));
 		
 		calendarListFile->Read(wxT("name"), &valueData);
-		calendarName.push_back(string(valueData.mb_str()));
+		calendarName.push_back(string(valueData.ToUTF8()));
 
 		calendarListFile->Read(wxT("description"), &valueData);
-		calendarDescription.push_back(string(valueData.mb_str()));
+		calendarDescription.push_back(string(valueData.ToUTF8()));
 
 		calendarListFile->Read(wxT("colour"), &valueData);
 		colourData = string(valueData.mb_str());