Permalink
Browse files

Fix missing imports and bugs found thanks to new objj compiler

  • Loading branch information...
1 parent 7d51b13 commit 2ca313b2290fcf0317f1ba1b26aa2b50aeb5dfe5 @primalmotion primalmotion committed Jan 18, 2013
Showing with 27 additions and 26 deletions.
  1. +2 −0 PubSub/TNPubSubController.j
  2. +16 −13 PubSub/TNPubSubNode.j
  3. +5 −5 TNStropheClient.j
  4. +0 −1 TNStropheContact.j
  5. +1 −0 TNStropheGroup.j
  6. +0 −4 TNStropheIMClient.j
  7. +1 −1 TNStropheServerAdministration.j
  8. +2 −2 TNXMLNode.j
@@ -19,6 +19,8 @@
*/
@import <Foundation/Foundation.j>
+@import <Foundation/CPNotificationCenter.j>
+
@import "../Resources/Strophe/strophe.js"
@import "../Resources/Strophe/sha1.js"
View
@@ -19,12 +19,15 @@
*/
@import <Foundation/Foundation.j>
+@import <Foundation/CPNotificationCenter.j>
@import "../Resources/Strophe/strophe.js"
@import "../Resources/Strophe/sha1.js"
@import "../TNStropheConnection.j"
@import "../TNStropheStanza.j"
+@class TNStrophePubSubSubscriptionsRetrievedNotification
+
TNStrophePubSubVarAccessModel = @"pubsub#access_model";
TNStrophePubSubVarBodyXSLT = @"pubsub#body_xslt";
@@ -581,25 +584,25 @@ TNStrophePubSubNodeUnsubscribedNotification = @"TNStrophePubSubNodeUnsubscribedN
if (options && [options count] > 0)
{
- [subscribeStanza up];
- [subscribeStanza addChildWithName:@"options"];
- [subscribeStanza addChildWithName:@"x" andAttributes:{"xmlns":Strophe.NS.X_DATA, "type":"submit"}];
- [subscribeStanza addChildWithName:@"field" andAttributes:{"var":"FORM_TYPE", "type":"hidden"}];
- [subscribeStanza addChildWithName:@"value"];
- [subscribeStanza addTextNode:Strophe.NS.PUBSUB_SUBSCRIBE_OPTIONS];
- [subscribeStanza up];
- [subscribeStanza up];
+ [stanza up];
+ [stanza addChildWithName:@"options"];
+ [stanza addChildWithName:@"x" andAttributes:{"xmlns":Strophe.NS.X_DATA, "type":"submit"}];
+ [stanza addChildWithName:@"field" andAttributes:{"var":"FORM_TYPE", "type":"hidden"}];
+ [stanza addChildWithName:@"value"];
+ [stanza addTextNode:Strophe.NS.PUBSUB_SUBSCRIBE_OPTIONS];
+ [stanza up];
+ [stanza up];
var keys = [options allKeys];
for (var i = 0; i < [keys count]; i++)
{
var key = [keys objectAtIndex:i],
value = [options valueForKey:key];
- [subscribeStanza addChildWithName:@"field" andAttributes:{"var":key}];
- [subscribeStanza addChildWithName:@"value"];
- [subscribeStanza addTextNode:value];
- [subscribeStanza up];
- [subscribeStanza up];
+ [stanza addChildWithName:@"field" andAttributes:{"var":key}];
+ [stanza addChildWithName:@"value"];
+ [stanza addTextNode:value];
+ [stanza up];
+ [stanza up];
}
}
View
@@ -19,13 +19,17 @@
*/
@import <Foundation/Foundation.j>
+@import <AppKit/CPImage.j>
@import "Resources/Strophe/strophe.js"
@import "Resources/Strophe/sha1.js"
@import "TNStropheConnection.j"
@import "TNStropheJID.j"
@import "TNStropheStanza.j"
+@global TNStropheContactStatusOffline
+@global TNStropheContactStatusOnline
+
TNStropheClientPasswordChangedNotification = @"TNStropheClientPasswordChangedNotification";
TNStropheClientPasswordChangeErrorNotification = @"TNStropheClientPasswordChangeErrorNotification";
@@ -292,7 +296,7 @@ TNStropheClientVCardReceivedNotification = @"TNStropheClientVCardReceived
if ([aStanza type] == @"result")
CPLog.debug("Publish succeeded!");
else
- CPLog.error("Cannot publish the pubsub item in node with name: " + _nodeName);
+ CPLog.error("Cannot publish the pubsub item:" + [aStanza stringValue]);
return NO;
}
@@ -497,8 +501,6 @@ TNStropheClientVCardReceivedNotification = @"TNStropheClientVCardReceived
_password = [aCoder decodeObjectForKey:@"_password"];
_delegate = [aCoder decodeObjectForKey:@"_delegate"];
_connection = [aCoder decodeObjectForKey:@"_connection"];
- _registeredHandlers = [aCoder decodeObjectForKey:@"_registeredHandlers"];
- _registeredTimedHandlers = [aCoder decodeObjectForKey:@"_registeredTimedHandlers"];
}
return self;
@@ -510,8 +512,6 @@ TNStropheClientVCardReceivedNotification = @"TNStropheClientVCardReceived
[aCoder encodeObject:_JID forKey:@"_JID"];
[aCoder encodeObject:_password forKey:@"_password"];
[aCoder encodeObject:_connection forKey:@"_connection"];
- [aCoder encodeObject:_registeredHandlers forKey:@"_registeredHandlers"];
- [aCoder encodeObject:_registeredTimedHandlers forKey:@"_registeredTimedHandlers"];
}
@end
View
@@ -703,7 +703,6 @@ TNStropheContactImageNewError = nil;
_statusIcon = [aCoder decodeObjectForKey:@"_statusIcon"];
_type = [aCoder decodeObjectForKey:@"_type"];
_vCard = [aCoder decodeObjectForKey:@"_vCard"];
- _messageQueue = [aCoder decodeObjectForKey:@"_messagesQueue"];
_numberOfEvents = [aCoder decodeObjectForKey:@"_numberOfEvents"];
}
View
@@ -20,6 +20,7 @@
@import <Foundation/Foundation.j>
+@global TNStropheRosterRosterDelimiter
/*!
@global
View
@@ -167,10 +167,6 @@
[super onStropheError:aConnection];
}
-@end
-
-@implementation TNStropheClient (CPCoding)
-
- (id)initWithCoder:(CPCoder)aCoder
{
self = [super initWithCoder:aCoder];
@@ -119,7 +119,7 @@ TNStropheServerAdministrationUnregisterUserNotification = @"TNStropheSer
[stanza addChildWithName:@"value"];
[stanza addTextNode:anAnnouncement];
- [_connection registerSelector:_didSendAnnouncement ofObject:self withDict:params];
+ [_connection registerSelector:@selector(_didSendAnnouncement:) ofObject:self withDict:params];
[_connection send:stanza];
}
View
@@ -23,7 +23,7 @@
@import "Resources/Strophe/strophe.js"
@import "Resources/Strophe/sha1.js"
-
+@import "TNStropheUtils.j"
/*! @ingroup strophecappuccino
This is an implementation of a really basic XML node in Cappuccino
@@ -157,7 +157,7 @@
{
if (_xmlNode.node && _xmlNode.node.parentNode)
{
- ret = _xmlNode.up();
+ _xmlNode.up();
return YES;
}
return NO;

0 comments on commit 2ca313b

Please sign in to comment.