Changeset 3785

Timestamp:

07/12/08 21:02:10 (4 months ago)

Author:

timothy

Message:

Merge the mcolloquy project from http://code.google.com/p/mcolloquy. With changes to work with the iPhone SDK.

Files:

• trunk/Chat Core/InterThreadMessaging.m (modified) (4 diffs)
• trunk/Chat Core/MVChatConnection.m (modified) (2 diffs)
• trunk/Colloquy.xcodeproj/project.pbxproj (modified) (4 diffs)
• trunk/Mobile (added)
• trunk/Mobile Colloquy.xcodeproj (added)
• trunk/Mobile Colloquy.xcodeproj/project.pbxproj (added)
• trunk/Mobile/ChatCore (added)
• trunk/Mobile/Controllers (added)
• trunk/Mobile/Controllers/CQChatController.h (added)
• trunk/Mobile/Controllers/CQChatController.m (added)
• trunk/Mobile/Controllers/CQChatRoomController.h (added)
• trunk/Mobile/Controllers/CQChatRoomController.m (added)
• trunk/Mobile/Controllers/CQChatsViewController.h (added)
• trunk/Mobile/Controllers/CQChatsViewController.m (added)
• trunk/Mobile/Controllers/CQColloquyApplication.h (added)
• trunk/Mobile/Controllers/CQColloquyApplication.m (added)
• trunk/Mobile/Controllers/CQConnectionCreationViewController.h (added)
• trunk/Mobile/Controllers/CQConnectionCreationViewController.m (added)
• trunk/Mobile/Controllers/CQConnectionEditViewController.h (added)
• trunk/Mobile/Controllers/CQConnectionEditViewController.m (added)
• trunk/Mobile/Controllers/CQConnectionsController.h (added)
• trunk/Mobile/Controllers/CQConnectionsController.m (added)
• trunk/Mobile/Controllers/CQConnectionsViewController.h (added)
• trunk/Mobile/Controllers/CQConnectionsViewController.m (added)
• trunk/Mobile/Controllers/CQDirectChatController.h (added)
• trunk/Mobile/Controllers/CQDirectChatController.m (added)
• trunk/Mobile/Mobile Colloquy.pch (added)
• trunk/Mobile/Resources (added)
• trunk/Mobile/Resources/Colloquy.xib (added)
• trunk/Mobile/Resources/ConnectionEdit.xib (added)
• trunk/Mobile/Resources/ConnectionsView.xib (added)
• trunk/Mobile/Resources/Default.png (added)
• trunk/Mobile/Resources/Defaults.plist (added)
• trunk/Mobile/Resources/Info.plist (added)
• trunk/Mobile/Resources/base.html (added)
• trunk/Mobile/Resources/buddies.png (added)
• trunk/Mobile/Resources/colloquies.png (added)
• trunk/Mobile/Resources/connectedBadgeDim.png (added)
• trunk/Mobile/Resources/connectedBadgeGlow.png (added)
• trunk/Mobile/Resources/connectingBadgeDim.png (added)
• trunk/Mobile/Resources/connectingBadgeGlow.png (added)
• trunk/Mobile/Resources/connections.png (added)
• trunk/Mobile/Resources/directChatIcon.png (added)
• trunk/Mobile/Resources/errorBadgeDim.png (added)
• trunk/Mobile/Resources/errorBadgeGlow.png (added)
• trunk/Mobile/Resources/gradientHighlight.png (added)
• trunk/Mobile/Resources/icon.png (added)
• trunk/Mobile/Resources/members.png (added)
• trunk/Mobile/Resources/roomIcon.png (added)
• trunk/Mobile/Resources/server.png (added)
• trunk/Mobile/Resources/standard.css (added)
• trunk/Mobile/Resources/user-admin.png (added)
• trunk/Mobile/Resources/user-founder.png (added)
• trunk/Mobile/Resources/user-half-op.png (added)
• trunk/Mobile/Resources/user-normal.png (added)
• trunk/Mobile/Resources/user-op.png (added)
• trunk/Mobile/Resources/user-super-op.png (added)
• trunk/Mobile/Resources/user-voice.png (added)
• trunk/Mobile/Views (added)
• trunk/Mobile/Views/CQChatInputField.h (added)
• trunk/Mobile/Views/CQChatInputField.m (added)
• trunk/Mobile/Views/CQChatTableCell.h (added)
• trunk/Mobile/Views/CQChatTableCell.m (added)
• trunk/Mobile/Views/CQConnectionTableCell.h (added)
• trunk/Mobile/Views/CQConnectionTableCell.m (added)
• trunk/Mobile/Views/CQInputBarView.h (added)
• trunk/Mobile/Views/CQInputBarView.m (added)
• trunk/Mobile/Views/CQPreferencesTextCell.h (added)
• trunk/Mobile/Views/CQPreferencesTextCell.m (added)
• trunk/Mobile/Views/CQStyleView.h (added)
• trunk/Mobile/Views/CQStyleView.m (added)
• trunk/Mobile/main.m (added)

