diff --git a/NSXMLElementAdditions.h b/NSXMLElementAdditions.h
index 0ab0fed..bb9c2fc 100644
--- a/NSXMLElementAdditions.h
+++ b/NSXMLElementAdditions.h
@@ -3,11 +3,14 @@
@interface NSXMLElement (XMPPStreamAdditions)
-+ (NSXMLElement *)elementWithName:(NSString *)name attribute:(NSString *)attribute stringValue:(NSString *)string;
++ (NSXMLElement *)elementWithName:(NSString *)name xmlns:(NSString *)ns;
- (NSXMLElement *)elementForName:(NSString *)name;
- (NSXMLElement *)elementForName:(NSString *)name xmlns:(NSString *)xmlns;
+
- (NSString *)xmlns;
+- (void)setXmlns:(NSString *)ns;
+
- (void)addAttributeWithName:(NSString *)name stringValue:(NSString *)string;
- (NSDictionary *)attributesAsDictionary;
diff --git a/NSXMLElementAdditions.m b/NSXMLElementAdditions.m
index 87245eb..e1a2b04 100644
--- a/NSXMLElementAdditions.m
+++ b/NSXMLElementAdditions.m
@@ -5,10 +5,10 @@ @implementation NSXMLElement (XMPPStreamAdditions)
/**
* Quick method to create an element
**/
-+ (NSXMLElement *)elementWithName:(NSString *)name attribute:(NSString *)attribute stringValue:(NSString *)string
++ (NSXMLElement *)elementWithName:(NSString *)name xmlns:(NSString *)ns
{
NSXMLElement *element = [NSXMLElement elementWithName:name];
- [element addAttributeWithName:attribute stringValue:string];
+ [element setXmlns:ns];
return element;
}
@@ -72,6 +72,14 @@ - (NSString *)xmlns
return [[self namespaceForPrefix:@""] stringValue];
}
+- (void)setXmlns:(NSString *)ns
+{
+ // If we use setURI: then the xmlns won't be displayed in the XMLString.
+ // Adding the namespace this way works properly.
+
+ [self addNamespace:[NSXMLNode namespaceWithName:@"" stringValue:ns]];
+}
+
/**
* Shortcut to avoid having to use NSXMLNode everytime
**/
diff --git a/XMPPClient.m b/XMPPClient.m
index bdc1832..42cef05 100644
--- a/XMPPClient.m
+++ b/XMPPClient.m
@@ -327,8 +327,7 @@ - (void)goOffline
- (void)fetchRoster
{
- NSXMLElement *query = [NSXMLElement elementWithName:@"query"];
- [query addAttributeWithName:@"xmlns" stringValue:@"jabber:iq:roster"];
+ NSXMLElement *query = [NSXMLElement elementWithName:@"query" xmlns:@"jabber:iq:roster"];
NSXMLElement *iq = [NSXMLElement elementWithName:@"iq"];
[iq addAttributeWithName:@"type" stringValue:@"get"];
@@ -349,8 +348,7 @@ - (void)addBuddy:(XMPPJID *)jid withNickname:(NSString *)optionalName
[item addAttributeWithName:@"name" stringValue:optionalName];
}
- NSXMLElement *query = [NSXMLElement elementWithName:@"query"];
- [query addAttributeWithName:@"xmlns" stringValue:@"jabber:iq:roster"];
+ NSXMLElement *query = [NSXMLElement elementWithName:@"query" xmlns:@"jabber:iq:roster"];
[query addChild:item];
NSXMLElement *iq = [NSXMLElement elementWithName:@"iq"];
@@ -380,8 +378,7 @@ - (void)removeBuddy:(XMPPJID *)jid
[item addAttributeWithName:@"jid" stringValue:[jid bare]];
[item addAttributeWithName:@"subscription" stringValue:@"remove"];
- NSXMLElement *query = [NSXMLElement elementWithName:@"query"];
- [query addAttributeWithName:@"xmlns" stringValue:@"jabber:iq:roster"];
+ NSXMLElement *query = [NSXMLElement elementWithName:@"query" xmlns:@"jabber:iq:roster"];
[query addChild:item];
NSXMLElement *iq = [NSXMLElement elementWithName:@"iq"];
@@ -399,8 +396,7 @@ - (void)setNickname:(NSString *)nickname forBuddy:(XMPPJID *)jid
[item addAttributeWithName:@"jid" stringValue:[jid bare]];
[item addAttributeWithName:@"name" stringValue:nickname];
- NSXMLElement *query = [NSXMLElement elementWithName:@"query"];
- [query addAttributeWithName:@"xmlns" stringValue:@"jabber:iq:roster"];
+ NSXMLElement *query = [NSXMLElement elementWithName:@"query" xmlns:@"jabber:iq:roster"];
[query addChild:item];
NSXMLElement *iq = [NSXMLElement elementWithName:@"iq"];
@@ -423,8 +419,7 @@ - (void)acceptBuddyRequest:(XMPPJID *)jid
NSXMLElement *item = [NSXMLElement elementWithName:@"item"];
[item addAttributeWithName:@"jid" stringValue:[jid bare]];
- NSXMLElement *query = [NSXMLElement elementWithName:@"query"];
- [query addAttributeWithName:@"xmlns" stringValue:@"jabber:iq:roster"];
+ NSXMLElement *query = [NSXMLElement elementWithName:@"query" xmlns:@"jabber:iq:roster"];
[query addChild:item];
NSXMLElement *iq = [NSXMLElement elementWithName:@"iq"];
diff --git a/XMPPStream.m b/XMPPStream.m
index 3005ec6..129ee61 100644
--- a/XMPPStream.m
+++ b/XMPPStream.m
@@ -286,8 +286,7 @@ - (void)registerUser:(NSString *)username withPassword:(NSString *)password
{
if([self supportsInBandRegistration])
{
- NSXMLElement *queryElement = [NSXMLElement elementWithName:@"query"];
- [queryElement addAttributeWithName:@"xmlns" stringValue:@"jabber:iq:register"];
+ NSXMLElement *queryElement = [NSXMLElement elementWithName:@"query" xmlns:@"jabber:iq:register"];
[queryElement addChild:[NSXMLElement elementWithName:@"username" stringValue:username]];
[queryElement addChild:[NSXMLElement elementWithName:@"password" stringValue:password]];
@@ -415,8 +414,7 @@ - (void)authenticateUser:(NSString *)username
NSString *payload = [NSString stringWithFormat:@"%C%@%C%@", 0, username, 0, password];
NSString *base64 = [[payload dataUsingEncoding:NSUTF8StringEncoding] base64Encoded];
- NSXMLElement *auth = [NSXMLElement elementWithName:@"auth"];
- [auth addAttributeWithName:@"xmlns" stringValue:@"urn:ietf:params:xml:ns:xmpp-sasl"];
+ NSXMLElement *auth = [NSXMLElement elementWithName:@"auth" xmlns:@"urn:ietf:params:xml:ns:xmpp-sasl"];
[auth addAttributeWithName:@"mechanism" stringValue:@"PLAIN"];
[auth setStringValue:base64];
@@ -448,8 +446,7 @@ - (void)authenticateUser:(NSString *)username
NSString *digest = [[digestData sha1Digest] hexStringValue];
- NSXMLElement *queryElement = [NSXMLElement elementWithName:@"query"];
- [queryElement addAttributeWithName:@"xmlns" stringValue:@"jabber:iq:auth"];
+ NSXMLElement *queryElement = [NSXMLElement elementWithName:@"query" xmlns:@"jabber:iq:auth"];
[queryElement addChild:[NSXMLElement elementWithName:@"username" stringValue:username]];
[queryElement addChild:[NSXMLElement elementWithName:@"digest" stringValue:digest]];
[queryElement addChild:[NSXMLElement elementWithName:@"resource" stringValue:resource]];
@@ -658,8 +655,7 @@ - (void)handleStreamFeatures
NSXMLElement *resource = [NSXMLElement elementWithName:@"resource"];
[resource setStringValue:authResource];
- NSXMLElement *bind = [NSXMLElement elementWithName:@"bind"];
- [bind addAttributeWithName:@"xmlns" stringValue:@"urn:ietf:params:xml:ns:xmpp-bind"];
+ NSXMLElement *bind = [NSXMLElement elementWithName:@"bind" xmlns:@"urn:ietf:params:xml:ns:xmpp-bind"];
[bind addChild:resource];
NSXMLElement *iq = [NSXMLElement elementWithName:@"iq"];
@@ -677,8 +673,7 @@ - (void)handleStreamFeatures
{
// The user didn't specify a resource, so we ask the server to bind one for us
- NSXMLElement *bind = [NSXMLElement elementWithName:@"bind"];
- [bind addAttributeWithName:@"xmlns" stringValue:@"urn:ietf:params:xml:ns:xmpp-bind"];
+ NSXMLElement *bind = [NSXMLElement elementWithName:@"bind" xmlns:@"urn:ietf:params:xml:ns:xmpp-bind"];
NSXMLElement *iq = [NSXMLElement elementWithName:@"iq"];
[iq addAttributeWithName:@"type" stringValue:@"set"];
@@ -838,8 +833,7 @@ - (void)handleAuth1:(NSXMLElement *)response
[auth setUsername:authUsername password:tempPassword];
// Create and send challenge response element
- NSXMLElement *cr = [NSXMLElement elementWithName:@"response"];
- [cr addAttributeWithName:@"xmlns" stringValue:@"urn:ietf:params:xml:ns:xmpp-sasl"];
+ NSXMLElement *cr = [NSXMLElement elementWithName:@"response" xmlns:@"urn:ietf:params:xml:ns:xmpp-sasl"];
[cr setStringValue:[auth base64EncodedFullResponse]];
if(DEBUG_SEND) {
@@ -948,8 +942,7 @@ - (void)handleAuth2:(NSXMLElement *)response
// but many implementations incorrectly send it inside a second challenge request.
// Create and send empty challenge response element
- NSXMLElement *cr = [NSXMLElement elementWithName:@"response"];
- [cr addAttributeWithName:@"xmlns" stringValue:@"urn:ietf:params:xml:ns:xmpp-sasl"];
+ NSXMLElement *cr = [NSXMLElement elementWithName:@"response" xmlns:@"urn:ietf:params:xml:ns:xmpp-sasl"];
if(DEBUG_SEND) {
NSLog(@"SEND: %@", [cr XMLString]);
@@ -1009,7 +1002,7 @@ - (void)handleBinding:(NSXMLElement *)response
if(f_session)
{
NSXMLElement *session = [NSXMLElement elementWithName:@"session"];
- [session addAttributeWithName:@"xmlns" stringValue:@"urn:ietf:params:xml:ns:xmpp-session"];
+ [session setXmlns:@"urn:ietf:params:xml:ns:xmpp-session"];
NSXMLElement *iq = [NSXMLElement elementWithName:@"iq"];
[iq addAttributeWithName:@"type" stringValue:@"set"];
@@ -1043,8 +1036,7 @@ - (void)handleBinding:(NSXMLElement *)response
// It appears the server didn't allow our resource choice
// We'll simply let the server choose then
- NSXMLElement *bind = [NSXMLElement elementWithName:@"bind"];
- [bind addAttributeWithName:@"xmlns" stringValue:@"urn:ietf:params:xml:ns:xmpp-bind"];
+ NSXMLElement *bind = [NSXMLElement elementWithName:@"bind" xmlns:@"urn:ietf:params:xml:ns:xmpp-bind"];
NSXMLElement *iq = [NSXMLElement elementWithName:@"iq"];
[iq addAttributeWithName:@"type" stringValue:@"set"];
diff --git a/XMPPStream.xcodeproj/robbie.mode1v3 b/XMPPStream.xcodeproj/robbie.mode1v3
index b055404..b682efa 100644
--- a/XMPPStream.xcodeproj/robbie.mode1v3
+++ b/XMPPStream.xcodeproj/robbie.mode1v3
@@ -248,8 +248,6 @@
Layout
- BecomeActive
-
ContentConfiguration
PBXBottomSmartGroupGIDs
@@ -302,6 +300,8 @@
PBXSmartGroupTreeModuleOutlineStateSelectionKey
+ 16
+ 14
13
0
@@ -337,12 +337,14 @@
Dock
+ BecomeActive
+
ContentConfiguration
PBXProjectModuleGUID
1CE0B20306471E060097A5F4
PBXProjectModuleLabel
- XMPPStream.m
+ XMPPClient.m
PBXSplitModuleInNavigatorKey
Split0
@@ -350,35 +352,42 @@
PBXProjectModuleGUID
1CE0B20406471E060097A5F4
PBXProjectModuleLabel
- XMPPStream.m
+ XMPPClient.m
_historyCapacity
10
bookmark
- DC433BAE0E917D4C00F2C4D4
+ DC433C050E9182B900F2C4D4
history
- DC54413B0E8D566300013051
- DC54413C0E8D566300013051
- DC54413D0E8D566300013051
DC54413E0E8D566300013051
DC54413F0E8D566300013051
DC5441400E8D566300013051
DC5441410E8D566300013051
DC5441420E8D566300013051
- DC5442400E8F331E00013051
- DC5442430E8F331E00013051
+ DC433BC70E91801900F2C4D4
+ DC433BF40E91828E00F2C4D4
+ DC433BF50E91828E00F2C4D4
+ DC433BF60E91828E00F2C4D4
+ DC433BF70E91828E00F2C4D4
prevStack
- DC5441450E8D566300013051
- DC5441460E8D566300013051
- DC5441470E8D566300013051
DC5441480E8D566300013051
DC5441490E8D566300013051
DC54414A0E8D566300013051
DC54414B0E8D566300013051
DC54414C0E8D566300013051
DC5442420E8F331E00013051
+ DC433BCB0E91801900F2C4D4
+ DC433BCC0E91801900F2C4D4
+ DC433BCD0E91801900F2C4D4
+ DC433BF80E91828E00F2C4D4
+ DC433BF90E91828E00F2C4D4
+ DC433BFA0E91828E00F2C4D4
+ DC433BFB0E91828E00F2C4D4
+ DC433BFC0E91828E00F2C4D4
+ DC433BFD0E91828E00F2C4D4
+ DC433BFE0E91828E00F2C4D4
SplitCount
@@ -563,7 +572,7 @@
StatusbarIsVisible
TimeStamp
- 244415820.228861
+ 244417209.62928399
ToolbarDisplayMode
1
ToolbarIsVisible
@@ -578,10 +587,11 @@
5
WindowOrderList
+ 1C530D57069F1CE1000CFCEE
+ 1C78EAAD065D492600B07095
1CD10A99069EF8BA00B06720
DCF825810D748AB600BFABDE
/Users/robbie/Programs/Google Code/XMPPFramework/XMPPStream.xcodeproj
- 1C78EAAD065D492600B07095
WindowString
64 89 1182 827 0 0 1680 1028
@@ -614,7 +624,7 @@
Frame
{{0, 0}, {1080, 0}}
RubberWindowFrame
- 587 91 1080 379 0 0 1680 1028
+ 532 -49 1080 379 0 0 1680 1028
Module
PBXNavigatorGroup
@@ -640,7 +650,7 @@
Frame
{{0, 5}, {1080, 333}}
RubberWindowFrame
- 587 91 1080 379 0 0 1680 1028
+ 532 -49 1080 379 0 0 1680 1028
Module
PBXBuildResultsModule
@@ -670,7 +680,7 @@
ToolbarConfiguration
xcode.toolbar.config.buildV3
WindowString
- 587 91 1080 379 0 0 1680 1028
+ 532 -49 1080 379 0 0 1680 1028
WindowToolGUID
DCF825810D748AB600BFABDE
WindowToolIsVisible
@@ -821,7 +831,7 @@
PBXProjectModuleGUID
1CDD528C0622207200134675
PBXProjectModuleLabel
- XMPPUser.m
+ XMPPStream.m
StatusBarVisibility
@@ -879,8 +889,8 @@
TableOfContents
1C530D57069F1CE1000CFCEE
- DCEFA0070E8D442B006E145E
- DCEFA0080E8D442B006E145E
+ DC433BBC0E91800D00F2C4D4
+ DC433BBD0E91800D00F2C4D4
1CDD528C0622207200134675
1CD0528E0623707200166675
@@ -957,7 +967,7 @@
WindowToolGUID
1C78EAAD065D492600B07095
WindowToolIsVisible
-
+
Identifier
diff --git a/XMPPStream.xcodeproj/robbie.pbxuser b/XMPPStream.xcodeproj/robbie.pbxuser
index 159a009..8dacd0d 100644
--- a/XMPPStream.xcodeproj/robbie.pbxuser
+++ b/XMPPStream.xcodeproj/robbie.pbxuser
@@ -69,28 +69,33 @@
PBXWorkspaceStateSaveDate = 244415783;
};
perUserProjectItems = {
- DC433BA40E917D2900F2C4D4 /* PBXTextBookmark */ = DC433BA40E917D2900F2C4D4 /* PBXTextBookmark */;
- DC433BAE0E917D4C00F2C4D4 /* PBXTextBookmark */ = DC433BAE0E917D4C00F2C4D4 /* PBXTextBookmark */;
- DC54413B0E8D566300013051 = DC54413B0E8D566300013051 /* PBXTextBookmark */;
- DC54413C0E8D566300013051 = DC54413C0E8D566300013051 /* PBXTextBookmark */;
- DC54413D0E8D566300013051 = DC54413D0E8D566300013051 /* PBXTextBookmark */;
- DC54413E0E8D566300013051 = DC54413E0E8D566300013051 /* PBXTextBookmark */;
- DC54413F0E8D566300013051 = DC54413F0E8D566300013051 /* PBXTextBookmark */;
- DC5441400E8D566300013051 = DC5441400E8D566300013051 /* PBXTextBookmark */;
- DC5441410E8D566300013051 = DC5441410E8D566300013051 /* PBXTextBookmark */;
- DC5441420E8D566300013051 = DC5441420E8D566300013051 /* PBXTextBookmark */;
- DC5441450E8D566300013051 = DC5441450E8D566300013051 /* PBXTextBookmark */;
- DC5441460E8D566300013051 = DC5441460E8D566300013051 /* PBXTextBookmark */;
- DC5441470E8D566300013051 = DC5441470E8D566300013051 /* PBXTextBookmark */;
- DC5441480E8D566300013051 = DC5441480E8D566300013051 /* PBXTextBookmark */;
- DC5441490E8D566300013051 = DC5441490E8D566300013051 /* PBXTextBookmark */;
- DC54414A0E8D566300013051 = DC54414A0E8D566300013051 /* PBXTextBookmark */;
- DC54414B0E8D566300013051 = DC54414B0E8D566300013051 /* PBXTextBookmark */;
- DC54414C0E8D566300013051 = DC54414C0E8D566300013051 /* PBXTextBookmark */;
- DC5442400E8F331E00013051 = DC5442400E8F331E00013051 /* PBXTextBookmark */;
- DC5442410E8F331E00013051 = DC5442410E8F331E00013051 /* PBXTextBookmark */;
- DC5442420E8F331E00013051 = DC5442420E8F331E00013051 /* PBXTextBookmark */;
- DC5442430E8F331E00013051 = DC5442430E8F331E00013051 /* PBXTextBookmark */;
+ DC433BC70E91801900F2C4D4 /* PBXTextBookmark */ = DC433BC70E91801900F2C4D4 /* PBXTextBookmark */;
+ DC433BCB0E91801900F2C4D4 /* PBXTextBookmark */ = DC433BCB0E91801900F2C4D4 /* PBXTextBookmark */;
+ DC433BCC0E91801900F2C4D4 /* PBXTextBookmark */ = DC433BCC0E91801900F2C4D4 /* PBXTextBookmark */;
+ DC433BCD0E91801900F2C4D4 /* PBXTextBookmark */ = DC433BCD0E91801900F2C4D4 /* PBXTextBookmark */;
+ DC433BF40E91828E00F2C4D4 /* PBXTextBookmark */ = DC433BF40E91828E00F2C4D4 /* PBXTextBookmark */;
+ DC433BF50E91828E00F2C4D4 /* PBXTextBookmark */ = DC433BF50E91828E00F2C4D4 /* PBXTextBookmark */;
+ DC433BF60E91828E00F2C4D4 /* PBXTextBookmark */ = DC433BF60E91828E00F2C4D4 /* PBXTextBookmark */;
+ DC433BF70E91828E00F2C4D4 /* PBXTextBookmark */ = DC433BF70E91828E00F2C4D4 /* PBXTextBookmark */;
+ DC433BF80E91828E00F2C4D4 /* PBXTextBookmark */ = DC433BF80E91828E00F2C4D4 /* PBXTextBookmark */;
+ DC433BF90E91828E00F2C4D4 /* PBXTextBookmark */ = DC433BF90E91828E00F2C4D4 /* PBXTextBookmark */;
+ DC433BFA0E91828E00F2C4D4 /* PBXTextBookmark */ = DC433BFA0E91828E00F2C4D4 /* PBXTextBookmark */;
+ DC433BFB0E91828E00F2C4D4 /* PBXTextBookmark */ = DC433BFB0E91828E00F2C4D4 /* PBXTextBookmark */;
+ DC433BFC0E91828E00F2C4D4 /* PBXTextBookmark */ = DC433BFC0E91828E00F2C4D4 /* PBXTextBookmark */;
+ DC433BFD0E91828E00F2C4D4 /* PBXTextBookmark */ = DC433BFD0E91828E00F2C4D4 /* PBXTextBookmark */;
+ DC433BFE0E91828E00F2C4D4 /* PBXTextBookmark */ = DC433BFE0E91828E00F2C4D4 /* PBXTextBookmark */;
+ DC433C050E9182B900F2C4D4 /* PBXTextBookmark */ = DC433C050E9182B900F2C4D4 /* PBXTextBookmark */;
+ DC54413E0E8D566300013051 /* PBXTextBookmark */ = DC54413E0E8D566300013051 /* PBXTextBookmark */;
+ DC54413F0E8D566300013051 /* PBXTextBookmark */ = DC54413F0E8D566300013051 /* PBXTextBookmark */;
+ DC5441400E8D566300013051 /* PBXTextBookmark */ = DC5441400E8D566300013051 /* PBXTextBookmark */;
+ DC5441410E8D566300013051 /* PBXTextBookmark */ = DC5441410E8D566300013051 /* PBXTextBookmark */;
+ DC5441420E8D566300013051 /* PBXTextBookmark */ = DC5441420E8D566300013051 /* PBXTextBookmark */;
+ DC5441480E8D566300013051 /* PBXTextBookmark */ = DC5441480E8D566300013051 /* PBXTextBookmark */;
+ DC5441490E8D566300013051 /* PBXTextBookmark */ = DC5441490E8D566300013051 /* PBXTextBookmark */;
+ DC54414A0E8D566300013051 /* PBXTextBookmark */ = DC54414A0E8D566300013051 /* PBXTextBookmark */;
+ DC54414B0E8D566300013051 /* PBXTextBookmark */ = DC54414B0E8D566300013051 /* PBXTextBookmark */;
+ DC54414C0E8D566300013051 /* PBXTextBookmark */ = DC54414C0E8D566300013051 /* PBXTextBookmark */;
+ DC5442420E8F331E00013051 /* PBXTextBookmark */ = DC5442420E8F331E00013051 /* PBXTextBookmark */;
};
sourceControlManager = DCCE55330BDC6249000E2798 /* Source Control */;
userBuildSettings = {
@@ -102,26 +107,163 @@
DCCE55260BDC6243000E2798 /* XMPPStream */,
);
};
- DC433BA40E917D2900F2C4D4 /* PBXTextBookmark */ = {
+ DC433BC70E91801900F2C4D4 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = DCCE55670BDC7030000E2798 /* XMPPStream.m */;
name = "XMPPStream.m: 451";
- rLen = 593;
- rLoc = 15061;
+ rLen = 538;
+ rLoc = 14959;
rType = 0;
vrLen = 1924;
vrLoc = 14190;
};
- DC433BAE0E917D4C00F2C4D4 /* PBXTextBookmark */ = {
+ DC433BCB0E91801900F2C4D4 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = DCCE55670BDC7030000E2798 /* XMPPStream.m */;
name = "XMPPStream.m: 451";
- rLen = 593;
- rLoc = 15061;
+ rLen = 538;
+ rLoc = 14959;
rType = 0;
- vrLen = 1922;
+ vrLen = 1924;
vrLoc = 14190;
};
+ DC433BCC0E91801900F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DCB9BBF00DDCEE39002DA335 /* NSXMLElementAdditions.h */;
+ name = "NSXMLElementAdditions.h: 12";
+ rLen = 32;
+ rLoc = 322;
+ rType = 0;
+ vrLen = 524;
+ vrLoc = 0;
+ };
+ DC433BCD0E91801900F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DCB9BBF10DDCEE39002DA335 /* NSXMLElementAdditions.m */;
+ name = "NSXMLElementAdditions.m: 79";
+ rLen = 0;
+ rLoc = 2211;
+ rType = 0;
+ vrLen = 1412;
+ vrLoc = 1466;
+ };
+ DC433BF40E91828E00F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DCB9BBF00DDCEE39002DA335 /* NSXMLElementAdditions.h */;
+ name = "NSXMLElementAdditions.h: 6";
+ rLen = 0;
+ rLoc = 171;
+ rType = 0;
+ vrLen = 482;
+ vrLoc = 0;
+ };
+ DC433BF50E91828E00F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DCB9BBF10DDCEE39002DA335 /* NSXMLElementAdditions.m */;
+ name = "NSXMLElementAdditions.m: 8";
+ rLen = 0;
+ rLoc = 203;
+ rType = 0;
+ vrLen = 1657;
+ vrLoc = 0;
+ };
+ DC433BF60E91828E00F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DC63E9200E65D5140076E6D2 /* XMPPTransports.m */;
+ name = "XMPPTransports.m: 91";
+ rLen = 0;
+ rLoc = 3187;
+ rType = 0;
+ vrLen = 2269;
+ vrLoc = 1445;
+ };
+ DC433BF70E91828E00F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DCB9BA0B0DDB71E7002DA335 /* XMPPClient.m */;
+ rLen = 0;
+ rLoc = 6791;
+ rType = 0;
+ };
+ DC433BF80E91828E00F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DCB9BA0B0DDB71E7002DA335 /* XMPPClient.m */;
+ name = "XMPPClient.m: 331";
+ rLen = 0;
+ rLoc = 6791;
+ rType = 0;
+ vrLen = 1677;
+ vrLoc = 6140;
+ };
+ DC433BF90E91828E00F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DCB9BBF00DDCEE39002DA335 /* NSXMLElementAdditions.h */;
+ name = "NSXMLElementAdditions.h: 6";
+ rLen = 0;
+ rLoc = 100;
+ rType = 0;
+ vrLen = 526;
+ vrLoc = 0;
+ };
+ DC433BFA0E91828E00F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DCB9BBF10DDCEE39002DA335 /* NSXMLElementAdditions.m */;
+ name = "NSXMLElementAdditions.m: 13";
+ rLen = 0;
+ rLoc = 309;
+ rType = 0;
+ vrLen = 1749;
+ vrLoc = 0;
+ };
+ DC433BFB0E91828E00F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DC63E9200E65D5140076E6D2 /* XMPPTransports.m */;
+ name = "XMPPTransports.m: 91";
+ rLen = 92;
+ rLoc = 3119;
+ rType = 0;
+ vrLen = 2445;
+ vrLoc = 1076;
+ };
+ DC433BFC0E91828E00F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DCB9BBF00DDCEE39002DA335 /* NSXMLElementAdditions.h */;
+ name = "NSXMLElementAdditions.h: 6";
+ rLen = 0;
+ rLoc = 171;
+ rType = 0;
+ vrLen = 482;
+ vrLoc = 0;
+ };
+ DC433BFD0E91828E00F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DCB9BBF10DDCEE39002DA335 /* NSXMLElementAdditions.m */;
+ name = "NSXMLElementAdditions.m: 8";
+ rLen = 0;
+ rLoc = 203;
+ rType = 0;
+ vrLen = 1657;
+ vrLoc = 0;
+ };
+ DC433BFE0E91828E00F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DC63E9200E65D5140076E6D2 /* XMPPTransports.m */;
+ name = "XMPPTransports.m: 91";
+ rLen = 0;
+ rLoc = 3187;
+ rType = 0;
+ vrLen = 2269;
+ vrLoc = 1445;
+ };
+ DC433C050E9182B900F2C4D4 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = DCB9BA0B0DDB71E7002DA335 /* XMPPClient.m */;
+ name = "XMPPClient.m: 330";
+ rLen = 0;
+ rLoc = 6797;
+ rType = 0;
+ vrLen = 1720;
+ vrLoc = 6140;
+ };
DC5247D50BE318AE002F838C /* XMPPUser.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {826, 749}}";
@@ -140,36 +282,6 @@
sepNavWindowFrame = "{{100, 161}, {797, 720}}";
};
};
- DC54413B0E8D566300013051 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = DCB9BBEF0DDCEDA6002DA335 /* XMPP.h */;
- name = "XMPP.h: 3";
- rLen = 0;
- rLoc = 19;
- rType = 0;
- vrLen = 233;
- vrLoc = 0;
- };
- DC54413C0E8D566300013051 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = DCCE55660BDC7030000E2798 /* XMPPStream.h */;
- name = "XMPPStream.h: 3";
- rLen = 0;
- rLoc = 52;
- rType = 0;
- vrLen = 1153;
- vrLoc = 0;
- };
- DC54413D0E8D566300013051 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = DCB9BA0A0DDB71E7002DA335 /* XMPPClient.h */;
- name = "XMPPClient.h: 3";
- rLen = 0;
- rLoc = 52;
- rType = 0;
- vrLen = 907;
- vrLoc = 0;
- };
DC54413E0E8D566300013051 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = DCB9BA100DDB73B1002DA335 /* XMPPJID.h */;
@@ -220,36 +332,6 @@
vrLen = 218;
vrLoc = 0;
};
- DC5441450E8D566300013051 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = DCB9BBEF0DDCEDA6002DA335 /* XMPP.h */;
- name = "XMPP.h: 3";
- rLen = 0;
- rLoc = 19;
- rType = 0;
- vrLen = 233;
- vrLoc = 0;
- };
- DC5441460E8D566300013051 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = DCCE55660BDC7030000E2798 /* XMPPStream.h */;
- name = "XMPPStream.h: 3";
- rLen = 0;
- rLoc = 52;
- rType = 0;
- vrLen = 1153;
- vrLoc = 0;
- };
- DC5441470E8D566300013051 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = DCB9BA0A0DDB71E7002DA335 /* XMPPClient.h */;
- name = "XMPPClient.h: 3";
- rLen = 0;
- rLoc = 52;
- rType = 0;
- vrLen = 907;
- vrLoc = 0;
- };
DC5441480E8D566300013051 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = DCB9BA100DDB73B1002DA335 /* XMPPJID.h */;
@@ -300,26 +382,6 @@
vrLen = 218;
vrLoc = 0;
};
- DC5442400E8F331E00013051 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = DCB9BBF00DDCEE39002DA335 /* NSXMLElementAdditions.h */;
- name = "NSXMLElementAdditions.h: 3";
- rLen = 0;
- rLoc = 52;
- rType = 0;
- vrLen = 489;
- vrLoc = 0;
- };
- DC5442410E8F331E00013051 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = DCCE55670BDC7030000E2798 /* XMPPStream.m */;
- name = "XMPPStream.m: 352";
- rLen = 0;
- rLoc = 11848;
- rType = 0;
- vrLen = 1735;
- vrLoc = 10689;
- };
DC5442420E8F331E00013051 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = DCB9BBF00DDCEE39002DA335 /* NSXMLElementAdditions.h */;
@@ -330,16 +392,6 @@
vrLen = 489;
vrLoc = 0;
};
- DC5442430E8F331E00013051 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = DCCE55670BDC7030000E2798 /* XMPPStream.m */;
- name = "XMPPStream.m: 451";
- rLen = 593;
- rLoc = 15061;
- rType = 0;
- vrLen = 1929;
- vrLoc = 14185;
- };
DC63E91F0E65D5140076E6D2 /* XMPPTransports.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {826, 749}}";
@@ -349,9 +401,9 @@
};
DC63E9200E65D5140076E6D2 /* XMPPTransports.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {826, 1498}}";
- sepNavSelRange = "{353, 0}";
- sepNavVisRange = "{0, 1615}";
+ sepNavIntBoundsRect = "{{0, 0}, {826, 1470}}";
+ sepNavSelRange = "{3187, 0}";
+ sepNavVisRange = "{1445, 2269}";
};
};
DC63E9F80E65FD570076E6D2 /* SCNotificationManager.h */ = {
@@ -406,9 +458,9 @@
};
DCB9BA0B0DDB71E7002DA335 /* XMPPClient.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {826, 13132}}";
- sepNavSelRange = "{18810, 0}";
- sepNavVisRange = "{18598, 1239}";
+ sepNavIntBoundsRect = "{{0, 0}, {826, 12838}}";
+ sepNavSelRange = "{6797, 0}";
+ sepNavVisRange = "{6140, 1720}";
sepNavWindowFrame = "{{321, 72}, {797, 720}}";
};
};
@@ -521,15 +573,15 @@
DCB9BBF00DDCEE39002DA335 /* NSXMLElementAdditions.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {826, 749}}";
- sepNavSelRange = "{52, 0}";
- sepNavVisRange = "{0, 489}";
+ sepNavSelRange = "{171, 0}";
+ sepNavVisRange = "{0, 482}";
};
};
DCB9BBF10DDCEE39002DA335 /* NSXMLElementAdditions.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {826, 1442}}";
- sepNavSelRange = "{2756, 0}";
- sepNavVisRange = "{1470, 1314}";
+ sepNavIntBoundsRect = "{{0, 0}, {842, 1470}}";
+ sepNavSelRange = "{278, 8}";
+ sepNavVisRange = "{0, 606}";
sepNavWindowFrame = "{{68, 339}, {995, 684}}";
};
};
@@ -619,9 +671,9 @@
};
DCCE55670BDC7030000E2798 /* XMPPStream.m */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {826, 22316}}";
- sepNavSelRange = "{15061, 593}";
- sepNavVisRange = "{14190, 1922}";
+ sepNavIntBoundsRect = "{{0, 0}, {842, 22176}}";
+ sepNavSelRange = "{32780, 8}";
+ sepNavVisRange = "{32238, 945}";
sepNavVisRect = "{{0, 16450}, {813, 607}}";
sepNavWindowFrame = "{{160, 219}, {797, 720}}";
};
diff --git a/XMPPTransports.m b/XMPPTransports.m
index 1bd12c4..66e077d 100644
--- a/XMPPTransports.m
+++ b/XMPPTransports.m
@@ -37,7 +37,7 @@ - (void)queryGatewayDiscoveryIdentityForLegacyService:(NSString *)service
[element addAttributeWithName:@"from" stringValue:[[client myJID] full]];
[element addAttributeWithName:@"to" stringValue:[NSString stringWithFormat:@"%@.%@", service, [client domain]]];
[element addAttributeWithName:@"id" stringValue:@"disco1"];
- [element addChild:[NSXMLElement elementWithName:@"query" attribute:@"xmlns" stringValue:@"http://jabber.org/protocol/disco#info"]];
+ [element addChild:[NSXMLElement elementWithName:@"query" xmlns:@"http://jabber.org/protocol/disco#info"]];
[client sendElement:element];
}
@@ -49,7 +49,7 @@ - (void)queryGatewayAgentInfo
[element addAttributeWithName:@"from" stringValue:[[client myJID] full]];
[element addAttributeWithName:@"to" stringValue:[client domain]];
[element addAttributeWithName:@"id" stringValue:@"agent1"];
- [element addChild:[NSXMLElement elementWithName:@"query" attribute:@"xmlns" stringValue:@"jabber:iq:agents"]];
+ [element addChild:[NSXMLElement elementWithName:@"query" xmlns:@"jabber:iq:agents"]];
[client sendElement:element];
}
@@ -61,14 +61,14 @@ - (void)queryRegistrationRequirementsForLegacyService:(NSString *)service
[element addAttributeWithName:@"from" stringValue:[[client myJID] full]];
[element addAttributeWithName:@"to" stringValue:[NSString stringWithFormat:@"%@.%@", service, [client domain]]];
[element addAttributeWithName:@"id" stringValue:@"reg1"];
- [element addChild:[NSXMLElement elementWithName:@"query" attribute:@"xmlns" stringValue:@"jabber:iq:register"]];
+ [element addChild:[NSXMLElement elementWithName:@"query" xmlns:@"jabber:iq:register"]];
[client sendElement:element];
}
- (void)registerLegacyService:(NSString *)service userName:(NSString *)userName password:(NSString *)password
{
- NSXMLElement *query = [NSXMLElement elementWithName:@"query" attribute:@"xmlns" stringValue:@"jabber:iq:register"];
+ NSXMLElement *query = [NSXMLElement elementWithName:@"query" xmlns:@"jabber:iq:register"];
[query addChild:[NSXMLElement elementWithName:@"username" stringValue:userName]];
[query addChild:[NSXMLElement elementWithName:@"password" stringValue:password]];
@@ -88,7 +88,7 @@ - (void)registerLegacyService:(NSString *)service userName:(NSString *)userName
**/
- (void)unregisterLegacyService:(NSString *)service
{
- NSXMLElement *query = [NSXMLElement elementWithName:@"query" attribute:@"xmlns" stringValue:@"jabber:iq:register"];
+ NSXMLElement *query = [NSXMLElement elementWithName:@"query" xmlns:@"jabber:iq:register"];
[query addChild:[NSXMLElement elementWithName:@"remove"]];
NSXMLElement *element = [NSXMLElement elementWithName:@"iq"];