amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-23 04:15:26 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 26b5f40103235f325bd04edf2ca9fe43ad924990

Browse Source 
Monotone-Revision: 859fadbbfd184b571c9fd10283255e4f5471f95a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-12-14T15:07:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-12-14 15:07:06 +00:00
parent 9595a07c82
commit 01aa8e299c
4 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+13 -2
View File
@@ -1,13 +1,24 @@
2009-12-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Tools/SOGoToolRemoveDoubles.m (-processFolder:ofUser:withFoM:):
same as below.
* Tools/SOGoToolCheckDoubles.m (-processIndexResults:withFoM:):
same as below.
* SoObjects/Mailer/NSString+Mail.m
(-stringByConvertingCRLNToHTML): invokde [NSString UTF8String]
rather than cStringUsingEncoding: NSUTF8StringEncoding, since the
latter provokes a crash that the former doesn't.
* UI/Common/UIxPageFrame.m (_stringsForFramework:): use the system
default when the active user does not resolve.
2009-12-11 Ludovic Marcotte <lmarcotte@inverse.ca>
* Added a patch from Albrecht Gebhardt <albrecht.gebhardt@algepop.net>
that offers a "Reload" button in the Web contacts
management module.
that offers a "Reload" button in the Web contacts management
module.
2009-12-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
SoObjects/Mailer/NSString+Mail.m
+6 -5
View File
@@ -379,7 +379,8 @@ convertChars (const char *oldString, unsigned int oldLength,
if (length + paddingBuffer > maxLength - 6)
{
maxLength += paddingBuffer;
reallocated = NSZoneRealloc (NULL, newString, maxLength + 1);
reallocated = NSZoneRealloc (NULL, newString,
maxLength + 1);
if (reallocated)
{
newString = reallocated;
@@ -408,13 +409,13 @@ convertChars (const char *oldString, unsigned int oldLength,
- (NSString *) stringByConvertingCRLNToHTML
{
NSString *convertedString;
const char *utf8String;
char *newString;
unsigned int newLength;
newString
= convertChars ([self cStringUsingEncoding: NSUTF8StringEncoding],
[self lengthOfBytesUsingEncoding: NSUTF8StringEncoding],
&newLength);
utf8String = [self UTF8String];
newString = convertChars (utf8String, strlen (utf8String),
&newLength);
convertedString = [[NSString alloc] initWithBytes: newString
length: newLength
encoding: NSUTF8StringEncoding];
Tools/SOGoToolCheckDoubles.m
+6 -11
View File
@@ -92,20 +92,15 @@
{
recordsCount = [currentFolder recordsCountByExcludingDeleted: YES];
if (recordsCount > warningLimit)
{
fprintf (stderr, "'%s' (id: '%s'), of '%s': %u entries\n",
[[folderRow objectForKey: @"c_foldername"]
cStringUsingEncoding: NSUTF8StringEncoding],
[[currentFolder folderName]
cStringUsingEncoding: NSUTF8StringEncoding],
[[folderRow objectForKey: @"c_path2"]
cStringUsingEncoding: NSUTF8StringEncoding],
recordsCount);
}
fprintf (stderr, "'%s' (id: '%s'), of '%s': %u entries\n",
[[folderRow objectForKey: @"c_foldername"] UTF8String],
[[currentFolder folderName] UTF8String],
[[folderRow objectForKey: @"c_path2"] UTF8String],
recordsCount);
}
else
fprintf (stderr, "folder at path '%s' could not be opened\n",
[folderPath cStringUsingEncoding: NSUTF8StringEncoding]);
[folderPath UTF8String]);
}
}
Tools/SOGoToolRemoveDoubles.m
+1 -2
View File
@@ -498,8 +498,7 @@
else
{
fprintf (stderr, "Folder '%s' of user '%s' not found.\n",
[folderId cStringUsingEncoding: NSUTF8StringEncoding],
[username cStringUsingEncoding: NSUTF8StringEncoding]);
[folderId UTF8String], [username UTF8String]);
rc = NO;
}