Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update StropheCappuccino from roster branch of fork, use new BOSH ser…

…vice and update for TNStropheJID
  • Loading branch information...
commit b2c0e1d74ce10aba9d9f97933427469d35c26d16 1 parent 10b7b47
@benlangfeld authored
View
8 Controllers/AccountsController.j
@@ -276,7 +276,7 @@ RosterViewDragType = @"RosterViewDragType";
[[ManageAccountsController sharedController] showWindow:self];
}
-- (Account)accountWithJID:(CPString)aJID
+- (Account)accountWithJID:(TNStropheJID)aJID
{
for (var i = 0; i < [accounts count]; i++)
{
@@ -286,12 +286,12 @@ RosterViewDragType = @"RosterViewDragType";
}
}
-- (void)addAccountWithJID:(CPString)aJID andPassword:(CPString)aPassword
+- (void)addAccountWithJID:(TNStropheJID)aJID andPassword:(CPString)aPassword
{
[self addAccountWithJID:aJID andPassword:aPassword enabled:YES];
}
-- (void)addAccountWithJID:(CPString)aJID andPassword:(CPString)aPassword enabled:(BOOL)isEnabled
+- (void)addAccountWithJID:(TNStropheJID)aJID andPassword:(CPString)aPassword enabled:(BOOL)isEnabled
{
CPLog.debug("Adding account with JID " + aJID + " and password " + aPassword);
[self addAccount:[Account accountWithJID:aJID andPassword:aPassword enabled:isEnabled]];
@@ -305,7 +305,7 @@ RosterViewDragType = @"RosterViewDragType";
[anAccount connect];
}
-- (void)deleteAccountWithJID:(CPString)aJID
+- (void)deleteAccountWithJID:(TNStropheJID)aJID
{
[self deleteAccount:[self accountWithJID:aJID]];
[self reload];
View
2  Controllers/AddContactController.j
@@ -94,7 +94,7 @@
var groupName = [[groupPicker selectedItem] tag];
if (groupName === @"CreateNewGroup")
groupName = [groupNameField objectValue];
- [[account roster] addContact:[jidField objectValue] withName:[nameField objectValue] inGroupWithName:groupName];
+ [[account roster] addContact:[TNStropheJID stropheJIDWithString:[jidField objectValue]] withName:[nameField objectValue] inGroupWithName:groupName];
[self close];
}
View
2  Controllers/EditAccountController.j
@@ -61,7 +61,7 @@
- (@action)submit:(id)aSender
{
- [account editWithJID:[jidField objectValue] andPassword:[passwordField objectValue] changeRegistration:[changeRegistrationField objectValue] === 1];
+ [account editWithJID:[TNStropheJID stropheJIDWithString:[jidField objectValue]] andPassword:[passwordField objectValue] changeRegistration:[changeRegistrationField objectValue] === 1];
[self close];
}
View
2  Controllers/NewAccountController.j
@@ -52,7 +52,7 @@
- (@action)submit:(id)aSender
{
- [[AccountsController sharedController] addAccountWithJID:[jidField objectValue] andPassword:[passwordField objectValue]];
+ [[AccountsController sharedController] addAccountWithJID:[TNStropheJID stropheJIDWithString:[jidField objectValue]] andPassword:[passwordField objectValue]];
[self close];
}
View
2  Info.plist
@@ -9,6 +9,6 @@
<key>CPPrincipalClass</key>
<string>CPApplication</string>
<key>XMPPBOSHService</key>
- <string>http://im.studiotalker.com:5280/bosh</string>
+ <string>http://im.langfeld.me:5280/bosh</string>
</dict>
</plist>
2  Libraries/StropheCappuccino
@@ -1 +1 @@
-Subproject commit 102acbb4b9df2f8f873b976a30168ee22cf0a6f9
+Subproject commit d325a303e84d57ad04982b867a3f0dda97fd7b99
View
10 Models/Account.j
@@ -45,14 +45,14 @@ AccountConnectionStatusDidChangeNotification = @"AccountConnectionStatusDidCh
XMLConsoleController xmlConsoleController;
}
-+ (Account)accountWithJID:(CPString)aJID andPassword:(CPString)aPassword enabled:(BOOL)isEnabled
++ (Account)accountWithJID:(TNStropheJID)aJID andPassword:(CPString)aPassword enabled:(BOOL)isEnabled
{
return [[Account alloc] initWithJID:aJID andPassword:aPassword enabled:isEnabled];
}
-- (id)initWithJID:(CPString)aJID andPassword:(CPString)aPassword enabled:(BOOL)isEnabled
+- (id)initWithJID:(TNStropheJID)aJID andPassword:(CPString)aPassword enabled:(BOOL)isEnabled
{
- if (self = [super initWithService:BOSHService JID:aJID resource:nil password:aPassword])
+ if (self = [super initWithService:BOSHService JID:aJID password:aPassword])
{
enabled = isEnabled;
roster = [TNStropheRoster rosterWithConnection:self];
@@ -65,7 +65,7 @@ AccountConnectionStatusDidChangeNotification = @"AccountConnectionStatusDidCh
- (CPString)description
{
- return [self JID];
+ return [[self JID] full];
}
- (BOOL)onStropheConnecting:(id)aConnection
@@ -154,7 +154,7 @@ AccountConnectionStatusDidChangeNotification = @"AccountConnectionStatusDidCh
return editAccountController;
}
-- (void)editWithJID:(CPString)aJID andPassword:(CPString)aPassword changeRegistration:(BOOL)changeRegistration
+- (void)editWithJID:(TNStropheJID)aJID andPassword:(CPString)aPassword changeRegistration:(BOOL)changeRegistration
{
[self disconnect];
[self setJID:aJID];
Please sign in to comment.
Something went wrong with that request. Please try again.