1 |
diff -ur Frameworks/AddressView/ADImageView.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/AddressView/ADImageView.m |
2 |
--- Frameworks/AddressView/ADImageView.m 2007-03-30 00:36:04.000000000 +0200 |
3 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/AddressView/ADImageView.m 2008-11-19 05:31:48.000000000 +0100 |
4 |
@@ -35,6 +35,7 @@ |
5 |
- (void) dealloc |
6 |
{ |
7 |
[_person release]; |
8 |
+ [super dealloc]; |
9 |
} |
10 |
|
11 |
- (void) setTarget: (id) target |
12 |
diff -ur Frameworks/AddressView/ADPersonPropertyView.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/AddressView/ADPersonPropertyView.m |
13 |
--- Frameworks/AddressView/ADPersonPropertyView.m 2007-07-19 19:25:20.000000000 +0200 |
14 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/AddressView/ADPersonPropertyView.m 2008-11-19 05:31:48.000000000 +0100 |
15 |
@@ -276,6 +276,7 @@ |
16 |
[_delegate release]; |
17 |
[_addImg release]; |
18 |
[_chgImg release]; |
19 |
+ [super dealloc]; |
20 |
} |
21 |
|
22 |
- (void) setDelegate: (id) delegate |
23 |
diff -ur Frameworks/AddressView/ADPersonView.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/AddressView/ADPersonView.m |
24 |
--- Frameworks/AddressView/ADPersonView.m 2007-03-30 00:36:04.000000000 +0200 |
25 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/AddressView/ADPersonView.m 2008-11-19 05:31:48.000000000 +0100 |
26 |
@@ -106,6 +106,7 @@ |
27 |
[_person release]; |
28 |
|
29 |
[[NSNotificationCenter defaultCenter] removeObserver: self]; |
30 |
+ [super dealloc]; |
31 |
} |
32 |
|
33 |
- (BOOL) isFlipped |
34 |
@@ -211,6 +212,7 @@ |
35 |
ADEmailProperty, |
36 |
ADAddressProperty, |
37 |
ADAIMInstantProperty, |
38 |
+ ADJabberInstantProperty, |
39 |
nil]; |
40 |
|
41 |
if(_person) |
42 |
diff -ur Frameworks/AddressView/ADSinglePropertyView.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/AddressView/ADSinglePropertyView.m |
43 |
--- Frameworks/AddressView/ADSinglePropertyView.m 2007-03-30 00:36:04.000000000 +0200 |
44 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/AddressView/ADSinglePropertyView.m 2008-11-19 05:31:48.000000000 +0100 |
45 |
@@ -257,6 +257,7 @@ |
46 |
- (void) dealloc |
47 |
{ |
48 |
[[NSNotificationCenter defaultCenter] removeObserver: self]; |
49 |
+ [super dealloc]; |
50 |
} |
51 |
|
52 |
- (void) setDisplayedProperty: (NSString*) property |
53 |
diff -ur Frameworks/AddressView/GNUmakefile Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/AddressView/GNUmakefile |
54 |
--- Frameworks/AddressView/GNUmakefile 2007-05-02 23:01:37.000000000 +0200 |
55 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/AddressView/GNUmakefile 2008-11-19 05:31:48.000000000 +0100 |
56 |
@@ -1,7 +1,10 @@ |
57 |
+debug=yes |
58 |
include $(GNUSTEP_MAKEFILES)/common.make |
59 |
|
60 |
FRAMEWORK_NAME=AddressView |
61 |
|
62 |
+AddressView_VERSION=$(ETOILE_ADDRESSBOOK_VERSION) |
63 |
+ |
64 |
AddressView_OBJC_FILES=\ |
65 |
ADPersonView.m \ |
66 |
ADImageView.m \ |
67 |
@@ -32,5 +35,10 @@ |
68 |
|
69 |
-include GNUmakefile.preamble |
70 |
-include GNUmakefile.local |
71 |
+# NOTE: Include etoile.make include before framework.make otherwise the |
72 |
+# compilation may fail if you type 'make; make' (see bug #8806). |
73 |
+include $(GNUSTEP_MAKEFILES)/aggregate.make |
74 |
+-include ../../../../etoile.make |
75 |
include $(GNUSTEP_MAKEFILES)/framework.make |
76 |
-include GNUmakefile.postamble |
77 |
+ |
78 |
diff -ur Frameworks/AddressView/Labels.dict Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/AddressView/Labels.dict |
79 |
--- Frameworks/AddressView/Labels.dict 2007-03-30 00:36:04.000000000 +0200 |
80 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/AddressView/Labels.dict 2008-11-19 05:31:48.000000000 +0100 |
81 |
@@ -1,5 +1,6 @@ |
82 |
{ |
83 |
Email = (WorkEmail, HomeEmail); |
84 |
+ URLs = (HomePage); |
85 |
Address = (WorkAddr, HomeAddr); |
86 |
Phone = (MainPhone, WorkPhone, HomePhone, MobilePhone, HomeFax, |
87 |
WorkFax, Pager); |
88 |
@@ -9,4 +10,4 @@ |
89 |
Yahoo = (WorkYahoo, HomeYahoo); |
90 |
ICQ = (WorkICQ, HomeICQ); |
91 |
Default = (Work, Home, Other); |
92 |
-} |
93 |
\ No newline at end of file |
94 |
+} |
95 |
diff -ur Frameworks/Addresses/ADAddressBook.h Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADAddressBook.h |
96 |
--- Frameworks/Addresses/ADAddressBook.h 2007-03-30 00:36:04.000000000 +0200 |
97 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADAddressBook.h 2008-11-19 05:31:49.000000000 +0100 |
98 |
@@ -44,6 +44,11 @@ |
99 |
- (NSArray*) people; |
100 |
- (NSArray*) groups; |
101 |
@end |
102 |
+@interface ADAddressBook(ImageDataFile) |
103 |
+- (BOOL) setImageDataForPerson: (ADPerson*) person |
104 |
+ withFile: (NSString*) filename; |
105 |
+- (NSString*) imageDataFileForPerson: (ADPerson*) person; |
106 |
+@end |
107 |
|
108 |
@interface ADAddressBook(GroupAccess) |
109 |
- (NSArray*) membersForGroup: (ADGroup*) group; |
110 |
diff -ur Frameworks/Addresses/ADAddressBook.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADAddressBook.m |
111 |
--- Frameworks/Addresses/ADAddressBook.m 2007-03-30 00:36:04.000000000 +0200 |
112 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADAddressBook.m 2008-11-19 05:31:49.000000000 +0100 |
113 |
@@ -185,3 +185,14 @@ |
114 |
@"Class", nil]; |
115 |
} |
116 |
@end |
117 |
+@implementation ADAddressBook(ImageDataFile) |
118 |
+- (BOOL) setImageDataForPerson: (ADPerson*) person |
119 |
+ withFile: (NSString*) filename |
120 |
+{ |
121 |
+ return NO; |
122 |
+} |
123 |
+- (NSString*) imageDataFileForPerson: (ADPerson*) person |
124 |
+{ |
125 |
+ return nil; |
126 |
+} |
127 |
+@end |
128 |
diff -ur Frameworks/Addresses/ADEnvelopeAddressBook.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADEnvelopeAddressBook.m |
129 |
--- Frameworks/Addresses/ADEnvelopeAddressBook.m 2007-03-30 00:36:04.000000000 +0200 |
130 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADEnvelopeAddressBook.m 2008-11-19 05:31:49.000000000 +0100 |
131 |
@@ -133,6 +133,7 @@ |
132 |
- (void) dealloc |
133 |
{ |
134 |
[_books release]; |
135 |
+ [super dealloc]; |
136 |
} |
137 |
|
138 |
- (BOOL) addAddressBook: (ADAddressBook*) book |
139 |
diff -ur Frameworks/Addresses/ADGlobals.h Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADGlobals.h |
140 |
--- Frameworks/Addresses/ADGlobals.h 2007-03-30 00:36:04.000000000 +0200 |
141 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADGlobals.h 2008-11-19 05:31:49.000000000 +0100 |
142 |
@@ -44,6 +44,8 @@ |
143 |
extern NSString * const ADOrganizationProperty; // string |
144 |
extern NSString * const ADJobTitleProperty; // string |
145 |
extern NSString * const ADHomePageProperty; // string |
146 |
+extern NSString * const ADURLsProperty; // string |
147 |
+extern NSString * const ADHomePageLabel; // string |
148 |
|
149 |
extern NSString * const ADEmailProperty; // multi-string |
150 |
extern NSString * const ADEmailWorkLabel; |
151 |
diff -ur Frameworks/Addresses/ADGlobals.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADGlobals.m |
152 |
--- Frameworks/Addresses/ADGlobals.m 2007-03-30 00:36:04.000000000 +0200 |
153 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADGlobals.m 2008-11-19 05:31:49.000000000 +0100 |
154 |
@@ -32,6 +32,8 @@ |
155 |
NSString* const ADOrganizationProperty = @"Organization"; |
156 |
NSString* const ADJobTitleProperty = @"JobTitle"; |
157 |
NSString* const ADHomePageProperty = @"HomePage"; |
158 |
+NSString* const ADURLsProperty = @"URLs"; |
159 |
+NSString* const ADHomePageLabel = @"HomePage"; |
160 |
NSString* const ADEmailProperty = @"Email"; |
161 |
NSString* const ADEmailWorkLabel = @"WorkEmail"; |
162 |
NSString* const ADEmailHomeLabel = @"HomeEmail"; |
163 |
@@ -147,6 +149,8 @@ |
164 |
ADOrganizationProperty, @"ADOrganizationProperty", |
165 |
ADJobTitleProperty, @"ADJobTitleProperty", |
166 |
ADHomePageProperty, @"ADHomePageProperty", |
167 |
+ ADURLsProperty, @"ADURLsProperty", |
168 |
+ ADHomePageLabel, @"ADHomePageLabel", |
169 |
|
170 |
ADEmailProperty, @"ADEmailProperty", |
171 |
ADEmailWorkLabel, @"ADEmailWorkLabel", |
172 |
diff -ur Frameworks/Addresses/ADLocalAddressBook.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADLocalAddressBook.m |
173 |
--- Frameworks/Addresses/ADLocalAddressBook.m 2007-03-30 00:36:04.000000000 +0200 |
174 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADLocalAddressBook.m 2008-11-19 05:31:49.000000000 +0100 |
175 |
@@ -389,6 +389,7 @@ |
176 |
[_unsaved release]; |
177 |
[[NSNotificationCenter defaultCenter] removeObserver: self]; |
178 |
[[NSDistributedNotificationCenter defaultCenter] removeObserver: self]; |
179 |
+ [super dealloc]; |
180 |
} |
181 |
|
182 |
- (NSString*) location |
183 |
diff -ur Frameworks/Addresses/ADMultiValue.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADMultiValue.m |
184 |
--- Frameworks/Addresses/ADMultiValue.m 2007-03-30 00:36:04.000000000 +0200 |
185 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADMultiValue.m 2008-11-19 05:31:49.000000000 +0100 |
186 |
@@ -15,7 +15,7 @@ |
187 |
/* my includes */ |
188 |
#include "ADMultiValue.h" |
189 |
|
190 |
-#define IS_A(obj,cls) [obj isKindOf: [cls class]] |
191 |
+#define IS_A(obj,cls) [obj isKindOfClass: [cls class]] |
192 |
|
193 |
static ADPropertyType _propTypeFromDict(NSDictionary *dict) |
194 |
{ |
195 |
@@ -64,6 +63,7 @@ |
196 |
{ |
197 |
[_arr release]; |
198 |
[_primaryId release]; |
199 |
+ [super dealloc]; |
200 |
} |
201 |
|
202 |
- (NSArray*) contentArray |
203 |
diff -ur Frameworks/Addresses/ADPListConverter.h Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADPListConverter.h |
204 |
--- Frameworks/Addresses/ADPListConverter.h 2007-03-30 00:36:04.000000000 +0200 |
205 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADPListConverter.h 2008-11-19 05:31:49.000000000 +0100 |
206 |
@@ -21,7 +21,7 @@ |
207 |
@interface ADPListConverter: NSObject<ADInputConverting> |
208 |
{ |
209 |
BOOL _done; |
210 |
- id _plist; |
211 |
+ NSObject *_plist; |
212 |
} |
213 |
- initForInput; |
214 |
- (BOOL) useString: (NSString*) str; |
215 |
diff -ur Frameworks/Addresses/ADPListConverter.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADPListConverter.m |
216 |
--- Frameworks/Addresses/ADPListConverter.m 2007-03-30 00:36:04.000000000 +0200 |
217 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADPListConverter.m 2008-11-19 05:31:49.000000000 +0100 |
218 |
@@ -29,7 +29,7 @@ |
219 |
- (BOOL) useString: (NSString*) str |
220 |
{ |
221 |
_plist = [str propertyList]; |
222 |
- if(![_plist isKindOf: [NSDictionary class]]) |
223 |
+ if(![_plist isKindOfClass: [NSDictionary class]]) |
224 |
{ |
225 |
NSLog(@"String (%@) does not contain valid property list!\n", str); |
226 |
return NO; |
227 |
@@ -44,10 +44,10 @@ |
228 |
ADRecord *r; |
229 |
NSEnumerator *e; |
230 |
|
231 |
- keys = [NSMutableArray arrayWithArray: [_plist allKeys]]; |
232 |
- if([[_plist objectForKey: @"Type"] isEqualToString: @"Group"]) |
233 |
+ keys = [NSMutableArray arrayWithArray: [(NSDictionary *)_plist allKeys]]; |
234 |
+ if([[(NSDictionary *)_plist objectForKey: @"Type"] isEqualToString: @"Group"]) |
235 |
{ |
236 |
- NSArray *members = [_plist objectForKey: @"Members"]; |
237 |
+ NSArray *members = [(NSDictionary *)_plist objectForKey: @"Members"]; |
238 |
r = [[[ADGroup alloc] init] autorelease]; |
239 |
if(members) |
240 |
{ |
241 |
@@ -66,7 +66,7 @@ |
242 |
id val; |
243 |
ADPropertyType t; |
244 |
|
245 |
- val = [_plist objectForKey: key]; |
246 |
+ val = [(NSDictionary *)_plist objectForKey: key]; |
247 |
t = [ADPerson typeOfProperty: key]; |
248 |
if(t & ADMultiValueMask) |
249 |
{ |
250 |
diff -ur Frameworks/Addresses/ADPerson.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADPerson.m |
251 |
--- Frameworks/Addresses/ADPerson.m 2007-03-30 00:36:04.000000000 +0200 |
252 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADPerson.m 2008-11-19 05:31:49.000000000 +0100 |
253 |
@@ -44,6 +44,7 @@ |
254 |
N(ADStringProperty), ADJobTitleProperty, |
255 |
N(ADStringProperty), ADHomePageProperty, |
256 |
N(ADMultiStringProperty), ADEmailProperty, |
257 |
+ N(ADMultiStringProperty), ADURLsProperty, |
258 |
N(ADMultiDictionaryProperty), ADAddressProperty, |
259 |
N(ADMultiStringProperty), ADPhoneProperty, |
260 |
|
261 |
diff -ur Frameworks/Addresses/ADPlugin.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADPlugin.m |
262 |
--- Frameworks/Addresses/ADPlugin.m 2007-03-30 00:36:04.000000000 +0200 |
263 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADPlugin.m 2008-11-19 05:31:49.000000000 +0100 |
264 |
@@ -27,6 +27,7 @@ |
265 |
- (void) dealloc |
266 |
{ |
267 |
[abClassPlugins release]; |
268 |
+ [super dealloc]; |
269 |
} |
270 |
|
271 |
+ (ADPluginManager*) sharedPluginManager |
272 |
diff -ur Frameworks/Addresses/ADRecord.h Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADRecord.h |
273 |
--- Frameworks/Addresses/ADRecord.h 2007-03-30 00:36:04.000000000 +0200 |
274 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADRecord.h 2008-11-19 05:31:49.000000000 +0100 |
275 |
@@ -40,7 +40,7 @@ |
276 |
\note This is a non-Apple extension; Apple's API doesn't need it as |
277 |
it knows nothing about multiple address books. |
278 |
*/ |
279 |
-- (id) addressBook; |
280 |
+- (ADAddressBook *) addressBook; |
281 |
|
282 |
/*! |
283 |
\brief Set the address book this record is part of. |
284 |
@@ -52,7 +52,7 @@ |
285 |
\note This is a non-Apple extension; Apple's API doesn't need it as |
286 |
it knows nothing about multiple address books. |
287 |
*/ |
288 |
-- (void) setAddressBook: (id) book; |
289 |
+- (void) setAddressBook: (ADAddressBook *) book; |
290 |
@end |
291 |
|
292 |
@interface ADRecord(Convenience) |
293 |
diff -ur Frameworks/Addresses/ADRecord.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADRecord.m |
294 |
--- Frameworks/Addresses/ADRecord.m 2007-03-30 00:36:04.000000000 +0200 |
295 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADRecord.m 2008-11-19 05:31:49.000000000 +0100 |
296 |
@@ -131,7 +131,7 @@ |
297 |
|
298 |
- (id) copyWithZone: (NSZone*) z |
299 |
{ |
300 |
- ADRecord* obj = NSCopyObject(self, 0, z); |
301 |
+ ADRecord* obj = (ADRecord *)NSCopyObject(self, 0, z); |
302 |
obj->_readOnly = _readOnly; |
303 |
|
304 |
// delete UID if it has one |
305 |
diff -ur Frameworks/Addresses/ADSearchElement.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADSearchElement.m |
306 |
--- Frameworks/Addresses/ADSearchElement.m 2007-03-30 00:36:04.000000000 +0200 |
307 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADSearchElement.m 2008-11-19 05:31:49.000000000 +0100 |
308 |
@@ -51,6 +51,7 @@ |
309 |
- (void) dealloc |
310 |
{ |
311 |
[_children release]; |
312 |
+ [super dealloc]; |
313 |
} |
314 |
|
315 |
- (BOOL) matchesRecord: (ADRecord*) record |
316 |
@@ -102,6 +103,7 @@ |
317 |
- (void) dealloc |
318 |
{ |
319 |
[_property release]; [_label release]; [_key release]; [_val release]; |
320 |
+ [super dealloc]; |
321 |
} |
322 |
|
323 |
- (BOOL) matchesValue: (id) v |
324 |
diff -ur Frameworks/Addresses/ADVCFConverter.m Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADVCFConverter.m |
325 |
--- Frameworks/Addresses/ADVCFConverter.m 2007-07-20 01:01:14.000000000 +0200 |
326 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/ADVCFConverter.m 2008-11-19 05:31:49.000000000 +0100 |
327 |
@@ -146,10 +146,10 @@ |
328 |
const unsigned char *cstr; |
329 |
NSMutableString *str; |
330 |
|
331 |
- cstr = [self UTF8String]; |
332 |
+ cstr = (unsigned char *)[self UTF8String]; |
333 |
|
334 |
- str = [NSMutableString stringWithCapacity: strlen(cstr)]; |
335 |
- for(i=0; i<strlen(cstr); i++) |
336 |
+ str = [NSMutableString stringWithCapacity: strlen((char*)cstr)]; |
337 |
+ for(i=0; i<strlen((char*)cstr); i++) |
338 |
{ |
339 |
if(cstr[i] == ' ') |
340 |
[str appendString: @"=20"]; |
341 |
@@ -293,6 +293,7 @@ |
342 |
{ |
343 |
[_str release]; |
344 |
[_out release]; |
345 |
+ [super dealloc]; |
346 |
} |
347 |
|
348 |
- initForInput |
349 |
@@ -398,10 +399,10 @@ |
350 |
while((prop = [e nextObject])) |
351 |
{ |
352 |
val = [record valueForProperty: prop]; |
353 |
- name = [name stringByAppendingFormat: @"%@;", val ? val : @""]; |
354 |
+ name = [name stringByAppendingFormat: @"%@;", val ? (id)val :(id)@""]; |
355 |
} |
356 |
val = [record valueForProperty: ADSuffixProperty]; |
357 |
- name = [name stringByAppendingFormat: @"%@", val ? val : @""]; |
358 |
+ name = [name stringByAppendingFormat: @"%@", val ? (id)val : (id)@""]; |
359 |
[self appendStringWithHeader: @"N" value: name]; |
360 |
|
361 |
e = [[[record class] properties] objectEnumerator]; |
362 |
diff -ur Frameworks/Addresses/AddressBook.h Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/AddressBook.h |
363 |
--- Frameworks/Addresses/AddressBook.h 2007-03-30 00:36:04.000000000 +0200 |
364 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/AddressBook.h 2008-11-19 05:31:49.000000000 +0100 |
365 |
@@ -81,6 +81,8 @@ |
366 |
#define kABOrganizationProperty ADOrganizationProperty |
367 |
#define kABJobTitleProperty ADJobTitleProperty |
368 |
#define kABHomePageProperty ADHomePageProperty |
369 |
+#define kABHomePageLabel ADHomePageLabel |
370 |
+#define kABURLsProperty ADURLsProperty |
371 |
#define kABEmailProperty ADEmailProperty |
372 |
#define kABEmailWorkLabel ADEmailWorkLabel |
373 |
#define kABEmailHomeLabel ADEmailHomeLabel |
374 |
diff -ur Frameworks/Addresses/GNUmakefile Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/GNUmakefile |
375 |
--- Frameworks/Addresses/GNUmakefile 2007-05-02 23:03:07.000000000 +0200 |
376 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/Frameworks/Addresses/GNUmakefile 2008-11-19 05:31:49.000000000 +0100 |
377 |
@@ -1,7 +1,10 @@ |
378 |
+debug=yes |
379 |
include $(GNUSTEP_MAKEFILES)/common.make |
380 |
|
381 |
FRAMEWORK_NAME=Addresses |
382 |
|
383 |
+Addresses_VERSION=$(ETOILE_ADDRESSBOOK_VERSION) |
384 |
+ |
385 |
Addresses_OBJC_FILES= \ |
386 |
ADAddressBook.m \ |
387 |
ADConverter.m \ |
388 |
@@ -44,9 +47,17 @@ |
389 |
|
390 |
-include GNUmakefile.preamble |
391 |
-include GNUmakefile.local |
392 |
+# NOTE: Include etoile.make include before framework.make otherwise the |
393 |
+# compilation may fail if you type 'make; make' (see bug #8806). |
394 |
+-include ../../../../etoile.make |
395 |
include $(GNUSTEP_MAKEFILES)/framework.make |
396 |
-include GNUmakefile.postamble |
397 |
|
398 |
+ifeq ($(etoile), yes) |
399 |
+after-Addresses-all:: |
400 |
+ ln -sf $(PROJECT_DIR) $(BUILD_DIR)/AddressBook |
401 |
+endif |
402 |
+ |
403 |
after-Addresses-install:: |
404 |
ln -sf $(GNUSTEP_HEADERS)/Addresses \ |
405 |
$(GNUSTEP_HEADERS)/AddressBook |
406 |
diff -ur NEWS Etoile-0.4.0/Frameworks/AddressesKit/NEWS |
407 |
--- NEWS 2007-07-20 01:01:14.000000000 +0200 |
408 |
+++ Etoile-0.4.0/Frameworks/AddressesKit/NEWS 2008-11-19 05:31:49.000000000 +0100 |
409 |
@@ -1,12 +1,28 @@ |
410 |
-Current version is 0.4.7. |
411 |
+Current version is 0.4.7 (Etoile). Latest official GAP version is 0.4.7.1, see |
412 |
+http://cvs.savannah.gnu.org/viewvc/gap/system-apps/Addresses/?root=gap |
413 |
+ |
414 |
+Since 0.4.7 (Etoile 0.4): |
415 |
+========================= |
416 |
+ |
417 |
+ o Sync with GAP version 0.4.7 on 2007-07-26 |
418 |
+ o New constants ADURLsProperty, ADHomePageProperty and ADHomePageLabel |
419 |
+ introduced by Leopard |
420 |
+ o Small memory management fix |
421 |
+ o Fixed all compilation warnings |
422 |
|
423 |
Since 0.4.7: |
424 |
============ |
425 |
|
426 |
o Updated Makefiles to GNUstep Make 2.0 |
427 |
o Fixed text editing to work with current GNUstep gui |
428 |
- o Improved import of VCF files: tries to interpret HEX and |
429 |
- the escape \, from Apple cards |
430 |
+ o Improved import of VCF files: tries to interpret HEX (by Guenther |
431 |
+ Noack) and the escape \, from Apple cards |
432 |
+ |
433 |
+Since 0.4.6.1 (Etoile 0.2): |
434 |
+=========================== |
435 |
+ |
436 |
+ o First Etoile fork release |
437 |
+ o Added ADJabberInstantProperty to ADPersonView |
438 |
|
439 |
Since 0.4.6: |
440 |
============ |