ObjXMPP  Check-in [3ea23c8afd]

Overview
Comment:Adjust to ObjFW changes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 3ea23c8afdca384bd2ae2e5fc59fc06861af6ba888ff1510f1779d12f77580a7
User & Date: js on 2018-01-21 22:48:25
Other Links: manifest | tags
Context
2018-11-04
22:07
Adjust to ObjFW changes check-in: 960467b47f user: js tags: trunk
2018-01-21
22:48
Adjust to ObjFW changes check-in: 3ea23c8afd user: js tags: trunk
22:46
Remove Xcode project check-in: bf3524b981 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/XMPPConnection.m from [6278646a4f] to [d487bb0c33].

︙
368
369
370
371
372
373
374
375


376
377
378
379
380
381
382

368
369
370
371
372
373
374

375
376
377
378
379
380
381
382
383








-
+
+








{
	char *buffer = [self allocMemoryWithSize: BUFFER_LENGTH];

	[_socket asyncReadIntoBuffer: buffer
			      length: BUFFER_LENGTH
			      target: self
			    selector: @selector(stream:didReadIntoBuffer:length:
					  exception:)];
					  exception:)
			     context: nil];
}

- (void)asyncConnectAndHandle
{
	void *pool = objc_autoreleasePoolPush();

	[[[[XMPPConnection_ConnectThread alloc]
︙
456
457
458
459
460
461
462
463


464
465
466
467
468
469
470

457
458
459
460
461
462
463

464
465
466
467
468
469
470
471
472








-
+
+








		_oldElementBuilder = nil;

		[_socket asyncReadIntoBuffer: buffer
				      length: BUFFER_LENGTH
				      target: self
				    selector: @selector(stream:
						  didReadIntoBuffer:length:
						  exception:)];
						  exception:)
				     context: nil];

		return false;
	}

	return true;
}
︙

Modified src/XMPPDiscoIdentity.m from [52a90e08e0] to [7825267e7d].

︙
125
126
127
128
129
130
131
132

133
134
135
136
137
138
139

125
126
127
128
129
130
131

132
133
134
135
136
137
138
139








-
+








	XMPPDiscoIdentity *identity;
	of_comparison_result_t categoryResult;
	of_comparison_result_t typeResult;

	if (object == self)
		return OF_ORDERED_SAME;

	if (![object isKindOfClass: [XMPPDiscoIdentity class]])
	if (![(id)object isKindOfClass: [XMPPDiscoIdentity class]])
		@throw [OFInvalidArgumentException exception];

	identity = (XMPPDiscoIdentity *)object;

	categoryResult = [_category compare: identity->_category];
	if (categoryResult != OF_ORDERED_SAME)
		return categoryResult;
︙

Modified src/XMPPPresence.m from [defd4ee1a6] to [1dc363089f].

︙
214
215
216
217
218
219
220
221

222
223
224
225
226
227
228

214
215
216
217
218
219
220

221
222
223
224
225
226
227
228








-
+








	OFNumber *otherPriority;
	OFString *otherShow;
	of_comparison_result_t priorityOrder;

	if (object == self)
		return OF_ORDERED_SAME;

	if (![object isKindOfClass: [XMPPPresence class]])
	if (![(id)object isKindOfClass: [XMPPPresence class]])
		@throw [OFInvalidArgumentException exception];

	otherPresence = (XMPPPresence *)object;
	otherPriority = [otherPresence priority];
	if (otherPriority == nil)
		otherPriority = [OFNumber numberWithInt8: 0];
︙