trunk/Chat Core/InterThreadMessaging.m

@@ -22 +22 @@
-}
-
-ASPEN) || !TARGET_OS_ASPEN
+IPHONE) || !TARGET_OS_IPHONE
-
-#import <pthread.h>
@@ -82 +82 @@
-@implementation NSThread (InterThreadMessaging)
-+ (void) prepareForInterThreadMessages {
-ASPEN) || !TARGET_OS_ASPEN
+IPHONE) || !TARGET_OS_IPHONE
-        if(useSystemThreadPerformSelector())
-                return;
@@ -91 +91 @@
-@end
-
-ASPEN) || !TARGET_OS_ASPEN
+IPHONE) || !TARGET_OS_IPHONE
-
-@implementation InterThreadManager
@@ -135 +135 @@
-        }
-
-ASPEN
+IPHONE
-        InterThreadMessage *msg = (InterThreadMessage *)malloc(sizeof(struct InterThreadMessage));
-        bzero(msg, sizeof(struct InterThreadMessage));

trunk/Chat Core/MVChatConnection.m

@@ -140 +140 @@
-                _localUser = nil;
-
-ASPEN) || !TARGET_OS_ASPEN
+IPHONE) || !TARGET_OS_IPHONE
-                [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector( _systemDidWake: ) name:NSWorkspaceDidWakeNotification object:[NSWorkspace sharedWorkspace]];
-                [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector( _systemWillSleep: ) name:NSWorkspaceWillSleepNotification object:[NSWorkspace sharedWorkspace]];
@@ -235 +235 @@
-        [[NSNotificationCenter defaultCenter] removeObserver:self];
-
-ASPEN) || !TARGET_OS_ASPEN
+IPHONE) || !TARGET_OS_IPHONE
-        [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
-#endif

trunk/Colloquy.xcodeproj/project.pbxproj

@@ -641 +641 @@
-                1C9982050603F097006C6417 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Languages/English.lproj/JVNotificationPreferences.nib; sourceTree = "<group>"; };
-                1C9982AC0604BA1F006C6417 /* sound.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = sound.png; path = Resources/sound.png; sourceTree = "<group>"; };
-
+plist.
-                1C9D85190C9869DD00BB6C58 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Japanese; path = Languages/Japanese.lproj/Credits.rtf; sourceTree = "<group>"; };
-                1C9D851E0C9869F000BB6C58 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Japanese; path = Languages/Japanese.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -694 +694 @@
-                1C9D855B0C986A2C00BB6C58 /* nb */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = nb; path = Languages/nb.lproj/MVSoftwareUpdate.nib; sourceTree = "<group>"; };
-                1C9D855C0C986A2C00BB6C58 /* nb */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = nb; path = Languages/nb.lproj/TSCustomBan.nib; sourceTree = "<group>"; };
-
+plist.
-                1CA7CA6305FEC88500887614 /* activity.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = activity.png; path = "Resources/Toolbar Icons/activity.png"; sourceTree = "<group>"; };
-                1CA7CA6405FEC88500887614 /* activityNew.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = activityNew.png; path = "Resources/Toolbar Icons/activityNew.png"; sourceTree = "<group>"; };
@@ -1009 +1009 @@
-                CBF685300820190D00F498FB /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = schema.strings; sourceTree = "<group>"; };
-                CBF685310820190D00F498FB /* GetMetadataForFile.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 30; name = GetMetadataForFile.m; path = Importer/GetMetadataForFile.m; sourceTree = "<group>"; };
-
+plist.
-                CBF685330820190D00F498FB /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = main.c; path = Importer/main.c; sourceTree = "<group>"; };
-                CBF685340820190D00F498FB /* schema.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = schema.xml; path = Importer/schema.xml; sourceTree = "<group>"; };
@@ -1049 +1049 @@
-                F599994901890E4601EE70DE /* MVTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MVTextView.m; path = Views/MVTextView.m; sourceTree = "<group>"; };
-                F599994A01890E4601EE70DE /* MVTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVTextView.h; path = Views/MVTextView.h; sourceTree = "<group>"; };
-
+plist.
-                F5BC17DF019656E901A35792 /* info.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = info.png; path = Resources/info.png; sourceTree = "<group>"; };
-                F5BEC20D01F1EF1901EE70DE /* admin.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = admin.png; path = Resources/admin.png; sourceTree = "<group>"; };