Navigation

← Previous Changeset
Next Changeset →

Changeset 3041

Timestamp:

11/05/05 23:08:40 (3 years ago)

Author:

timothy

Message:

First step in switching from cc.javelin.colloquy to info.colloquy. I have renamed the bundle identifiers and file UTIs. On launch Colloquy will check and move your old preferences file the first time.

Files:

trunk/Colloquy.xcodeproj/project.pbxproj (modified) (5 diffs)
trunk/Importer/Info.plist (modified) (2 diffs)
trunk/Importer/schema.xml (modified) (1 diff)
trunk/Resources/Info-ChatCore.plist (modified) (1 diff)
trunk/Resources/Info-StandardCommands.plist (modified) (1 diff)
trunk/Resources/Info.plist (modified) (11 diffs)
trunk/Resources/info.colloquy.plist (copied) (copied from trunk/Resources/cc.javelin.colloquy.plist)
trunk/main.m (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/Colloquy.xcodeproj/project.pbxproj

r3032	r3041
114	114	1CB2CD13052DDC560094AAA4 /* voice.tif in Resources / = {isa = PBXBuildFile; fileRef = F544999F018E46CB01EE70DE / voice.tif */; };
115	115	1CB2CD17052DDC560094AAA4 /* encoding.tif in Resources / = {isa = PBXBuildFile; fileRef = F5D04C03019489B801A35792 / encoding.tif */; };
116		1CB2CD18052DDC560094AAA4 /* ~~cc.javelin.colloquy.plist in Resources / = {isa = PBXBuildFile; fileRef = F5BC17DD019655DC01A35792 / cc.javelin~~.colloquy.plist */; };
	116	1CB2CD18052DDC560094AAA4 /* info.colloquy.plist in Resources / = {isa = PBXBuildFile; fileRef = F5BC17DD019655DC01A35792 / info.colloquy.plist */; };
117	117	1CB2CD19052DDC560094AAA4 /* info.tif in Resources / = {isa = PBXBuildFile; fileRef = F5BC17DF019656E901A35792 / info.tif */; };
118	118	1CB2CD1A052DDC560094AAA4 /* download.tif in Resources / = {isa = PBXBuildFile; fileRef = F51A4F3101C2ED2C01EE70DE / download.tif */; };
…	…
601	601	1CABFD0C0658629200801C15 /* JVStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JVStyle.h; sourceTree = "<group>"; };
602	602	1CABFD0D0658629200801C15 /* JVStyle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JVStyle.m; sourceTree = "<group>"; };
603		1CB2CD8C052DDC570094AAA4 /* Colloquy.app */ = {isa = PBXFileReference; ~~includeInIndex = 0; lastKnownFileType = wrapper.application~~; path = Colloquy.app; sourceTree = BUILT_PRODUCTS_DIR; };
	603	1CB2CD8C052DDC570094AAA4 /* Colloquy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Colloquy.app; sourceTree = BUILT_PRODUCTS_DIR; };
604	604	1CB3716F060CC7E200F6A81F /* KABubbleWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KABubbleWindowController.h; sourceTree = "<group>"; };
605	605	1CB37170060CC7E200F6A81F /* KABubbleWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KABubbleWindowController.m; sourceTree = "<group>"; };
…	…
901	901	F5A6089B0197A3BB01A35792 /* magic.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = magic.tif; path = "Resources/Toolbar Icons/magic.tif"; sourceTree = "<group>"; };
902	902	F5B425E9038C056701000102 /* edit.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = edit.tif; path = "Resources/Toolbar Icons/edit.tif"; sourceTree = SOURCE_ROOT; };
903		F5BC17DD019655DC01A35792 /* ~~cc.javelin.colloquy.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; name = cc.javelin.colloquy.plist; path = Resources/cc.javelin~~.colloquy.plist; sourceTree = "<group>"; };
	903	F5BC17DD019655DC01A35792 /* info.colloquy.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = info.colloquy.plist; path = Resources/info.colloquy.plist; sourceTree = "<group>"; };
904	904	F5BC17DF019656E901A35792 /* info.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = info.tif; path = Resources/info.tif; sourceTree = "<group>"; };
905	905	F5BEC20701F13A8601EE70DE /* person-idle.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "person-idle.tif"; path = "Resources/person-idle.tif"; sourceTree = "<group>"; };
…	…
1468	1468	F5394C090378E44D01A35792 /* InfoPlist.strings */,
1469	1469	F5394C0B0378E44D01A35792 /* Localizable.strings */,
1470		F5BC17DD019655DC01A35792 /* ~~cc.javelin~~.colloquy.plist */,
	1470	F5BC17DD019655DC01A35792 /* info.colloquy.plist */,
