Navigation

Changeset 3797

Timestamp:

07/28/08 01:00:09 (4 months ago)

Author:

timothy

Message:

Make the connections show up, instead of a blank screen.

Files:

r3785	r3797
11	11	#import <ChatCore/MVDirectChatConnection.h>
12	12
13		~~static CQChatController *sharedInstance = nil;~~
14
15	13	@implementation CQChatController
16	14	+ (CQChatController *) defaultController {
17		return ( sharedInstance ? sharedInstance : ( sharedInstance = [[self alloc] init] ) );
	15	static BOOL creatingSharedInstance = NO;
	16	static CQChatController *sharedInstance = nil;
	17
	18	if( !sharedInstance && !creatingSharedInstance ) {
	19	creatingSharedInstance = YES;
	20	sharedInstance = [[self alloc] init];
	21	}
	22
	23	return sharedInstance;
18	24	}
19	25
…	…
25	31	_chatControllers = [[NSMutableArray alloc] init];
26	32
27		UITabBarItem *tabBarItem = [[UITabBarItem alloc] initWithTitle:NSLocalizedString(@"Colloquies", @"Colloquies tab title") image:[UIImage imageNamed:@"colloquies.png"] tag:1];
28		self.tabBarItem = tabBarItem;
29		[tabBarItem release];
	33	self.title = NSLocalizedString(@"Colloquies", @"Colloquies tab title");
	34	self.tabBarItem.image = [UIImage imageNamed:@"colloquies.png"];
30	35
31	36	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_joinedRoom:) name:MVChatRoomJoinedNotification object:nil];

r3785	r3797
11	11	@end
12	12
13		~~static CQConnectionsController *sharedInstance = nil;~~
14
15	13	@implementation CQConnectionsController
16	14	+ (CQConnectionsController *) defaultController {
17		if( ! sharedInstance ) {
18		sharedInstance = [self alloc];
19		sharedInstance = [sharedInstance init];
	15	static BOOL creatingSharedInstance = NO;
	16	static CQConnectionsController *sharedInstance = nil;
	17
	18	if( !sharedInstance && !creatingSharedInstance ) {
	19	creatingSharedInstance = YES;
	20	sharedInstance = [[self alloc] init];
20	21	}
21	22
…	…
29	30	_connections = [[NSMutableArray alloc] init];
30	31
31		UITabBarItem *tabBarItem = [[UITabBarItem alloc] initWithTitle:NSLocalizedString(@"Connections", @"Connections tab title") image:[UIImage imageNamed:@"connections.png"] tag:0];
32		self.tabBarItem = tabBarItem;
33		[tabBarItem release];
	32	self.title = NSLocalizedString(@"Connections", @"Connections tab title");
	33	self.tabBarItem.image = [UIImage imageNamed:@"connections.png"];
34	34
35	35	[self _loadConnectionList];

r3785	r3797
12	12
13	13	self.title = NSLocalizedString(@"Connections", @"Connections view title");
14
15		~~for( MVChatConnection *connection in [CQConnectionsController defaultController].connections )~~
16		~~[self addConnection:connection];~~
17	14
18	15	return self;
…	…
34	31
35	32	self.navigationItem.rightBarButtonItem = self.editButtonItem;
	33
	34	for( MVChatConnection *connection in [CQConnectionsController defaultController].connections )
	35	[self addConnection:connection];
36	36	}
37	37

r3785	r3797
29	29	<key>UIPrerenderedIcon</key>
30	30	<true/>
	31	<key>UIRequiresPersistentWiFi</key>
	32	<true/>
31	33	</dict>
32	34	</plist>