From c7f26f13a101e16ee047932184a3e0b988e7df46 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 9 Aug 2010 16:46:45 +0000 Subject: [PATCH 1/3] Monotone-Parent: 79070131b527d8b1a88014a212b6f2fafc9a1490 Monotone-Revision: 6da486b20dffb8047599fe095aeffd818fb154f7 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-09T16:46:45 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/WebServerResources/generic.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ed7a86d8d..e0529f0e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-08-09 Wolfgang Sourdeau + * UI/WebServerResources/generic.js (log): fixed handling of + messages ending with "\n". + * UI/Common/UIxPageFrame.m (-setUserDefaultsKeys:) (-hasUserDefaultsKeys, -setUserSettingsKeys:) (-hasUserSettingsKeys): new accessor for determining explicitly diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js index 43a20e612..61526c35a 100644 --- a/UI/WebServerResources/generic.js +++ b/UI/WebServerResources/generic.js @@ -769,7 +769,7 @@ function log(message) { return; } if (message[message.length-1] == "\n") { - message = message.substr(0, message.length-2); + message = message.substr(0, message.length-1); } var lines = message.split("\n"); for (var i = 0; i < lines.length; i++) { From fbc36faf174d630c576a5940ae3728b02f15d61f Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 9 Aug 2010 16:47:51 +0000 Subject: [PATCH 2/3] Monotone-Parent: 6da486b20dffb8047599fe095aeffd818fb154f7 Monotone-Revision: cbf125640f6348895aa302fdfc58f2a13c96cc80 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-09T16:47:51 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/WebServerResources/MailerUI.js | 7 ++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0529f0e2..ad42d4bd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-08-09 Wolfgang Sourdeau + * UI/WebServerResources/MailerUI.js (openMailbox): removed the + "updateStatus" parameter, which is never used. + * UI/WebServerResources/generic.js (log): fixed handling of messages ending with "\n". diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index e92ead5ac..643f1089b 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -622,7 +622,7 @@ function composeNewMessage() { } } -function openMailbox(mailbox, reload, updateStatus) { +function openMailbox(mailbox, reload) { if (mailbox != Mailer.currentMailbox || reload) { var url = ApplicationBaseURL + encodeURI(mailbox); var urlParams = new Hash(); @@ -691,9 +691,6 @@ function openMailbox(mailbox, reload, updateStatus) { loadMessage(currentMessage); } } - - if (updateStatus != false) - getStatusFolders(); } } @@ -1672,7 +1669,7 @@ function refreshContacts() { function openInbox(node) { var done = false; - openMailbox(node.parentNode.getAttribute("dataname"), false, false); + openMailbox(node.parentNode.getAttribute("dataname"), false); var tree = $("mailboxTree"); tree.selectedEntry = node; node.selectElement(); From 43ef41eeb70b65cd15b22230c6eeb542ac40e664 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 11 Aug 2010 13:31:59 +0000 Subject: [PATCH 3/3] Monotone-Parent: cbf125640f6348895aa302fdfc58f2a13c96cc80 Monotone-Revision: 9f129d083b11ce7ac964a083c351d2a15f16fbdb Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-11T13:31:59 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ UI/Common/UIxPageFrame.m | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad42d4bd8..8d4fbf086 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-08-11 Wolfgang Sourdeau + + * UI/Common/UIxPageFrame.m (_dictionaryWithKeys:fromSource:): + set an NSNull as value for keys which return no results, in order + to avoid an NSInvalidArgumentException. + 2010-08-09 Wolfgang Sourdeau * UI/WebServerResources/MailerUI.js (openMailbox): removed the diff --git a/UI/Common/UIxPageFrame.m b/UI/Common/UIxPageFrame.m index e7dddc636..9e33be5c9 100644 --- a/UI/Common/UIxPageFrame.m +++ b/UI/Common/UIxPageFrame.m @@ -21,6 +21,7 @@ */ #import +#import #import #import @@ -465,6 +466,10 @@ NSString *key; int count, max; NSMutableDictionary *dict; + NSNull *nsNull; + id value; + + nsNull = [NSNull null]; max = [keys count]; @@ -472,8 +477,10 @@ for (count = 0; count < max; count++) { key = [keys objectAtIndex: count]; - [dict setObject: [source objectForKey: key] - forKey: key]; + value = [source objectForKey: key]; + if (!value) + value = nsNull; + [dict setObject: value forKey: key]; } return [dict jsonRepresentation];