1471	1471	1CBECDCF0508C8AB000001C8 /* default.xsl */,
1472	1472	0A5B683E0810EC9700398D5A /* default.css */,
…	…
1974	1974	1CB2CD13052DDC560094AAA4 /* voice.tif in Resources */,
1975	1975	1CB2CD17052DDC560094AAA4 /* encoding.tif in Resources */,
1976		1CB2CD18052DDC560094AAA4 /* ~~cc.javelin~~.colloquy.plist in Resources */,
	1976	1CB2CD18052DDC560094AAA4 /* info.colloquy.plist in Resources */,
1977	1977	1CB2CD19052DDC560094AAA4 /* info.tif in Resources */,
1978	1978	1CB2CD1A052DDC560094AAA4 /* download.tif in Resources */,

trunk/Importer/Info.plist

r2672	r3041
12	12	<key>LSItemContentTypes</key>
13	13	<array>
14		<string>~~cc.javelin.colloquy.colloquy~~transcript</string>
	14	<string>info.colloquy.transcript</string>
15	15	</array>
16	16	</dict>
…	…
23	23	<string></string>
24	24	<key>CFBundleIdentifier</key>
25		<string>~~cc.javelin.colloquyI~~mporter</string>
	25	<string>info.colloquy.metadata-importer</string>
26	26	<key>CFBundleInfoDictionaryVersion</key>
27	27	<string>6.0</string>

trunk/Importer/schema.xml

r2578	r3041
1	1	<?xml version="1.0" encoding="UTF-8"?>
2	2	<schema version="1.0" xmlns="http://www.apple.com/metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.apple.com/metadata file:///System/Library/Frameworks/CoreServices.framework/Frameworks/Metadata.framework/Resources/MetadataSchema.xsd">
3		<note>
4		Schema for additional attributes supplied by the Colloquy importer.
5		</note>
6
	3	<note>Schema for additional attributes supplied by the Colloquy importer.</note>
7	4	<types>
8		<type name="~~cc.javelin.colloquy.colloquy~~transcript">
	5	<type name="info.colloquy.transcript">
9	6	<allattrs>
10	7	kMDItemTitle

trunk/Resources/Info-ChatCore.plist

r2185	r3041
14	14	<string></string>
15	15	<key>CFBundleIdentifier</key>
16		<string>~~cc.javelin~~.chatCore</string>
	16	<string>info.colloquy.chatCore</string>
17	17	<key>CFBundleInfoDictionaryVersion</key>
18	18	<string>6.0</string>

trunk/Resources/Info-StandardCommands.plist

r2185	r3041
14	14	<string></string>
15	15	<key>CFBundleIdentifier</key>
16		<string>~~cc.javelin~~.colloquy.standard-commands</string>
	16	<string>info.colloquy.standard-commands</string>
17	17	<key>CFBundleInfoDictionaryVersion</key>
18	18	<string>6.0</string>

trunk/Resources/Info.plist

r3007	r3041
16	16	<string>Generic.icns</string>
17	17	<key>CFBundleTypeName</key>
18		<string>Chat Style</string>
	18	<string>Chat style</string>
19	19	<key>CFBundleTypeOSTypes</key>
20	20	<array>
…	…
23	23	<key>CFBundleTypeRole</key>
24	24	<string>None</string>
25		~~<key>LSItemContentTypes</key>~~
26		~~<array>~~
27		~~<string>cc.javelin.colloquy.colloquystyle</string>~~
28		~~</array>~~
29	25	<key>LSTypeIsPackage</key>
30	26	<true/>
…	…
39	35	<string>Generic.icns</string>
40	36	<key>CFBundleTypeName</key>
41		<string>Chat Emoticons</string>
	37	<string>Chat emoticons</string>
