Monotone-Parent: bc5b13a95fc1868b4361ef33d8fde7ec4ea09c75
Monotone-Revision: 7e7946ac70e135f3e208b210455b3238dd36d951 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-30T19:49:04 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
83c5a044ac
commit
629cf8ec10
|
@ -1,3 +1,10 @@
|
||||||
|
2010-08-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* Tools/SOGoToolRemoveDoubles.m, UI/MailerUI/UIxMailFormatter.m:
|
||||||
|
adapted classes to use "NSInteger" and "NSUInteger" instead of
|
||||||
|
"int" and "unsigned int" for compatibility with versions of
|
||||||
|
GNUstep base >= 1.20.
|
||||||
|
|
||||||
2010-08-27 Francis Lachapelle <flachapelle@inverse.ca>
|
2010-08-27 Francis Lachapelle <flachapelle@inverse.ca>
|
||||||
|
|
||||||
* UI/WebServerResources/SchedulerUI.js (newBaseEventDIV): now adds
|
* UI/WebServerResources/SchedulerUI.js (newBaseEventDIV): now adds
|
||||||
|
|
|
@ -189,7 +189,13 @@
|
||||||
NSString *tableName, *quickTableName, *currentRecordName;
|
NSString *tableName, *quickTableName, *currentRecordName;
|
||||||
NSEnumerator *recordsEnum;
|
NSEnumerator *recordsEnum;
|
||||||
|
|
||||||
fprintf (stderr, "Removing %d records...\n", [recordNames count]);
|
fprintf (stderr,
|
||||||
|
#if GS_64BIT_OLD
|
||||||
|
"Removing %d records...\n",
|
||||||
|
#else
|
||||||
|
"Removing %ld records...\n",
|
||||||
|
#endif
|
||||||
|
[recordNames count]);
|
||||||
|
|
||||||
channel = [folder acquireStoreChannel];
|
channel = [folder acquireStoreChannel];
|
||||||
context = [channel adaptorContext];
|
context = [channel adaptorContext];
|
||||||
|
@ -469,11 +475,21 @@
|
||||||
if ([recordsToRemove count])
|
if ([recordsToRemove count])
|
||||||
{
|
{
|
||||||
[self removeRecords: recordsToRemove fromFolder: folder];
|
[self removeRecords: recordsToRemove fromFolder: folder];
|
||||||
fprintf (stderr, "Removed %d records from %d.\n",
|
fprintf (stderr,
|
||||||
|
#if GS_64BIT_OLD
|
||||||
|
"Removed %d records from %d.\n",
|
||||||
|
#else
|
||||||
|
"Removed %ld records from %ld.\n",
|
||||||
|
#endif
|
||||||
[recordsToRemove count], [records count]);
|
[recordsToRemove count], [records count]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
fprintf (stderr, "No record to remove. %d records kept.\n",
|
fprintf (stderr,
|
||||||
|
#if GS_64BIT_OLD
|
||||||
|
"No record to remove. %d records kept.\n",
|
||||||
|
#else
|
||||||
|
"No record to remove. %ld records kept.\n",
|
||||||
|
#endif
|
||||||
[records count]);
|
[records count]);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -106,7 +106,11 @@ static BOOL debugOn = YES;
|
||||||
char buf[32];
|
char buf[32];
|
||||||
|
|
||||||
if (_p == NULL) _p = "";
|
if (_p == NULL) _p = "";
|
||||||
|
#if GS_64BIT_OLD
|
||||||
sprintf(buf, "%s%02i:%02i", _p, [_d hourOfDay], [_d minuteOfHour]);
|
sprintf(buf, "%s%02i:%02i", _p, [_d hourOfDay], [_d minuteOfHour]);
|
||||||
|
#else
|
||||||
|
sprintf(buf, "%s%02li:%02li", _p, [_d hourOfDay], [_d minuteOfHour]);
|
||||||
|
#endif
|
||||||
return [StrClass stringWithCString:buf];
|
return [StrClass stringWithCString:buf];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -138,10 +142,15 @@ static BOOL debugOn = YES;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 26.08.2004 13:24 */
|
#if GS_64BIT_OLD
|
||||||
sprintf(buf, "%02d.%02d.%04d %02d:%02d",
|
sprintf(buf, "%02d.%02d.%04d %02d:%02d",
|
||||||
[_date dayOfMonth], [_date monthOfYear], [_date yearOfCommonEra],
|
[_date dayOfMonth], [_date monthOfYear], [_date yearOfCommonEra],
|
||||||
[_date hourOfDay], [_date minuteOfHour]);
|
[_date hourOfDay], [_date minuteOfHour]);
|
||||||
|
#else
|
||||||
|
sprintf(buf, "%02ld.%02ld.%04ld %02ld:%02ld",
|
||||||
|
[_date dayOfMonth], [_date monthOfYear], [_date yearOfCommonEra],
|
||||||
|
[_date hourOfDay], [_date minuteOfHour]);
|
||||||
|
#endif
|
||||||
return [StrClass stringWithCString:buf];
|
return [StrClass stringWithCString:buf];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue