Fixed handling of gb2312 charset
Monotone-Parent: 6b4e2f16b2a1ac3bbbb8f854763b7deb70bd8a46 Monotone-Revision: addfe836292fcae874e765a05ef776bfe841be1d Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-07-29T13:26:14 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
2f2605dfcc
commit
1376d8654a
|
@ -1,14 +1,15 @@
|
||||||
/*
|
/*
|
||||||
|
Copyright (C) 2006-2011 Inverse inc.
|
||||||
Copyright (C) 2004-2005 SKYRIX Software AG
|
Copyright (C) 2004-2005 SKYRIX Software AG
|
||||||
|
|
||||||
This file is part of OpenGroupware.org.
|
This file is part of SOGo.
|
||||||
|
|
||||||
OGo is free software; you can redistribute it and/or modify it under
|
SOGo is free software; you can redistribute it and/or modify it under
|
||||||
the terms of the GNU Lesser General Public License as published by the
|
the terms of the GNU Lesser General Public License as published by the
|
||||||
Free Software Foundation; either version 2, or (at your option) any
|
Free Software Foundation; either version 2, or (at your option) any
|
||||||
later version.
|
later version.
|
||||||
|
|
||||||
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||||
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
||||||
License for more details.
|
License for more details.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* SOGoContactGCSEntry.h - this file is part of SOGo
|
/* SOGoContactGCSEntry.h - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2006 Inverse inc.
|
* Copyright (C) 2006-2011 Inverse inc.
|
||||||
*
|
*
|
||||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
*
|
*
|
||||||
|
@ -29,8 +29,7 @@
|
||||||
|
|
||||||
@class NGVCard;
|
@class NGVCard;
|
||||||
|
|
||||||
@interface SOGoContactGCSEntry
|
@interface SOGoContactGCSEntry : SOGoContentObject <SOGoContactObject>
|
||||||
: SOGoContentObject <SOGoContactObject>
|
|
||||||
{
|
{
|
||||||
NGVCard *card;
|
NGVCard *card;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,24 +1,24 @@
|
||||||
/*
|
/* SOGoContactGCSEntry.h - this file is part of SOGo
|
||||||
Copyright (C) 2004-2005 SKYRIX Software AG
|
*
|
||||||
|
* Copyright (C) 2006-2011 Inverse inc.
|
||||||
This file is part of OpenGroupware.org.
|
*
|
||||||
|
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
OGo is free software; you can redistribute it and/or modify it under
|
*
|
||||||
the terms of the GNU Lesser General Public License as published by the
|
* This file is free software; you can redistribute it and/or modify
|
||||||
Free Software Foundation; either version 2, or (at your option) any
|
* it under the terms of the GNU General Public License as published by
|
||||||
later version.
|
* the Free Software Foundation; either version 2, or (at your option)
|
||||||
|
* any later version.
|
||||||
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
*
|
||||||
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
* This file is distributed in the hope that it will be useful,
|
||||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
License for more details.
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU Lesser General Public
|
*
|
||||||
License along with OGo; see the file COPYING. If not, write to the
|
* You should have received a copy of the GNU General Public License
|
||||||
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
* along with this program; see the file COPYING. If not, write to
|
||||||
02111-1307, USA.
|
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
|
* Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#import <Foundation/NSArray.h>
|
#import <Foundation/NSArray.h>
|
||||||
#import <Foundation/NSString.h>
|
#import <Foundation/NSString.h>
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,15 @@
|
||||||
/*
|
/*
|
||||||
|
Copyright (C) 2006-2011 Inverse inc.
|
||||||
Copyright (C) 2004-2005 SKYRIX Software AG
|
Copyright (C) 2004-2005 SKYRIX Software AG
|
||||||
|
|
||||||
This file is part of OpenGroupware.org.
|
This file is part of SOGo.
|
||||||
|
|
||||||
OGo is free software; you can redistribute it and/or modify it under
|
SOGo is free software; you can redistribute it and/or modify it under
|
||||||
the terms of the GNU Lesser General Public License as published by the
|
the terms of the GNU Lesser General Public License as published by the
|
||||||
Free Software Foundation; either version 2, or (at your option) any
|
Free Software Foundation; either version 2, or (at your option) any
|
||||||
later version.
|
later version.
|
||||||
|
|
||||||
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||||
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
||||||
License for more details.
|
License for more details.
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2006-2009 Inverse inc.
|
Copyright (C) 2006-2011 Inverse inc.
|
||||||
Copyright (C) 2004-2005 SKYRIX Software AG
|
Copyright (C) 2004-2005 SKYRIX Software AG
|
||||||
|
|
||||||
This file is part of OpenGroupware.org.
|
This file is part of SOGo.
|
||||||
|
|
||||||
OGo is free software; you can redistribute it and/or modify it under
|
SOGo is free software; you can redistribute it and/or modify it under
|
||||||
the terms of the GNU Lesser General Public License as published by the
|
the terms of the GNU Lesser General Public License as published by the
|
||||||
Free Software Foundation; either version 2, or (at your option) any
|
Free Software Foundation; either version 2, or (at your option) any
|
||||||
later version.
|
later version.
|
||||||
|
|
||||||
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||||
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
||||||
License for more details.
|
License for more details.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/* SOGoContactLDIFEntry.h - this file is part of SOGo
|
/* SOGoContactLDIFEntry.h - this file is part of SOGo
|
||||||
* Copyright (C) 2006 Inverse inc.
|
* Copyright (C) 2006-2011 Inverse inc.
|
||||||
*
|
*
|
||||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* SOGoContactLDIFEntry.m - this file is part of SOGo
|
/* SOGoContactLDIFEntry.m - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2006-2009 Inverse inc.
|
* Copyright (C) 2006-2011 Inverse inc.
|
||||||
*
|
*
|
||||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
* Ludovic Marcotte <lmarcotte@inverse.ca>
|
* Ludovic Marcotte <lmarcotte@inverse.ca>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* SOGoContactSourceFolder.m - this file is part of SOGo
|
/* SOGoContactSourceFolder.m - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2006-2010 Inverse inc.
|
* Copyright (C) 2006-2011 Inverse inc.
|
||||||
*
|
*
|
||||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
*
|
*
|
||||||
|
@ -297,11 +297,6 @@
|
||||||
return @"Contact";
|
return @"Contact";
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSString *) outlookFolderClass
|
|
||||||
{
|
|
||||||
return @"IPF.Contact";
|
|
||||||
}
|
|
||||||
|
|
||||||
/* sorting */
|
/* sorting */
|
||||||
- (NSComparisonResult) compare: (id) otherFolder
|
- (NSComparisonResult) compare: (id) otherFolder
|
||||||
{
|
{
|
||||||
|
|
|
@ -84,6 +84,7 @@ _xmlCharsetForCharset (NSString *charset)
|
||||||
{ @"windows-1250", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger windows-1250 -> utf8 conversion
|
{ @"windows-1250", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger windows-1250 -> utf8 conversion
|
||||||
{ @"windows-1251", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger windows-1251 -> utf8 conversion
|
{ @"windows-1251", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger windows-1251 -> utf8 conversion
|
||||||
{ @"windows-1257", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger windows-1257 -> utf8 conversion
|
{ @"windows-1257", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger windows-1257 -> utf8 conversion
|
||||||
|
{ @"gb2312", XML_CHAR_ENCODING_ERROR}, // unsupported, will trigger gb2312 -> utf8 conversion
|
||||||
{ @"euc-jp", XML_CHAR_ENCODING_EUC_JP}};
|
{ @"euc-jp", XML_CHAR_ENCODING_EUC_JP}};
|
||||||
unsigned count;
|
unsigned count;
|
||||||
xmlCharEncoding encoding;
|
xmlCharEncoding encoding;
|
||||||
|
|
Loading…
Reference in a new issue