42	38	<key>CFBundleTypeOSTypes</key>
43	39	<array>
…	…
46	42	<key>CFBundleTypeRole</key>
47	43	<string>None</string>
48		~~<key>LSItemContentTypes</key>~~
49		~~<array>~~
50		~~<string>cc.javelin.colloquy.colloquyemoticons</string>~~
51		~~</array>~~
52	44	<key>LSTypeIsPackage</key>
53	45	<true/>
…	…
66	58	</array>
67	59	<key>CFBundleTypeName</key>
68		<string>Chat Transcript</string>
	60	<string>Chat transcript</string>
69	61	<key>CFBundleTypeOSTypes</key>
70	62	<array>
…	…
73	65	<key>CFBundleTypeRole</key>
74	66	<string>Viewer</string>
75		~~<key>LSItemContentTypes</key>~~
76		~~<array>~~
77		~~<string>cc.javelin.colloquy.colloquytranscript</string>~~
78		~~</array>~~
79	67	</dict>
80	68	</array>
…	…
86	74	<string>Colloquy</string>
87	75	<key>CFBundleIdentifier</key>
88		<string>~~cc.javelin~~.colloquy</string>
	76	<string>info.colloquy</string>
89	77	<key>CFBundleInfoDictionaryVersion</key>
90	78	<string>6.0</string>
…	…
138	126	</array>
139	127	<key>UTTypeDescription</key>
140		<string>Chat Style</string>
	128	<string>Chat style</string>
141	129	<key>UTTypeIconFile</key>
142	130	<string>Generic.icns</string>
143	131	<key>UTTypeIdentifier</key>
144		<string>~~cc.javelin.colloquy.colloquy~~style</string>
	132	<string>info.colloquy.style</string>
145	133	<key>UTTypeReferenceURL</key>
146		<string>http://~~www.colloquy.info/~~</string>
	134	<string>http://colloquy.info</string>
147	135	<key>UTTypeTagSpecification</key>
148	136	<dict>
…	…
162	150	</array>
163	151	<key>UTTypeDescription</key>
164		<string>Chat Emoticons</string>
	152	<string>Chat emoticons</string>
165	153	<key>UTTypeIconFile</key>
166	154	<string>Generic.icns</string>
167	155	<key>UTTypeIdentifier</key>
168		<string>~~cc.javelin.colloquy.colloquy~~emoticons</string>
	156	<string>info.colloquy.emoticons</string>
169	157	<key>UTTypeReferenceURL</key>
170		<string>http://~~www.colloquy.info/~~</string>
	158	<string>http://colloquy.info</string>
171	159	<key>UTTypeTagSpecification</key>
172	160	<dict>
…	…
183	171	<key>UTTypeConformsTo</key>
184	172	<array>
	173	<string>public.data</string>
185	174	<string>public.xml</string>
186	175	</array>
187	176	<key>UTTypeDescription</key>
188		<string>Chat Transcript</string>
	177	<string>Chat transcript</string>
189	178	<key>UTTypeIconFile</key>
190	179	<string>Generic.icns</string>
191	180	<key>UTTypeIdentifier</key>
192		<string>~~cc.javelin.colloquy.colloquy~~transcript</string>
	181	<string>info.colloquy.transcript</string>
193	182	<key>UTTypeReferenceURL</key>
194		<string>http://~~www.colloquy.info/~~</string>
	183	<string>http://colloquy.info</string>
195	184	<key>UTTypeTagSpecification</key>
196	185	<dict>
…	…
202	191	<string>colloquytranscript</string>
203	192	</array>
	193	<key>public.mime-type</key>
	194	<array>
	195	<string>application/x-colloquy-transcript</string>
	196	<string>application/xml</string>
	197	</array>
204	198	</dict>
205	199	</dict>

trunk/main.m

r2950	r3041
10	10	xmlLoadExtDtdDefaultValue = 1;
11	11
	12	NSAutoreleasePool *pool = [[NSAutoreleasePool allocWithZone:nil] init];
	13
	14	NSString *newPreferencesPath = [@"~/Library/Preferences/info.colloquy.plist" stringByExpandingTildeInPath];
	15	if( ! [[NSFileManager defaultManager] fileExistsAtPath:newPreferencesPath] ) {
	16	NSString *oldPreferencesPath = [@"~/Library/Preferences/cc.javelin.colloquy.plist" stringByExpandingTildeInPath];
	17	[[NSFileManager defaultManager] movePath:oldPreferencesPath toPath:newPreferencesPath handler:nil];
	18	}
	19
	20	[pool release];
	21
12	22	int ret = NSApplicationMain( count, arg );
13	23