amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-19 05:33:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #119 from Zentyal/jjgarcia/merge-from-upstream

Browse Source 
Merge from upstream version 2.2.17a
This commit is contained in:
Julio García
2015-04-15 16:05:37 +02:00
parent 35f81318d6 f0a3fdae5b
commit ca7c4c026e
74 changed files with 2586 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tools/SOGoTool.h
+1 -3
View File
@@ -1,8 +1,6 @@
/* SOGoTool.h - this file is part of SOGo
*
* Copyright (C) 2009-2011 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Copyright (C) 2009-2015 Inverse inc.
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Tools/SOGoTool.m
+1 -3
View File
@@ -1,8 +1,6 @@
/* SOGoTool.m - this file is part of SOGo
*
* Copyright (C) 2009-2011 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Copyright (C) 2009-2015 Inverse inc.
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Tools/SOGoToolUserPreferences.m
+1 -1
View File
@@ -254,7 +254,7 @@ typedef enum
//
// to achieve what we want.
//
if (o && [o count] == 1)
if (o && [o isKindOfClass: [NSDictionary class]] && [o count] == 1)
{
[source setObject: [[o allValues] lastObject] forKey: key];
}