summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorniko <niko>2009-02-23 16:41:13 (GMT)
committerniko <niko>2009-02-23 16:41:13 (GMT)
commitef905228b4259ec0006d219aa873b8086265b4b6 (patch)
tree002136bb96212d617cecfb365af2f9801a78fa51
parent8058aa977b31728837692734f6ae6fbe236a18d2 (diff)
downloadsynckolab-ef905228b4259ec0006d219aa873b8086265b4b6.tar.gz
fix encoding
-rw-r--r--src/chrome/content/synckolab/synckolab.js2
-rw-r--r--src/chrome/content/synckolab/tools.js11
-rw-r--r--www/index.html1
3 files changed, 9 insertions, 5 deletions
diff --git a/src/chrome/content/synckolab/synckolab.js b/src/chrome/content/synckolab/synckolab.js
index 91f9e4e..aa179f8 100644
--- a/src/chrome/content/synckolab/synckolab.js
+++ b/src/chrome/content/synckolab/synckolab.js
@@ -140,7 +140,7 @@ function syncKolab(event) {
gWnd = window.open("chrome://synckolab/content/progressWindow.xul", "bmarks", "chrome,width=350,height=350,resizable=1");
try {
- var pref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
+ var pref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
gCloseWnd = pref.getBoolPref("SyncKolab.closeWindow");
try {
diff --git a/src/chrome/content/synckolab/tools.js b/src/chrome/content/synckolab/tools.js
index d7c2aaf..11cb40f 100644
--- a/src/chrome/content/synckolab/tools.js
+++ b/src/chrome/content/synckolab/tools.js
@@ -49,7 +49,7 @@ function checkExist (value)
*/
function accountNameFix (name)
{
- return name.replace(/[ :@\%\'\"-\?\#\+\*\.$\\\/]/g, "");
+ return name.replace(/[ :@\%\'\"-\?\#\+\*\.\$\\\/]/g, "");
}
/**
@@ -716,7 +716,8 @@ function getAccountName (accountKey)
for (var i = 0; i < accountManager.allServers.Count(); i++)
{
var account = accountManager.allServers.GetElementAt(i).QueryInterface(Components.interfaces.nsIMsgIncomingServer);
- if (account.rootMsgFolder.baseMessageURI == accountKey || accountNameFix(account.rootMsgFolder.baseMessageURI) == accountKey)
+ if (account.rootMsgFolder.baseMessageURI == accountKey || accountNameFix(account.rootMsgFolder.baseMessageURI) == accountKey ||
+ accountNameFix(account.prettyName) == accountKey)
{
return accountManager.getFirstIdentityForServer (account).fullName;
}
@@ -735,7 +736,8 @@ function getAccountEMail (accountKey)
for (var i = 0; i < accountManager.allServers.Count(); i++)
{
var account = accountManager.allServers.GetElementAt(i).QueryInterface(Components.interfaces.nsIMsgIncomingServer);
- if (account.rootMsgFolder.baseMessageURI == accountKey || accountNameFix(account.rootMsgFolder.baseMessageURI) == accountKey)
+ if (account.rootMsgFolder.baseMessageURI == accountKey || accountNameFix(account.rootMsgFolder.baseMessageURI) == accountKey ||
+ accountNameFix(account.prettyName) == accountKey)
{
return accountManager.getFirstIdentityForServer (account).email;
}
@@ -758,7 +760,8 @@ function getMsgFolder (accountKey, path)
for (var i = 0; i < accountManager.allServers.Count(); i++)
{
var account = accountManager.allServers.GetElementAt(i).QueryInterface(Components.interfaces.nsIMsgIncomingServer);
- if (account.rootMsgFolder.baseMessageURI == accountKey || accountNameFix(account.rootMsgFolder.baseMessageURI) == accountKey)
+ if (account.rootMsgFolder.baseMessageURI == accountKey || accountNameFix(account.rootMsgFolder.baseMessageURI) == accountKey||
+ accountNameFix(account.prettyName) == accountKey)
{
gInc = account;
}
diff --git a/www/index.html b/www/index.html
index ad164cb..0afc392 100644
--- a/www/index.html
+++ b/www/index.html
@@ -100,6 +100,7 @@ So create a backup of your thunderbird profile folder before trying it out!
* fixed a problem that sometimes prevented multipart messages from being parsed as xml correctly
* base64 errors fixed (if the =NUM was in the text it was accidently used as base64)
* added option to specify debug level (default:warning - set to DEBUG if you got a problem)
+* changed settings to use prettyName instead of BaseMessageURI (NOT YET VERIFIED) - use
</pre>
<h2>Status of the Kolab Extension</h2>
<b>Synckolab is a stable beta successfully syncing contacts, calendar entries, tasks and not yet fully functional support for mailing list</b><br/>