Fixing bug 170351, adding in UTF-8 support for pref stored strings (from AJB)

calendar/resources/content/calendar.js

@@ -915,3 +915,25 @@ function getBoolPref (prefObj, prefName, defaultValue)
        return defaultValue;
     }
 }
+
+function GetUnicharPref(prefObj, prefName, defaultValue)
+{
+    try {
+      return prefObj.getComplexValue(prefName, Components.interfaces.nsISupportsString).data;
+    }
+    catch(e)
+    {
+        return defaultValue;
+    }
+}
+
+function SetUnicharPref(aPrefObj, aPrefName, aPrefValue)
+{
+    try {
+      var str = Components.classes["@mozilla.org/supports-string;1"]
+                          .createInstance(Components.interfaces.nsISupportsString);
+      str.data = aPrefValue;
+      aPrefObj.setComplexValue(aPrefName, Components.interfaces.nsISupportsString, str);
+    }
+    catch(e) {}
+}

calendar/resources/content/calendarEventDialog.js

@@ -237,7 +237,7 @@ function loadCalendarEventDialog()
    
    /* Categories stuff */
    // Load categories
-   var categoriesString = opener.getCharPref(opener.gCalendarWindow.calendarPreferences.calendarPref, "categories.names", getDefaultCategories() );
+   var categoriesString = opener.GetUnicharPref(opener.gCalendarWindow.calendarPreferences.calendarPref, "categories.names", getDefaultCategories() );
    
    var categoriesList = categoriesString.split( "," );
    

calendar/resources/content/eventDialog.js

@@ -237,7 +237,7 @@ function loadCalendarEventDialog()
    
    /* Categories stuff */
    // Load categories
-   var categoriesString = opener.getCharPref(opener.gCalendarWindow.calendarPreferences.calendarPref, "categories.names", getDefaultCategories() );
+   var categoriesString = opener.GetUnicharPref(opener.gCalendarWindow.calendarPreferences.calendarPref, "categories.names", getDefaultCategories() );
    
    var categoriesList = categoriesString.split( "," );