ObjXMPP  Diff

Differences From Artifact [5bede0ee0a]:

To Artifact [16fe7db118]:


43
44
45
46
47
48
49
50

51
52
53
54
55
56
57
58
59
43
44
45
46
47
48
49

50


51
52
53
54
55
56
57







-
+
-
-







	      type: (OFString*)type
	      name: (OFString*)name
{
	self = [super init];

	@try {
		if (category == nil || type == nil)
			@throw [OFInvalidArgumentException
			@throw [OFInvalidArgumentException exception];
			    exceptionWithClass: [self class]
				      selector: _cmd];

		_category = [category copy];
		_name = [name copy];
		_type = [type copy];
	} @catch (id e) {
		[self release];
		@throw e;
147
148
149
150
151
152
153
154

155
156
157
158
159
160
161
162
163
145
146
147
148
149
150
151

152


153
154
155
156
157
158
159







-
+
-
-







	of_comparison_result_t categoryResult;
	of_comparison_result_t typeResult;

	if (object == self)
		return OF_ORDERED_SAME;

	if (![object isKindOfClass: [XMPPDiscoIdentity class]])
		@throw [OFInvalidArgumentException
		@throw [OFInvalidArgumentException exception];
		    exceptionWithClass: [self class]
			      selector: _cmd];

	identity = (XMPPDiscoIdentity*)object;

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