ObjXMPP  Check-in [57587da1f3]

Overview
Comment:Don't import old roster if we got a complete roster by the server.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 57587da1f39daf603ff154f4bbf6a4bcac0d289e1b7033ac13e0ace8356fe978
User & Date: js on 2012-02-06 15:53:45
Other Links: manifest | tags
Context
2012-02-17
17:17
Having a category for each delegate is not required anymore. check-in: 878cac8ce0 user: js tags: trunk
2012-02-06
15:53
Don't import old roster if we got a complete roster by the server. check-in: 57587da1f3 user: js tags: trunk
15:33
Fix a few bugs in roster versioning. check-in: 15caf24f36 user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/XMPPRoster.m from [247e0e304c] to [441232c83a].

︙︙
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320

	OFEnumerator *enumerator;
	OFXMLElement *element;
	XMPPRosterItem *rosterItem;

	rosterElement = [iq elementForName: @"query"
				 namespace: XMPP_NS_ROSTER];

	if ([connection supportsRosterVersioning]) {
		OFDictionary *items = [dataStorage
		    dictionaryForPath: @"roster.items"];
		OFEnumerator *enumerator = [items objectEnumerator];
		OFDictionary *item;

		while ((item = [enumerator nextObject]) != nil) {
			rosterItem = [XMPPRosterItem rosterItem];








|








306
307
308
309
310
311
312
313
314
315
316
317
318
319
320

	OFEnumerator *enumerator;
	OFXMLElement *element;
	XMPPRosterItem *rosterItem;

	rosterElement = [iq elementForName: @"query"
				 namespace: XMPP_NS_ROSTER];

	if ([connection supportsRosterVersioning] && rosterElement == nil) {
		OFDictionary *items = [dataStorage
		    dictionaryForPath: @"roster.items"];
		OFEnumerator *enumerator = [items objectEnumerator];
		OFDictionary *item;

		while ((item = [enumerator nextObject]) != nil) {
			rosterItem = [XMPPRosterItem rosterItem];
︙︙