ObjXMPP  Diff

Differences From Artifact [a2a1eacbe7]:

To Artifact [9e6205b31f]:


61
62
63
64
65
66
67
68

69
70
71

72
73
74
75
76
77

78
79
80
81
82
83

84
85
86
87
88
89

90
91
92
93

94
95
96

97
98
99
100
101
102
103
104
105
106
107
108
109

110
111
112
113

114
115
116
117

118
119
120
121
122
123
124
61
62
63
64
65
66
67

68

69

70

71
72
73
74

75

76
77
78
79

80

81
82
83
84

85

86
87

88

89

90


91
92
93
94
95
96
97
98
99
100

101
102
103
104

105
106
107
108

109
110
111
112
113
114
115
116







-
+
-

-
+
-




-
+
-




-
+
-




-
+
-


-
+
-

-
+
-
-










-
+



-
+



-
+







}

+ (instancetype)presenceWithType: (OFString *)type
{
	return [[[self alloc] initWithType: type] autorelease];
}

+ (instancetype)presenceWithType: (OFString *)type
+ (instancetype)presenceWithType: (OFString *)type ID: (OFString *)ID
			      ID: (OFString *)ID
{
	return [[[self alloc] initWithType: type
	return [[[self alloc] initWithType: type ID: ID] autorelease];
					ID: ID] autorelease];
}

- (instancetype)init
{
	return [self initWithType: nil
	return [self initWithType: nil ID: nil];
			       ID: nil];
}

- (instancetype)initWithID: (OFString *)ID
{
	return [self initWithType: nil
	return [self initWithType: nil ID: ID];
			       ID: ID];
}

- (instancetype)initWithType: (OFString *)type
{
	return [self initWithType: type
	return [self initWithType: type ID: nil];
			       ID: nil];
}

- (instancetype)initWithType: (OFString *)type
- (instancetype)initWithType: (OFString *)type ID: (OFString *)ID
			  ID: (OFString *)ID
{
	return [super initWithName: @"presence"
	return [super initWithName: @"presence" type: type ID: ID];
			      type: type
				ID: ID];
}

- (instancetype)initWithElement: (OFXMLElement *)element
{
	self = [super initWithElement: element];

	@try {
		OFXMLElement *subElement;

		if ((subElement = [element elementForName: @"show"
						namespace: XMPP_NS_CLIENT]))
						namespace: XMPPClientNS]))
			self.show = subElement.stringValue;

		if ((subElement = [element elementForName: @"status"
						namespace: XMPP_NS_CLIENT]))
						namespace: XMPPClientNS]))
			self.status = subElement.stringValue;

		if ((subElement = [element elementForName: @"priority"
						namespace: XMPP_NS_CLIENT]))
						namespace: XMPPClientNS]))
			self.priority = [OFNumber numberWithLongLong:
			    [subElement longLongValueWithBase: 10]];
	} @catch (id e) {
		[self release];
		@throw e;
	}

133
134
135
136
137
138
139
140

141
142
143
144
145
146
147
148

149
150
151
152
153
154
155
156
157
158
159

160
161
162
163
164
165
166
167

168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184

185
186
187
188
189
190
191
192

193
194
195
196
197
198
199
125
126
127
128
129
130
131

132
133
134
135
136
137
138
139

140
141
142
143
144
145
146
147
148
149
150

151
152
153
154
155
156
157
158

159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175

176
177
178
179
180
181
182
183

184
185
186
187
188
189
190
191







-
+







-
+










-
+







-
+
















-
+







-
+








	[super dealloc];
}

- (void)setShow: (OFString *)show
{
	OFXMLElement *oldShow = [self elementForName: @"show"
					   namespace: XMPP_NS_CLIENT];
					   namespace: XMPPClientNS];
	OFString *old;

	if (oldShow != nil)
		[self removeChild: oldShow];

	if (show != nil)
		[self addChild: [OFXMLElement elementWithName: @"show"
						    namespace: XMPP_NS_CLIENT
						    namespace: XMPPClientNS
						  stringValue: show]];

	old = _show;
	_show = [show copy];
	[old release];
}

- (void)setStatus: (OFString *)status
{
	OFXMLElement *oldStatus = [self elementForName: @"status"
					     namespace: XMPP_NS_CLIENT];
					     namespace: XMPPClientNS];
	OFString *old;

	if (oldStatus != nil)
		[self removeChild: oldStatus];

	if (status != nil)
		[self addChild: [OFXMLElement elementWithName: @"status"
						    namespace: XMPP_NS_CLIENT
						    namespace: XMPPClientNS
						  stringValue: status]];

	old = _status;
	_status = [status copy];
	[old release];
}

- (void)setPriority: (OFNumber *)priority
{
	long long prio = priority.longLongValue;
	OFNumber *old;

	if ((prio < -128) || (prio > 127))
		@throw [OFInvalidArgumentException exception];

	OFXMLElement *oldPriority = [self elementForName: @"priority"
					       namespace: XMPP_NS_CLIENT];
					       namespace: XMPPClientNS];

	if (oldPriority != nil)
		[self removeChild: oldPriority];

	OFString *priority_s =
	    [OFString stringWithFormat: @"%hhd", priority.charValue];
	[self addChild: [OFXMLElement elementWithName: @"priority"
					    namespace: XMPP_NS_CLIENT
					    namespace: XMPPClientNS
					  stringValue: priority_s]];

	old = _priority;
	_priority = [priority copy];
	[old release];
}