ObjXMPP  Check-in [5d6af5c663]

Overview
Comment:Clean up properties.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 5d6af5c6635e6a3345d5efb9981e757a2013d05406fe4d402dfb9b51ab296323
User & Date: js on 2012-02-03 08:04:54
Other Links: manifest | tags
Context
2012-02-03
08:05
Change -[XMPPMessage addBody:] to -[XMPPMessage setBody:]. check-in: 694e1355dd user: js tags: trunk
08:04
Clean up properties. check-in: 5d6af5c663 user: js tags: trunk
08:04
Update .hgignore. check-in: 62973cfa1b user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/XMPPConnection.h from [995311ddfc] to [e09a304408].

︙
82
83
84
85
86
87
88
89

90
91

92
93
94
95
96
97
98

82
83
84
85
86
87
88

89
90

91
92
93
94
95
96
97
98








-
+

-
+








	unsigned int lastID;
}

#ifdef OF_HAVE_PROPERTIES
@property (copy) OFString *username, *password, *server, *domain, *resource;
@property (copy) OFString *privateKeyFile, *certificateFile;
@property (copy, readonly) XMPPJID *JID;
@property (assign) uint16_t port;
@property uint16_t port;
@property (readonly, retain, getter=socket) OFTCPSocket *sock;
@property (assign) BOOL encryptionRequired;
@property BOOL encryptionRequired;
@property (readonly) BOOL encrypted;
@property (readonly) BOOL streamOpen;
#endif

/**
 * \return A new autoreleased XMPPConnection
 */
︙

Modified src/XMPPExceptions.h from [d04f1172ae] to [fa00861fee].

︙
31
32
33
34
35
36
37
38

39
40
41
42
43
44
45

31
32
33
34
35
36
37

38
39
40
41
42
43
44
45








-
+








@interface XMPPException: OFException
{
	XMPPConnection *connection;
}

#ifdef OF_HAVE_PROPERTIES
/// The connection the exception relates to
@property (readonly, nonatomic) XMPPConnection *connection;
@property (readonly, assign) XMPPConnection *connection;
#endif

/**
 * Creates a new XMPPException
 *
 * \param class_ The class of the object which caused the exception
 * \param connection The connection that received the data responsible
︙
70
71
72
73
74
75
76
77

78
79

80
81
82
83
84
85
86

70
71
72
73
74
75
76

77
78

79
80
81
82
83
84
85
86








-
+

-
+








{
	OFString *condition;
	OFString *reason;
}

#ifdef OF_HAVE_PROPERTIES
/// The defined error condition specified by the stream error
@property (readonly, nonatomic) OFString *condition;
@property (readonly, assign) OFString *condition;
/// The descriptive free-form text specified by the stream error
@property (readonly, nonatomic) OFString *reason;
@property (readonly, assign) OFString *reason;
#endif

/**
 * Creates a new XMPPStreamErrorException
 *
 * \param class_ The class of the object which caused the exception
 * \param connection The connection that received the stream error
︙
119
120
121
122
123
124
125
126

127
128

129
130
131
132
133
134
135

119
120
121
122
123
124
125

126
127

128
129
130
131
132
133
134
135








-
+

-
+








{
	OFString *profile;
	OFString *string;
}

#ifdef OF_HAVE_PROPERTIES
/// The name of the stringprep profile that did not apply
@property (readonly, nonatomic) OFString *profile;
@property (readonly, assign) OFString *profile;
/// The string that failed the stringprep profile
@property (readonly, nonatomic) OFString *string;
@property (readonly, assign) OFString *string;
#endif

/**
 * Creates a new XMPPStringPrepFailedException
 *
 * \param class_ The class of the object which caused the exception
 * \param connection The connection the string relates to
︙
167
168
169
170
171
172
173
174

175
176

177
178
179
180
181
182
183

167
168
169
170
171
172
173

174
175

176
177
178
179
180
181
182
183








-
+

-
+








{
	OFString *operation;
	OFString *string;
}

#ifdef OF_HAVE_PROPERTIES
/// The IDNA translation operation which failed
@property (readonly, nonatomic) OFString *operation;
@property (readonly, assign) OFString *operation;
/// The string that could not be translated
@property (readonly, nonatomic) OFString *string;
@property (readonly, assign) OFString *string;
#endif

/**
 * Creates a new XMPPIDNATranslationFailedException
 *
 * \param class_ The class of the object which caused the exception
 * \param connection The connection the string relates to
︙
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








-
+








@interface XMPPAuthFailedException: XMPPException
{
	OFString *reason;
}

#ifdef OF_HAVE_PROPERTIES
/// The reason the authentication failed
@property (readonly, nonatomic) OFString *reason;
@property (readonly, assign) OFString *reason;
#endif

/**
 * Creates a new XMPPAuthFailedException
 *
 * \param class_ The class of the object which caused the exception
 * \param connection The connection that could not be authenticated
︙

Modified src/XMPPSRVLookup.h from [01be6b83c4] to [3ff900093e].

︙
32
33
34
35
36
37
38
39
40
41
42




43
44
45
46
47
48
49

32
33
34
35
36
37
38




39
40
41
42
43
44
45
46
47
48
49








-
-
-
-
+
+
+
+








	uint16_t weight;
	uint32_t accumulatedWeight;
	uint16_t port;
	OFString *target;
}

#ifdef OF_HAVE_PROPERTIES
@property (readonly, assign) uint16_t priority;
@property (readonly, assign) uint16_t weight;
@property (assign) uint32_t accumulatedWeight;
@property (readonly, assign) uint16_t port;
@property (readonly) uint16_t priority;
@property (readonly) uint16_t weight;
@property uint32_t accumulatedWeight;
@property (readonly) uint16_t port;
@property (readonly, copy) OFString *target;
#endif

+ entryWithPriority: (uint16_t)priority
	     weight: (uint16_t)weight
	       port: (uint16_t)port
	     target: (OFString*)target;
︙