adium 5786:05c1ab81dc44: Merged adium-1.6 into libotr4.0.0.
commits at adium.im
commits at adium.im
Thu Dec 5 18:00:18 UTC 2013
details: http://hg.adium.im/adium/rev/05c1ab81dc44
revision: 5786:05c1ab81dc44
branch: libotr4.0.0
author: Thijs Alkemade <me at thijsalkema.de>
date: Thu Dec 05 18:59:37 2013 +0100
Merged adium-1.6 into libotr4.0.0.
diffs (truncated from 300117 to 1000 lines):
diff -r 5ea2fa81c505 -r 05c1ab81dc44 .hgtags
--- a/.hgtags Thu Dec 05 18:17:08 2013 +0100
+++ b/.hgtags Thu Dec 05 18:59:37 2013 +0100
@@ -1,11 +1,9 @@
4151ac3a3b1f9847b8d958f1c7d57a345d442266 1.5
64b4f46272118a2d4d721123fbcb9f485913ff35 1.5.1
-8d4ed0d28f89a09c3deb3b4b1952e21cd4a5e563 1.5.2
-c436f536180fc12b1c2f70ae31e29a2b32b4529f 1.5.4
-5efcd11df6947cf82c763a8024229d5a326d9c56 adium-1.5.4
-0000000000000000000000000000000000000000 adium-1.5.4
+80cc358134ea0f681484626ec447d8bf3a27692f 1.5.2
+c9b03688370c2887d956130319c8da537354d373 1.5.3
+5efcd11df6947cf82c763a8024229d5a326d9c56 1.5.4
+fc2294917bf61da7cf8c1560db443fe29e2acfb8 1.5.5
90a171a6b0fc033ebeba46112223e20fcee0a004 1.5.6
-fc2294917bf61da7cf8c1560db443fe29e2acfb8 1.5.5
a40ffe152e617ebb603ce3c6677eef0ce00cb1ad 1.5.7
-a40ffe152e617ebb603ce3c6677eef0ce00cb1ad 1.5.7
-c72b164f75a705caf2b01853be031399d10c254e 1.5.7
+e0467f507718cd8acdbf5a0793d0152d5bac2aba 1.5.8
diff -r 5ea2fa81c505 -r 05c1ab81dc44 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Thu Dec 05 18:17:08 2013 +0100
+++ b/Adium.xcodeproj/project.pbxproj Thu Dec 05 18:59:37 2013 +0100
@@ -193,8 +193,6 @@
318EA69C0D7A659900EDB105 /* TestColorAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 318EA69B0D7A659900EDB105 /* TestColorAdditions.m */; };
319B29800CE8EC6F00C65398 /* TestDateAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 319B297F0CE8EC6E00C65398 /* TestDateAdditions.m */; };
31A764B90DA572B8000AC729 /* AutoHyperlinks.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3496A8EA07CE6CA30055BBAB /* AutoHyperlinks.framework */; };
- 31DDDA7112BDD5CE0048F6C0 /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; };
- 31DDDA7A12BDD6E90048F6C0 /* TestScandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA7912BDD6E90048F6C0 /* TestScandate.m */; };
31E0CD810C5EEF5200271DB1 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 31E0CD800C5EEF5200271DB1 /* CoreAudio.framework */; };
31FA804C0D4A8EB200ABE634 /* Adium.sdef in Resources */ = {isa = PBXBuildFile; fileRef = 0CAC6A130C0C657A0090AE95 /* Adium.sdef */; };
3402D5A5080DBC91004E50B4 /* SortConfiguration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 347E791D07CAA52300350507 /* SortConfiguration.xib */; };
@@ -226,7 +224,6 @@
3419DE7D0A81042F00C3FC68 /* lock-unlocked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF52607A62EB000B92233 /* lock-unlocked.tiff */; };
3419DE7F0A81042F00C3FC68 /* msg-send-file.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326307CBD598006466F2 /* msg-send-file.tiff */; };
3419DE820A81042F00C3FC68 /* ToolbarPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8327607CBD5B3006466F2 /* ToolbarPrefs.plist */; };
- 3419DF3B0A8119BF00C3FC68 /* AICalendarDate.m in Sources */ = {isa = PBXBuildFile; fileRef = 340D0A000A7DD1F40059A3AF /* AICalendarDate.m */; };
3419E2DF0A81445800C3FC68 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3419E2DE0A81445800C3FC68 /* Localizable.strings */; };
3419F7760531512200C68BA3 /* Adium.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34BD9DE105314751000AB133 /* Adium.framework */; };
3419FE230531586A00C68BA3 /* Adium.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34BD9DE105314751000AB133 /* Adium.framework */; };
@@ -1025,6 +1022,8 @@
5A1E3A1214DCE60400724574 /* Preferences-Xtras.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1E3A1114DCE60400724574 /* Preferences-Xtras.xib */; };
5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.xib */; };
5A27FA7E14A272330063489D /* pref-messagestyle.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7A14A272330063489D /* pref-messagestyle.png */; };
+ 5A2FF9B81797336100C2EF12 /* crashDuck.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5A72C1A117013D9400075BBA /* crashDuck.icns */; };
+ 5A2FF9BD1797351500C2EF12 /* AICrashReporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A72C1AD17013D9400075BBA /* AICrashReporter.m */; };
5A3B4D7916D878AC00903E40 /* NSString+STTwitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A3B4D6C16D878AB00903E40 /* NSString+STTwitter.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
5A3B4D7A16D878AC00903E40 /* STTwitterAPIWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A3B4D6E16D878AB00903E40 /* STTwitterAPIWrapper.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
5A3B4D7C16D878AC00903E40 /* STTwitterOAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A3B4D7216D878AB00903E40 /* STTwitterOAuth.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
@@ -1052,19 +1051,21 @@
5A6298DF1682BD9100F51DED /* AIAdvancedPreferencePane.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1E24A815BC746B003A6F9E /* AIAdvancedPreferencePane.m */; };
5A6298E31682BD9D00F51DED /* AIAdvancedPreferencePane.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A1E24A715BC746B003A6F9E /* AIAdvancedPreferencePane.h */; settings = {ATTRIBUTES = (Public, ); }; };
5A799674133C3D6F0005AC6A /* MessageView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1FEA601334549300C14951 /* MessageView.xib */; };
- 5A804FEA12BE9E84007CDC1B /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; };
- 5A80508512BE9F00007CDC1B /* scandate.m in Sources */ = {isa = PBXBuildFile; fileRef = 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */; };
- 5A8F637614DD1B21008412C8 /* Preferences-Privacy.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A8F637514DD1B21008412C8 /* Preferences-Privacy.xib */; };
5A94397B1279ECB800FDD81D /* AIImgurImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A94397A1279ECB800FDD81D /* AIImgurImageUploader.m */; };
5A9A9F8911F2951400328DF9 /* AIDoNothingContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8811F2951400328DF9 /* AIDoNothingContactAlertPlugin.m */; };
5A9A9F8B11F295EB00328DF9 /* events-do-nothing.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 5A9A9F8A11F295EB00328DF9 /* events-do-nothing.tiff */; };
5AA2A0EE14B3EFF500B4DB65 /* AIOSCompatibility.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AA2A0ED14B3EFF500B4DB65 /* AIOSCompatibility.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 5AC423F3178CBD5100F5911A /* ChatCyclingDefaults-Old.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */; };
+ 5AC423F7178CBD5700F5911A /* ChatCyclingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */; };
5ACA086A17873AEA00B15047 /* AIButtonWithCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACA086817873AEA00B15047 /* AIButtonWithCursor.h */; settings = {ATTRIBUTES = (Public, ); }; };
5ACA086B17873AEA00B15047 /* AIButtonWithCursor.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACA086917873AEA00B15047 /* AIButtonWithCursor.m */; };
5ACF27391392C74A004B6AEF /* AIHighlightingTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACF27351392C74A004B6AEF /* AIHighlightingTextField.h */; };
5ACF273A1392C74A004B6AEF /* AIHighlightingTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACF27361392C74A004B6AEF /* AIHighlightingTextField.m */; };
5ACF273B1392C74A004B6AEF /* AIPreferenceCollectionView.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACF27371392C74A004B6AEF /* AIPreferenceCollectionView.h */; };
5ACF273C1392C74A004B6AEF /* AIPreferenceCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACF27381392C74A004B6AEF /* AIPreferenceCollectionView.m */; };
+ 5AD04C2C1821E8D3009801F8 /* ISO8601DateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AD04C2A1821E8D3009801F8 /* ISO8601DateFormatter.m */; };
+ 5AD04C2D1821E8D3009801F8 /* ISO8601DateFormatter.h in Headers */ = {isa = PBXBuildFile; fileRef = 5AD04C2B1821E8D3009801F8 /* ISO8601DateFormatter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 5AD04C311821E910009801F8 /* ISO8601DateFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AD04C2A1821E8D3009801F8 /* ISO8601DateFormatter.m */; };
5ADFFE5D133846C300069C1B /* keys.png in Resources */ = {isa = PBXBuildFile; fileRef = 5ADFFE5C133846C300069C1B /* keys.png */; };
5AEE60011602BAE200304672 /* AIBoolToControlTextColorTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 979AA6A614D59DC8008730DF /* AIBoolToControlTextColorTransformer.m */; };
6311F4710E340DD2004234B8 /* AISharedAdium.h in Headers */ = {isa = PBXBuildFile; fileRef = 6311F46F0E340DD2004234B8 /* AISharedAdium.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1258,10 +1259,6 @@
633400BC0F9C14C2003C77A9 /* AIWindowAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFF10F9C14C1003C77A9 /* AIWindowAdditions.m */; };
633400BF0F9C14C2003C77A9 /* OWAddressBookAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFF40F9C14C1003C77A9 /* OWAddressBookAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
633400C00F9C14C2003C77A9 /* OWAddressBookAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFF50F9C14C1003C77A9 /* OWAddressBookAdditions.m */; };
- 633400C10F9C14C2003C77A9 /* NSCalendarDate+ISO8601Parsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFF60F9C14C1003C77A9 /* NSCalendarDate+ISO8601Parsing.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 633400C20F9C14C2003C77A9 /* NSCalendarDate+ISO8601Parsing.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFF70F9C14C1003C77A9 /* NSCalendarDate+ISO8601Parsing.m */; };
- 633400C30F9C14C2003C77A9 /* NSCalendarDate+ISO8601Unparsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFF80F9C14C1003C77A9 /* NSCalendarDate+ISO8601Unparsing.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 633400C40F9C14C2003C77A9 /* NSCalendarDate+ISO8601Unparsing.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFF90F9C14C1003C77A9 /* NSCalendarDate+ISO8601Unparsing.m */; };
633400C50F9C14C2003C77A9 /* AIWindowControllerAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFFA0F9C14C1003C77A9 /* AIWindowControllerAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
633400C60F9C14C2003C77A9 /* AIWindowControllerAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFFB0F9C14C1003C77A9 /* AIWindowControllerAdditions.m */; };
633400C70F9C14C2003C77A9 /* AIPasteboardAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFFC0F9C14C1003C77A9 /* AIPasteboardAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1285,7 +1282,6 @@
633D4FB70F9D30E3004F491E /* GetMetadataForFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 633D4FB10F9D30E3004F491E /* GetMetadataForFile.m */; };
633D4FB80F9D30E3004F491E /* GetMetadataForHTMLLog.m in Sources */ = {isa = PBXBuildFile; fileRef = 633D4FB30F9D30E3004F491E /* GetMetadataForHTMLLog.m */; };
633D4FB90F9D30E3004F491E /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 633D4FB40F9D30E3004F491E /* main.c */; };
- 633D4FBE0F9D30FA004F491E /* NSCalendarDate+ISO8601Parsing.m in Sources */ = {isa = PBXBuildFile; fileRef = 633D4FBD0F9D30FA004F491E /* NSCalendarDate+ISO8601Parsing.m */; };
633D4FC20F9D3116004F491E /* schema.xml in Resources */ = {isa = PBXBuildFile; fileRef = 633D4FC00F9D3116004F491E /* schema.xml */; };
633D514F0F9D31BE004F491E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 633D50ED0F9D31BD004F491E /* InfoPlist.strings */; };
633D51500F9D31BE004F491E /* schema.strings in Resources */ = {isa = PBXBuildFile; fileRef = 633D50EF0F9D31BD004F491E /* schema.strings */; };
@@ -2016,10 +2012,6 @@
318EA69B0D7A659900EDB105 /* TestColorAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestColorAdditions.m; path = UnitTests/TestColorAdditions.m; sourceTree = "<group>"; };
319B29420CE8D28300C65398 /* TestDateAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestDateAdditions.h; path = UnitTests/TestDateAdditions.h; sourceTree = "<group>"; };
319B297F0CE8EC6E00C65398 /* TestDateAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestDateAdditions.m; path = UnitTests/TestDateAdditions.m; sourceTree = "<group>"; };
- 31DDDA6E12BDD5CE0048F6C0 /* scandate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scandate.h; path = Source/scandate.h; sourceTree = "<group>"; };
- 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = scandate.m; path = Source/scandate.m; sourceTree = "<group>"; };
- 31DDDA7812BDD6E90048F6C0 /* TestScandate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestScandate.h; path = UnitTests/TestScandate.h; sourceTree = "<group>"; };
- 31DDDA7912BDD6E90048F6C0 /* TestScandate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestScandate.m; path = UnitTests/TestScandate.m; sourceTree = "<group>"; };
31DDDAF112BDE54B0048F6C0 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Prefix.pch; path = "Other/Adium Spotlight Importer/Prefix.pch"; sourceTree = "<group>"; };
31E0CD800C5EEF5200271DB1 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; };
31E84DF10C7F387800674BCA /* AIUnitTestUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIUnitTestUtilities.h; path = UnitTests/AIUnitTestUtilities.h; sourceTree = "<group>"; };
@@ -2082,8 +2074,6 @@
340D03A80A7D798A0059A3AF /* AIControllerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIControllerProtocol.h; path = "Frameworks/Adium Framework/Source/AIControllerProtocol.h"; sourceTree = "<group>"; };
340D081F0A7DBFE40059A3AF /* AIChatControllerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIChatControllerProtocol.h; path = "Frameworks/Adium Framework/Source/AIChatControllerProtocol.h"; sourceTree = "<group>"; };
340D083F0A7DC1540059A3AF /* AIContactAlertsControllerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContactAlertsControllerProtocol.h; path = "Frameworks/Adium Framework/Source/AIContactAlertsControllerProtocol.h"; sourceTree = "<group>"; };
- 340D09FF0A7DD1F40059A3AF /* AICalendarDate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AICalendarDate.h; path = Source/AICalendarDate.h; sourceTree = "<group>"; };
- 340D0A000A7DD1F40059A3AF /* AICalendarDate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AICalendarDate.m; path = Source/AICalendarDate.m; sourceTree = "<group>"; };
340D0D5B0A7E72030059A3AF /* AIContactControllerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContactControllerProtocol.h; path = "Frameworks/Adium Framework/Source/AIContactControllerProtocol.h"; sourceTree = "<group>"; };
340D0D630A7E72DA0059A3AF /* AIContentControllerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContentControllerProtocol.h; path = "Frameworks/Adium Framework/Source/AIContentControllerProtocol.h"; sourceTree = "<group>"; };
340D0D720A7E750E0059A3AF /* AIDockControllerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIDockControllerProtocol.h; path = "Frameworks/Adium Framework/Source/AIDockControllerProtocol.h"; sourceTree = "<group>"; };
@@ -3933,6 +3923,10 @@
5A5F8BBB12D560E400019727 /* AIDockNameOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIDockNameOverlay.h; path = "Plugins/Dock Icon Badging/AIDockNameOverlay.h"; sourceTree = "<group>"; };
5A5F8BBC12D560E400019727 /* AIDockNameOverlay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIDockNameOverlay.m; path = "Plugins/Dock Icon Badging/AIDockNameOverlay.m"; sourceTree = "<group>"; };
5A675E8D13C00AEA006192C5 /* Preferences-General.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-General.xib"; path = "Resources/Preferences-General.xib"; sourceTree = "<group>"; };
+ 5A72C1A117013D9400075BBA /* crashDuck.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = crashDuck.icns; sourceTree = "<group>"; };
+ 5A72C1A217013D9400075BBA /* crashDuck.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = crashDuck.png; sourceTree = "<group>"; };
+ 5A72C1AD17013D9400075BBA /* AICrashReporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AICrashReporter.m; path = "Other/Adium Crash Reporter/AICrashReporter.m"; sourceTree = "<group>"; };
+ 5A72C1AE17013D9400075BBA /* AICrashReporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AICrashReporter.h; path = "Other/Adium Crash Reporter/AICrashReporter.h"; sourceTree = "<group>"; };
5A7642A811E044B900E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sk_SK; path = Resources/sk_SK.lproj/AccountProxy.xib; sourceTree = "<group>"; };
5A7642A911E044B900E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sk_SK; path = Resources/sk_SK.lproj/AIAdvancedInspectorPane.xib; sourceTree = "<group>"; };
5A7642AB11E044B900E5E0AF /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = Resources/sk_SK.lproj/Buttons.strings; sourceTree = "<group>"; };
@@ -4026,6 +4020,8 @@
5ACF27361392C74A004B6AEF /* AIHighlightingTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIHighlightingTextField.m; path = "Frameworks/AIUtilities Framework/Source/AIHighlightingTextField.m"; sourceTree = "<group>"; };
5ACF27371392C74A004B6AEF /* AIPreferenceCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPreferenceCollectionView.h; path = "Frameworks/AIUtilities Framework/Source/AIPreferenceCollectionView.h"; sourceTree = "<group>"; };
5ACF27381392C74A004B6AEF /* AIPreferenceCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIPreferenceCollectionView.m; path = "Frameworks/AIUtilities Framework/Source/AIPreferenceCollectionView.m"; sourceTree = "<group>"; };
+ 5AD04C2A1821E8D3009801F8 /* ISO8601DateFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ISO8601DateFormatter.m; path = "Frameworks/AIUtilities Framework/Source/ISO8601DateFormatter.m"; sourceTree = "<group>"; };
+ 5AD04C2B1821E8D3009801F8 /* ISO8601DateFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ISO8601DateFormatter.h; path = "Frameworks/AIUtilities Framework/Source/ISO8601DateFormatter.h"; sourceTree = "<group>"; };
5ADFFE5C133846C300069C1B /* keys.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = keys.png; path = Resources/keys.png; sourceTree = "<group>"; };
6311F46F0E340DD2004234B8 /* AISharedAdium.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AISharedAdium.h; path = "Frameworks/Adium Framework/Source/AISharedAdium.h"; sourceTree = "<group>"; };
6311F4700E340DD2004234B8 /* AISharedAdium.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AISharedAdium.m; path = "Frameworks/Adium Framework/Source/AISharedAdium.m"; sourceTree = "<group>"; };
@@ -4219,10 +4215,6 @@
6334FFF30F9C14C1003C77A9 /* AIFontAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFontAdditions.h; path = "Frameworks/AIUtilities Framework/Source/AIFontAdditions.h"; sourceTree = "<group>"; };
6334FFF40F9C14C1003C77A9 /* OWAddressBookAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OWAddressBookAdditions.h; path = "Frameworks/AIUtilities Framework/Source/OWAddressBookAdditions.h"; sourceTree = "<group>"; };
6334FFF50F9C14C1003C77A9 /* OWAddressBookAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OWAddressBookAdditions.m; path = "Frameworks/AIUtilities Framework/Source/OWAddressBookAdditions.m"; sourceTree = "<group>"; };
- 6334FFF60F9C14C1003C77A9 /* NSCalendarDate+ISO8601Parsing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSCalendarDate+ISO8601Parsing.h"; path = "Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.h"; sourceTree = "<group>"; };
- 6334FFF70F9C14C1003C77A9 /* NSCalendarDate+ISO8601Parsing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSCalendarDate+ISO8601Parsing.m"; path = "Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.m"; sourceTree = "<group>"; };
- 6334FFF80F9C14C1003C77A9 /* NSCalendarDate+ISO8601Unparsing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSCalendarDate+ISO8601Unparsing.h"; path = "Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Unparsing.h"; sourceTree = "<group>"; };
- 6334FFF90F9C14C1003C77A9 /* NSCalendarDate+ISO8601Unparsing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSCalendarDate+ISO8601Unparsing.m"; path = "Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Unparsing.m"; sourceTree = "<group>"; };
6334FFFA0F9C14C1003C77A9 /* AIWindowControllerAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIWindowControllerAdditions.h; path = "Frameworks/AIUtilities Framework/Source/AIWindowControllerAdditions.h"; sourceTree = "<group>"; };
6334FFFB0F9C14C1003C77A9 /* AIWindowControllerAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIWindowControllerAdditions.m; path = "Frameworks/AIUtilities Framework/Source/AIWindowControllerAdditions.m"; sourceTree = "<group>"; };
6334FFFC0F9C14C1003C77A9 /* AIPasteboardAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPasteboardAdditions.h; path = "Frameworks/AIUtilities Framework/Source/AIPasteboardAdditions.h"; sourceTree = "<group>"; };
@@ -4236,8 +4228,6 @@
633D4FB30F9D30E3004F491E /* GetMetadataForHTMLLog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GetMetadataForHTMLLog.m; path = "Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m"; sourceTree = "<group>"; };
633D4FB40F9D30E3004F491E /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = "Other/Adium Spotlight Importer/main.c"; sourceTree = "<group>"; };
633D4FB50F9D30E3004F491E /* maintest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = maintest.m; path = "Other/Adium Spotlight Importer/maintest.m"; sourceTree = "<group>"; };
- 633D4FBC0F9D30FA004F491E /* NSCalendarDate+ISO8601Parsing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSCalendarDate+ISO8601Parsing.h"; path = "Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.h"; sourceTree = "<group>"; };
- 633D4FBD0F9D30FA004F491E /* NSCalendarDate+ISO8601Parsing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSCalendarDate+ISO8601Parsing.m"; path = "Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.m"; sourceTree = "<group>"; };
633D4FC00F9D3116004F491E /* schema.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = schema.xml; path = "Other/Adium Spotlight Importer/schema.xml"; sourceTree = "<group>"; };
633D4FC10F9D3116004F491E /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Other/Adium Spotlight Importer/Info.plist"; sourceTree = "<group>"; };
633D50550F9D31B8004F491E /* AdiumSpotlightImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AdiumSpotlightImporter.h; path = "Other/Adium Spotlight Importer/AdiumSpotlightImporter.h"; sourceTree = "<group>"; };
@@ -4299,7 +4289,6 @@
638392F609D4D67A0067B9B7 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = "<group>"; };
638BC1FA0FC932E000CE7600 /* AIObjectDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIObjectDebug.h; path = Source/AIObjectDebug.h; sourceTree = "<group>"; };
638BC1FB0FC932E000CE7600 /* AIObjectDebug.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIObjectDebug.m; path = Source/AIObjectDebug.m; sourceTree = "<group>"; };
- 639DFB440F981C7C003C9A32 /* NSCalendarDate+ISO8601Parsing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSCalendarDate+ISO8601Parsing.h"; path = "Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.h"; sourceTree = "<group>"; };
63A3A9670F9C35D3006C9CB0 /* AIUtilities_Framework.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = AIUtilities_Framework.plist; sourceTree = "<group>"; };
63A3A9690F9C35D3006C9CB0 /* ca */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = "<group>"; };
63A3A96A0F9C35D3006C9CB0 /* cs */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -5192,8 +5181,6 @@
31FA7F100D4A75D000ABE634 /* TestRichTextCoercion.m */,
634BCD1D0DDC1542005AF1C2 /* TestMutableStringAdditions.h */,
634BCD1E0DDC1542005AF1C2 /* TestMutableStringAdditions.m */,
- 31DDDA7812BDD6E90048F6C0 /* TestScandate.h */,
- 31DDDA7912BDD6E90048F6C0 /* TestScandate.m */,
31034EFD0C8142680003F5AA /* TestStringAdditions.h */,
31034EFE0C8142680003F5AA /* TestStringAdditions.m */,
31034F0B0C8142720003F5AA /* UTF8Snowman.txt */,
@@ -5626,7 +5613,6 @@
3459CBE00A25FFA100ECC256 /* Log Indexing */ = {
isa = PBXGroup;
children = (
- 639DFB440F981C7C003C9A32 /* NSCalendarDate+ISO8601Parsing.h */,
3459CBEA0A25FFBE00ECC256 /* GetMetadataForHTMLLog.h */,
3459CBE90A25FFBE00ECC256 /* GetMetadataForHTMLLog.m */,
3459CBEC0A25FFBF00ECC256 /* AdiumSpotlightImporter.h */,
@@ -7134,6 +7120,7 @@
4BCAC53407B59F9C006641B9 /* Other */ = {
isa = PBXGroup;
children = (
+ 5A72C19C17013B1A00075BBA /* Crash Reporter */,
11BE28E30FCC7DA8000E6A10 /* Image Uploading */,
34FDD6E305632BFD00F5B30F /* ESFileTransferController.h */,
34FDD6E405632BFD00F5B30F /* ESFileTransferController.m */,
@@ -7249,8 +7236,6 @@
349B359E0A5F2231008BE092 /* Views and Cells */,
3456231F0A3771E100E7FC97 /* AIChatLog.h */,
3456231E0A3771E100E7FC97 /* AIChatLog.m */,
- 31DDDA6E12BDD5CE0048F6C0 /* scandate.h */,
- 31DDDA6F12BDD5CE0048F6C0 /* scandate.m */,
345623250A3771F400E7FC97 /* AILogToGroup.h */,
345623240A3771F300E7FC97 /* AILogToGroup.m */,
345623270A3771F400E7FC97 /* AILogFromGroup.h */,
@@ -7263,8 +7248,6 @@
34F849570A4AF04D0002A017 /* AILogFileUpgradeWindowController.m */,
34B5E25D0A7C94D3005186E6 /* AILogDateFormatter.h */,
34B5E25E0A7C94D3005186E6 /* AILogDateFormatter.m */,
- 340D09FF0A7DD1F40059A3AF /* AICalendarDate.h */,
- 340D0A000A7DD1F40059A3AF /* AICalendarDate.m */,
);
name = "Log Viewer";
sourceTree = "<group>";
@@ -7420,6 +7403,26 @@
name = Vendor;
sourceTree = "<group>";
};
+ 5A72C19C17013B1A00075BBA /* Crash Reporter */ = {
+ isa = PBXGroup;
+ children = (
+ 5A72C1A017013D9400075BBA /* Resources */,
+ 5A72C1AD17013D9400075BBA /* AICrashReporter.m */,
+ 5A72C1AE17013D9400075BBA /* AICrashReporter.h */,
+ );
+ name = "Crash Reporter";
+ sourceTree = "<group>";
+ };
+ 5A72C1A017013D9400075BBA /* Resources */ = {
+ isa = PBXGroup;
+ children = (
+ 5A72C1A117013D9400075BBA /* crashDuck.icns */,
+ 5A72C1A217013D9400075BBA /* crashDuck.png */,
+ );
+ name = Resources;
+ path = "Other/Adium Crash Reporter/Resources";
+ sourceTree = "<group>";
+ };
5A8A6A46124456B1004965A8 /* Segmented control with menu popup */ = {
isa = PBXGroup;
children = (
@@ -7952,6 +7955,8 @@
6334FFA90F9C14C1003C77A9 /* Additions */ = {
isa = PBXGroup;
children = (
+ 5AD04C2A1821E8D3009801F8 /* ISO8601DateFormatter.m */,
+ 5AD04C2B1821E8D3009801F8 /* ISO8601DateFormatter.h */,
6334FFAC0F9C14C1003C77A9 /* AIApplicationAdditions.h */,
6334FFAD0F9C14C1003C77A9 /* AIApplicationAdditions.m */,
6334FFAE0F9C14C1003C77A9 /* AIArrayAdditions.h */,
@@ -8026,10 +8031,6 @@
6334FFF30F9C14C1003C77A9 /* AIFontAdditions.h */,
6334FFF40F9C14C1003C77A9 /* OWAddressBookAdditions.h */,
6334FFF50F9C14C1003C77A9 /* OWAddressBookAdditions.m */,
- 6334FFF60F9C14C1003C77A9 /* NSCalendarDate+ISO8601Parsing.h */,
- 6334FFF70F9C14C1003C77A9 /* NSCalendarDate+ISO8601Parsing.m */,
- 6334FFF80F9C14C1003C77A9 /* NSCalendarDate+ISO8601Unparsing.h */,
- 6334FFF90F9C14C1003C77A9 /* NSCalendarDate+ISO8601Unparsing.m */,
6334FFFA0F9C14C1003C77A9 /* AIWindowControllerAdditions.h */,
6334FFFB0F9C14C1003C77A9 /* AIWindowControllerAdditions.m */,
6334FFFC0F9C14C1003C77A9 /* AIPasteboardAdditions.h */,
@@ -8088,8 +8089,6 @@
633D4FBB0F9D30FA004F491E /* External Sources */ = {
isa = PBXGroup;
children = (
- 633D4FBC0F9D30FA004F491E /* NSCalendarDate+ISO8601Parsing.h */,
- 633D4FBD0F9D30FA004F491E /* NSCalendarDate+ISO8601Parsing.m */,
);
name = "External Sources";
sourceTree = "<group>";
@@ -9277,6 +9276,7 @@
633400310F9C14C2003C77A9 /* AIDividedAlternatingRowOutlineView.h in Headers */,
633400330F9C14C2003C77A9 /* AIOutlineView.h in Headers */,
633400350F9C14C2003C77A9 /* AIAlternatingRowOutlineView.h in Headers */,
+ 5AD04C2D1821E8D3009801F8 /* ISO8601DateFormatter.h in Headers */,
633400370F9C14C2003C77A9 /* AIVariableHeightFlexibleColumnsOutlineView.h in Headers */,
633400390F9C14C2003C77A9 /* AIVariableHeightOutlineView.h in Headers */,
6334003B0F9C14C2003C77A9 /* AIMultiCellOutlineView.h in Headers */,
@@ -9330,8 +9330,6 @@
633400B90F9C14C2003C77A9 /* AIViewAdditions.h in Headers */,
633400BB0F9C14C2003C77A9 /* AIWindowAdditions.h in Headers */,
633400BF0F9C14C2003C77A9 /* OWAddressBookAdditions.h in Headers */,
- 633400C10F9C14C2003C77A9 /* NSCalendarDate+ISO8601Parsing.h in Headers */,
- 633400C30F9C14C2003C77A9 /* NSCalendarDate+ISO8601Unparsing.h in Headers */,
633400C50F9C14C2003C77A9 /* AIWindowControllerAdditions.h in Headers */,
633400C70F9C14C2003C77A9 /* AIPasteboardAdditions.h in Headers */,
633400D00F9C14E0003C77A9 /* AIUtilities.framework_Prefix.pch in Headers */,
@@ -9891,6 +9889,7 @@
317D83680E89F40500298BDB /* msg-bookmark-chat.tiff in Resources */,
11BD73D30F5A54BB007D438A /* twitter-small.png in Resources */,
11BD73D40F5A54BB007D438A /* twitter.png in Resources */,
+ 5A2FF9B81797336100C2EF12 /* crashDuck.icns in Resources */,
1109634C0F61C1D00064CA0E /* AITwitterReplyWindow.xib in Resources */,
113892270F6B70CA00A7D7DC /* laconica-small.png in Resources */,
113892280F6B70CA00A7D7DC /* laconica.png in Resources */,
@@ -10006,6 +10005,8 @@
C613B1451641210B006683FF /* events-contact.tiff in Resources */,
5A0BBC4317400544002A7BE0 /* emoticons_menu at 2x.png in Resources */,
7667464C178D8B2700F65048 /* AIOTRTopBarUnverifiedContactController.xib in Resources */,
+ 5AC423F3178CBD5100F5911A /* ChatCyclingDefaults-Old.plist in Resources */,
+ 5AC423F7178CBD5700F5911A /* ChatCyclingDefaults.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -10187,8 +10188,6 @@
318EA69C0D7A659900EDB105 /* TestColorAdditions.m in Sources */,
634BCD1F0DDC1542005AF1C2 /* TestMutableStringAdditions.m in Sources */,
3107D5250F63134F0051DDD5 /* TestAttributedStringAdditions.m in Sources */,
- 31DDDA7112BDD5CE0048F6C0 /* scandate.m in Sources */,
- 31DDDA7A12BDD6E90048F6C0 /* TestScandate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -10545,6 +10544,7 @@
34DC88410A7EEE2E003E1636 /* AdiumPreferredAccounts.m in Sources */,
34DC88430A7EEE2E003E1636 /* AdiumServices.m in Sources */,
34DC88450A7EEE2E003E1636 /* AdiumApplescriptRunner.m in Sources */,
+ 5A2FF9BD1797351500C2EF12 /* AICrashReporter.m in Sources */,
34DC884C0A7EEE2E003E1636 /* AdiumContentFiltering.m in Sources */,
34DC884E0A7EEE2E003E1636 /* AdiumFormatting.m in Sources */,
34DC88510A7EEE2E003E1636 /* AdiumTyping.m in Sources */,
@@ -10563,7 +10563,6 @@
34DC88810A7EEE2F003E1636 /* AdiumSpeech.m in Sources */,
34DC88840A7EEE2F003E1636 /* AdiumIdleManager.m in Sources */,
34DC88880A7EEE2F003E1636 /* XtrasInstaller.m in Sources */,
- 3419DF3B0A8119BF00C3FC68 /* AICalendarDate.m in Sources */,
34DC12FC0A81415D00D710F3 /* ESApplescriptabilityController.m in Sources */,
34DC13040A81417600D710F3 /* AILoginWindowController.m in Sources */,
C44BA7830AAB696400C7504F /* SetupAssistantBoxBackgroundView.m in Sources */,
@@ -10636,7 +10635,6 @@
76C1AF9C125A906A00D269A9 /* AIAdiumURLProtocol.m in Sources */,
5A94397B1279ECB800FDD81D /* AIImgurImageUploader.m in Sources */,
349062A2127F7E6900FC313F /* AITemporaryIRCAccountWindowController.m in Sources */,
- 5A80508512BE9F00007CDC1B /* scandate.m in Sources */,
1154F50B12E1476900B8CA27 /* AILogByAccountWindowController.m in Sources */,
766ABAB61306D1020049FFB7 /* AIUnreadMessagesTooltip.m in Sources */,
5A5F8BBD12D560E400019727 /* AIDockNameOverlay.m in Sources */,
@@ -10829,6 +10827,7 @@
6334007A0F9C14C2003C77A9 /* AIArrayAdditions.m in Sources */,
6334007C0F9C14C2003C77A9 /* AIAttributedStringAdditions.m in Sources */,
6334007E0F9C14C2003C77A9 /* AIBezierPathAdditions.m in Sources */,
+ 5AD04C2C1821E8D3009801F8 /* ISO8601DateFormatter.m in Sources */,
633400800F9C14C2003C77A9 /* AIBundleAdditions.m in Sources */,
633400820F9C14C2003C77A9 /* AICharacterSetAdditions.m in Sources */,
633400840F9C14C2003C77A9 /* AIColorAdditions.m in Sources */,
@@ -10861,8 +10860,6 @@
633400BA0F9C14C2003C77A9 /* AIViewAdditions.m in Sources */,
633400BC0F9C14C2003C77A9 /* AIWindowAdditions.m in Sources */,
633400C00F9C14C2003C77A9 /* OWAddressBookAdditions.m in Sources */,
- 633400C20F9C14C2003C77A9 /* NSCalendarDate+ISO8601Parsing.m in Sources */,
- 633400C40F9C14C2003C77A9 /* NSCalendarDate+ISO8601Unparsing.m in Sources */,
633400C60F9C14C2003C77A9 /* AIWindowControllerAdditions.m in Sources */,
633400C80F9C14C2003C77A9 /* AIPasteboardAdditions.m in Sources */,
63BB1CC90F9EDDB600424B80 /* AISharedWriterQueue.m in Sources */,
@@ -10879,11 +10876,10 @@
buildActionMask = 2147483647;
files = (
633D4FB60F9D30E3004F491E /* GetMetadataForHTMLLog-Additions.m in Sources */,
+ 5AD04C311821E910009801F8 /* ISO8601DateFormatter.m in Sources */,
633D4FB70F9D30E3004F491E /* GetMetadataForFile.m in Sources */,
633D4FB80F9D30E3004F491E /* GetMetadataForHTMLLog.m in Sources */,
633D4FB90F9D30E3004F491E /* main.c in Sources */,
- 633D4FBE0F9D30FA004F491E /* NSCalendarDate+ISO8601Parsing.m in Sources */,
- 5A804FEA12BE9E84007CDC1B /* scandate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/AdiumHelp.html
--- a/AdiumHelp/AdiumHelp.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/AdiumHelp.html Thu Dec 05 18:59:37 2013 +0100
@@ -30,7 +30,7 @@
<h2 class="space17"> Troubleshooting </h2>
<p> <a href="pgs/Troubleshooting.html">Solve common problems.</a> </p>
</div>
- <h4 id="contentbottom"> <a href="http://www.adium.im/">www.adium.im</a> </h4>
+ <h4 id="contentbottom"> <a href="https://www.adium.im/">www.adium.im</a> </h4>
</div>
</body>
</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Account-RegisteringJabberAccount.html
--- a/AdiumHelp/pgs/Account-RegisteringJabberAccount.html Thu Dec 05 18:17:08 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>Registering a Jabber (XMPP) account</title>
-<meta name="keywords" content="account, jabber, jabber naming" />
-<meta name="description" content="Registering a Jabber Accounts" />
-<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
-</head>
-<body>
-<div id="banner"> <a name="account" id="account"></a><a name="jabber" id="jabber"></a>
- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
- <div id="pagetitle">
- <h1>Registering a Jabber (XMPP) account</h1>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Setting up an account via Adium</h3>
- </div>
- <div class="taskboxtext">
- <p>On most XMPP (previously known as "Jabber") servers, Adium can register your account with the server for you. Just set up your account as if you were already registered by following the steps described in <a href="Accounts-CreatingAccounts.html">Creating An Account</a>, including your desired Jabber ID and password. When the account attempts to connect, Adium will notify you that the account is not yet registered and will offer to register it.</p>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Username constraints</h3>
- </div>
- <div class="taskboxtext">
- <ul>
- <li>Usernames are case-insensitive (e.g. "StPeter" is the same as "stpeter") and are limited to 1023 Characters.</li>
- <li>In addition, certain characters are not allowed in your username:
- <ul>
- <li>@ ('at' sign)</li>
- <li>: (colon)</li>
- <li>' (single quote)</li>
- <li>" (double quote)</li>
- <li>< (open angle bracket)</li>
- <li>> (close angle bracket)</li>
- <li>& (ampersand)</li>
- <li>space, carriage-return, line-feed, horizontal tab, and any other whitespace</li>
- <li>ASCII control characters</li>
- </ul>
- </li>
- </ul>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>How to specify an XMPP server</h3>
- </div>
- <div class="taskboxtext">
- <p>Jabber IDs are in the form <i>name at server</i>.</p>
- <p>The name <i>adiumuser</i> on <i>jabber.org</i> would be <i>adiumuser at jabber.org</i>.</p>
- <p><i>adiumuser</i> on <i>jabber-fr.net</i> would be <i>adiumuser at jabber-fr.net</i>.</p>
- </div>
- </div>
-</div>
-<script type="text/javascript" src="../js/help.js"></script>
-</body>
-</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Account-RegisteringXMPPAccount.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/Account-RegisteringXMPPAccount.html Thu Dec 05 18:59:37 2013 +0100
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="keywords" content="account, xmpp, jabber, jabber naming" />
+<meta name="description" content="Registering an XMPP Account" />
+<title>Registering an XMPP (Jabber) account</title>
+<link media="all" rel="stylesheet" href="../css/topicpage.css" type="text/css" />
+</head>
+<body>
+<div id="banner"> <a name="account" id="account"></a><a name="jabber" id="jabber"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <div id="pagetitle">
+ <h1>Registering an XMPP (Jabber) account</h1>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Setting up an account via Adium</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>On most XMPP (previously known as "Jabber") servers, Adium can register your account with the server for you. Just set up your account as if you were already registered by following the steps described in <a href="Accounts-CreatingAccounts.html">Creating An Account</a>, including your desired Jabber ID and password. When the account attempts to connect, Adium will notify you that the account is not yet registered and will offer to register it.</p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Username constraints</h3>
+ </div>
+ <div class="taskboxtext">
+ <ul>
+ <li>Usernames are case-insensitive (e.g. "StPeter" is the same as "stpeter") and are limited to 1023 Characters.</li>
+ <li>In addition, certain characters are not allowed in your username:
+ <ul>
+ <li>@ ('at' sign)</li>
+ <li>: (colon)</li>
+ <li>' (single quote)</li>
+ <li>" (double quote)</li>
+ <li>< (open angle bracket)</li>
+ <li>> (close angle bracket)</li>
+ <li>& (ampersand)</li>
+ <li>space, carriage-return, line-feed, horizontal tab, and any other whitespace</li>
+ <li>ASCII control characters</li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>How to specify an XMPP server</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>Jabber IDs are in the form <i>name at server</i>.</p>
+ <p>The name <i>adiumuser</i> on <i>jabber.org</i> would be <i>adiumuser at jabber.org</i>.</p>
+ <p><i>adiumuser</i> on <i>jabber-fr.net</i> would be <i>adiumuser at jabber-fr.net</i>.</p>
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-AIM.html
--- a/AdiumHelp/pgs/Accounts-AIM.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-AIM.html Thu Dec 05 18:59:37 2013 +0100
@@ -68,7 +68,7 @@
<p>On the other hand, it will allow the message if the address is plain text instead of a link. So, for example, “Check out what I just wrote: file:///Users/me/Documents/Why-Adium-is-awesome.txt” will go through, but “Check out <a class="ext_link" href="file:///Users/me/Documents/Why-Adium-is-awesome.txt">what I just wrote</a>” will not.</p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-Bonjour.html
--- a/AdiumHelp/pgs/Accounts-Bonjour.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-Bonjour.html Thu Dec 05 18:59:37 2013 +0100
@@ -63,7 +63,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-ContactIcons.html
--- a/AdiumHelp/pgs/Accounts-ContactIcons.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-ContactIcons.html Thu Dec 05 18:59:37 2013 +0100
@@ -106,7 +106,7 @@
<h3>Where icons are saved</h3>
</div>
<div class="taskboxtext">
- <p>Icons, once retrieved, are cached at ~/Library/Caches/Adium/Default.</p>
+ <p>Icons, once retrieved, are cached at ~/Library/Caches/Adium/Default. (The "Library" folder is hidden in OS X versions 10.7 and newer. See <a class="ext_link" href="http://osxdaily.com/2011/07/22/access-user-library-folder-in-os-x-lion/">this article</a> for details.)</p>
<p>Recent icons set via the icon picker (both for contacts and for yourself) are cached at ~/Library/Images/iChat Recent Pictures, and such recent icons are shared with iChat.</p>
<p>Icons should be retrieved automatically from your contacts when you sign on and when contacts change icons. In AIM, exchanging two messages with a contact may be necessary for the icon to be retrieved, depending upon what messaging client the contact is using. On some services getting info on a contact via Get Info may trigger an icon retrieval.</p>
</div>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-CreatingAccounts.html
--- a/AdiumHelp/pgs/Accounts-CreatingAccounts.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-CreatingAccounts.html Thu Dec 05 18:59:37 2013 +0100
@@ -61,7 +61,6 @@
<li><a class="ext_link" href="http://www.livejournal.com/chat/">LiveJournal</a></li>
<li><a class="ext_link" href="http://www.passport.com/">MSN Messenger</a></li>
<li><a class="ext_link" href="http://edit.yahoo.com/">Yahoo!Messenger</a></li>
- <li><a class="ext_link" href="https://trac.adium.im/wiki/Zephyr">Zephyr</a></li>
</ul>
</li>
<li>Paid Services
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-FacebookChat.html
--- a/AdiumHelp/pgs/Accounts-FacebookChat.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-FacebookChat.html Thu Dec 05 18:59:37 2013 +0100
@@ -62,7 +62,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-Gadu-Gadu.html
--- a/AdiumHelp/pgs/Accounts-Gadu-Gadu.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-Gadu-Gadu.html Thu Dec 05 18:59:37 2013 +0100
@@ -67,7 +67,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-Gizmo5.html
--- a/AdiumHelp/pgs/Accounts-Gizmo5.html Thu Dec 05 18:17:08 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta name="keywords" content="Gizmo5, Gizmo" />
-<meta name="description" content="Gizmo5" />
-<title>Gizmo5</title>
-<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
-</head>
-<body>
-<div id="banner">
- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
- <div id="pagetitle">
- <h1>Gizmo5</h1>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Description</h3>
- </div>
- <div class="taskboxtext">
- <table>
- <tr>
- <td><strong>Homepage:</strong></td>
- <td> <a class="ext_link" href="http://gizmo5.com/">http://gizmo5.com/</a></td>
- </tr>
- <tr>
- <td><strong>Type:</strong></td>
- <td>XMPP-based, proprietary</td>
- </tr>
- <tr>
- <td><strong>Identity:</strong></td>
- <td>Jabber ID (JID), e.g. username at chat.gizmoproject.com</td>
- </tr>
- <tr>
- <td><strong>Interoperability:</strong></td>
- <td>XMPP, LiveJournal, Google Talk</td>
- </tr>
- </table>
- <p>Apart from using and being compatible with XMPP, Gizmo5 also has proprietary elements.</p>
- <p>Gizmo's chat system is simply XMPP, so all you need to do is add the account as a Jabber account. For example, if your Gizmo Project username is "jdoe", your Jabber ID is "jdoe at chat.gizmoproject.com".</p>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>History</h3>
- </div>
- <div class="taskboxtext">
- <p></p>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Censorship</h3>
- </div>
- <div class="taskboxtext">
- <p></p>
- </div>
- </div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-GoogleTalk.html
--- a/AdiumHelp/pgs/Accounts-GoogleTalk.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-GoogleTalk.html Thu Dec 05 18:59:37 2013 +0100
@@ -61,7 +61,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-GroupWise.html
--- a/AdiumHelp/pgs/Accounts-GroupWise.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-GroupWise.html Thu Dec 05 18:59:37 2013 +0100
@@ -63,7 +63,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-ICQ.html
--- a/AdiumHelp/pgs/Accounts-ICQ.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-ICQ.html Thu Dec 05 18:59:37 2013 +0100
@@ -69,7 +69,7 @@
<p>HTML tags that you put into the inputline are “escaped” by Adium, so that the recipient's client will not attempt to use the HTML tag; it will simply display the text of the tag. However, it appears that the AIM/ICQ server drops messages containing even escaped HTML (but only that tag — other tags work fine).</p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-IRC.html
--- a/AdiumHelp/pgs/Accounts-IRC.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-IRC.html Thu Dec 05 18:59:37 2013 +0100
@@ -63,7 +63,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-LJTalk.html
--- a/AdiumHelp/pgs/Accounts-LJTalk.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-LJTalk.html Thu Dec 05 18:59:37 2013 +0100
@@ -59,7 +59,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-ListOfServices.html
--- a/AdiumHelp/pgs/Accounts-ListOfServices.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-ListOfServices.html Thu Dec 05 18:59:37 2013 +0100
@@ -31,7 +31,6 @@
<li><a href="Accounts-GoogleTalk.html">Google Talk</a></li>
<li><a href="Accounts-LJTalk.html">LJ (LiveJournal) Talk</a></li>
<li><a href="Accounts-FacebookChat.html">Facebook Chat</a></li>
- <li><a href="Accounts-Gizmo5.html">Gizmo5</a></li>
</ul>
<li><a href="Accounts-MSN.html">MSN Messenger</a></li>
<li><a href="Accounts-AIM.html">AOL Instant Messenger (AIM)</a>, including</li>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-MSN.html
--- a/AdiumHelp/pgs/Accounts-MSN.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-MSN.html Thu Dec 05 18:59:37 2013 +0100
@@ -83,7 +83,7 @@
<p>See <a class="ext_link" href="http://virtuelvis.com/archives/2006/02/microsoft-censoring-msn-messenger">Microsoft censoring MSN Messenger conversations</a> for more information.</p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-MobileMe.html
--- a/AdiumHelp/pgs/Accounts-MobileMe.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-MobileMe.html Thu Dec 05 18:59:37 2013 +0100
@@ -66,7 +66,7 @@
<p>See <a href="Accounts-AIM.html">AOL Instant Messenger</a>.</p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-MySpace.html
--- a/AdiumHelp/pgs/Accounts-MySpace.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-MySpace.html Thu Dec 05 18:59:37 2013 +0100
@@ -63,7 +63,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-Sametime.html
--- a/AdiumHelp/pgs/Accounts-Sametime.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-Sametime.html Thu Dec 05 18:59:37 2013 +0100
@@ -66,7 +66,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-Twitter.html
--- a/AdiumHelp/pgs/Accounts-Twitter.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-Twitter.html Thu Dec 05 18:59:37 2013 +0100
@@ -63,7 +63,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-XMPP.html
--- a/AdiumHelp/pgs/Accounts-XMPP.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-XMPP.html Thu Dec 05 18:59:37 2013 +0100
@@ -62,7 +62,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-Yahoo.html
--- a/AdiumHelp/pgs/Accounts-Yahoo.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-Yahoo.html Thu Dec 05 18:59:37 2013 +0100
@@ -66,7 +66,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-YahooJapan.html
--- a/AdiumHelp/pgs/Accounts-YahooJapan.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-YahooJapan.html Thu Dec 05 18:59:37 2013 +0100
@@ -66,7 +66,7 @@
<p></p>
</div>
</div>
- </div>
- <script type="text/javascript" src="../js/help.js"></script>
- </body>
-</html>
\ No newline at end of file
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/Accounts-iTunesIntegration.html
--- a/AdiumHelp/pgs/Accounts-iTunesIntegration.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/Accounts-iTunesIntegration.html Thu Dec 05 18:59:37 2013 +0100
@@ -106,4 +106,4 @@
</div>
<script type="text/javascript" src="../js/help.js"></script>
</body>
-</html>
\ No newline at end of file
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/AdiumDocumentation.html
--- a/AdiumHelp/pgs/AdiumDocumentation.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/AdiumDocumentation.html Thu Dec 05 18:59:37 2013 +0100
@@ -18,7 +18,7 @@
<h1>Adium Documentation</h1>
</div>
<p>Welcome to the Documentation!</p>
- <p>Adium seeks to be the most user-friendly and intuitive universal instant messaging client possible while maintaining significant flexibility. This documentation should help to answer most any question you may have; if you have a concern or request not covered here, please visit <a href="http://adium.im/help/">Adium Help</a>.</p>
+ <p>Adium seeks to be the most user-friendly and intuitive universal instant messaging client possible while maintaining significant flexibility. This documentation should help to answer most any question you may have; if you have a concern or request not covered here, please visit <a href=" /">Adium Help</a>.</p>
<p>The articles below cover a wide range of topics from initial setup and messaging to advanced contact list management and customization.</p>
<p>So don't hesitate – jump right in! :)</p>
<div class="taskboxline">
@@ -41,6 +41,7 @@
<ul>
<li><a href="ServiceInformation-IRCSupport.html">IRC ▸</a></li>
<li><a href="ServiceInformation-TwitterSupport.html">Twitter ▸</a></li>
+ <li><a href="ServiceInformation-XMPPSupport.html">XMPP ▸</a></li>
</ul>
</li>
</ul></td>
@@ -189,7 +190,6 @@
<li><a href="Accounts-GoogleTalk.html">Google Talk</a></li>
<li><a href="Accounts-LJTalk.html">LJ (LiveJournal) Talk</a></li>
<li><a href="Accounts-FacebookChat.html">Facebook Chat</a></li>
- <li><a href="Accounts-Gizmo5.html">Gizmo5</a></li>
</ul>
<li><a href="Accounts-MSN.html">MSN Messenger</a></li>
<li><a href="Accounts-AIM.html">AOL Instant Messenger (AIM)</a>, including</li>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html
--- a/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html Thu Dec 05 18:59:37 2013 +0100
@@ -31,7 +31,7 @@
<h3>Finding an installed Xtra</h3>
</div>
<div class="taskboxtext">
- <p>Xtras are stored in subfolders of this folder: (Your Home Folder)/Library/Application Support/Adium 2.0. Each folder contains a different type of Xtra.</p>
+ <p>Xtras are stored in subfolders of this folder: (Your Home Folder)/Library/Application Support/Adium 2.0. Each folder contains a different type of Xtra. (The "Library" folder is hidden in OS X versions 10.7 and newer. See <a class="ext_link" href="http://osxdaily.com/2011/07/22/access-user-library-folder-in-os-x-lion/">this article</a> for details.)</p>
<p align="center"> <img src="../gfx/Adium-Xtras.png" alt="" width="400" height="112" /></p>
<ul>
<li>Contact List - Contact list layouts and themes (<a href="AdvancedFeatures-AdiumXtras-ListLayouts.html">.ListLayout</a>, <a href="AdvancedFeatures-AdiumXtras-ListTheme.html">.ListTheme</a>)</li>
@@ -68,7 +68,7 @@
<h3>Getting support for an Xtra</h3>
</div>
<div class="taskboxtext">
- <p>An Xtra installed from the Adium Xtras site is supported by the Xtra's author. The first place to seek support is on the Xtra's page, probably in the comments unless the Author has given other instructions. If that doesn't work, try the <a class="ext_link" href="http://forum.adium.im/">Adium forums</a>.</p>
+ <p>An Xtra installed from the Adium Xtras site is supported by the Xtra's author. The first place to seek support is on the Xtra's page, probably in the comments unless the author has given other instructions. If that doesn't work, try the <a class="ext_link" href="http://forums.cocoaforge.com/viewforum.php?f=13">Adium forum</a>.</p>
</div>
</div>
<div class="taskboxline">
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/AdvancedFeatures-EmailNotification.html
--- a/AdiumHelp/pgs/AdvancedFeatures-EmailNotification.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/AdvancedFeatures-EmailNotification.html Thu Dec 05 18:59:37 2013 +0100
@@ -34,4 +34,4 @@
</div>
<script type="text/javascript" src="../js/help.js"></script>
</body>
-</html>
\ No newline at end of file
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/AdvancedFeatures-OTREncryption.html
--- a/AdiumHelp/pgs/AdvancedFeatures-OTREncryption.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/AdvancedFeatures-OTREncryption.html Thu Dec 05 18:59:37 2013 +0100
@@ -17,7 +17,7 @@
<div id="pagetitle">
<h1>OTR encryption</h1>
</div>
- <p><a href="http://www.cypherpunks.ca/otr/">Off-the-Record (OTR) Messaging</a> enables you to have private conversations over instant messaging. According to the OTR Development Team, it aims to provide the following:</p>
+ <p><a href="https://otr.cypherpunks.ca/">Off-the-Record (OTR) Messaging</a> enables you to have private conversations over instant messaging. According to the OTR Development Team, it aims to provide the following:</p>
<ul>
<li>"Encryption: No one else can read your instant messages."</li>
<li>"Authentication: You are assured the correspondent is who you think it is."</li>
@@ -47,10 +47,10 @@
<div class="taskboxtext">
<p></p>
<ol>
- <li>Open a chat with the contact with whom you want to have a private conversation.</li>
- <li>Notice the "Encryption" item in the toolbar appears unlocked. It signifies the chat currently is not encrypted. Click the icon and select "Initiate Encrypted OTR Chat".</li>
- <li>You will be prompted to verify the fingerprint. If you are certain of its trustworthy origin click "Accept".</li>
- <li>Notice the previously unlocked icon is now locked and the message "Encrypted OTR chat initiated" is displayed in the message view.</li>
+ <li>Open a chat with the contact with whom you want to have a private conversation. Notice the "Encryption" item in the toolbar appears unlocked. It signifies the chat currently is not encrypted.</li>
+ <li>Click the icon and select "Initiate Encrypted OTR Chat". Notice the previously unlocked icon is now locked.</li>
+ <li>You will be prompted to verify the fingerprint of your contact. If you are certain of its trustworthy origin click "Accept".</li>
+ <p>Next time you start an OTR chat with the same contact, Adium will remember you verified their fingerprint so you will not have to do so again.</p>
</ol>
</div>
</div>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyByEmail.html
--- a/AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyByEmail.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/AdvancedFeatures-SearchForBuddyByEmail.html Thu Dec 05 18:59:37 2013 +0100
@@ -28,4 +28,4 @@
</div>
<script type="text/javascript" src="../js/help.js"></script>
</body>
-</html>
\ No newline at end of file
+</html>
diff -r 5ea2fa81c505 -r 05c1ab81dc44 AdiumHelp/pgs/AdvancedFeatures-VisualNotifications.html
--- a/AdiumHelp/pgs/AdvancedFeatures-VisualNotifications.html Thu Dec 05 18:17:08 2013 +0100
+++ b/AdiumHelp/pgs/AdvancedFeatures-VisualNotifications.html Thu Dec 05 18:59:37 2013 +0100
@@ -38,8 +38,8 @@
<div class="taskboxtext">
<p>The third-party application Growl.app has been around about as long as Adium itself – a long time before Apple introduced "Notification Center" (NC) in OS X 10.8 ("Mountain Lion").</p>
<p>While Growl.app is the obvious solution for users on previous versions of OS X, it also has a lot to offer to OS X users on 10.8, especially in the way of customisability and extendability. For example, there are dozens of different styles to choose from.</p>
- <p>To install Growl.app either <a class="ext_link" href="https://itunes.apple.com/de/app/growl/id467939042?mt=12">buy the application from the Mac App Store</a>, or get an older and free version from <a class="ext_link" href="http://growl.info/downloads">http://growl.info/downloads</a>.</p>
- <p>If you have Growl.app installed and would prefer to use Notification Center notifications for Adium, you need make the change in Growl's preferences.</p>
+ <p>To install Growl.app either <a class="ext_link" href="https://itunes.apple.com/de/app/growl/id467939042?mt=12">buy the application from the Mac App Store</a> (recommended, it's not expensive), or get an older and free version from <a class="ext_link" href="http://growl.info/downloads">http://growl.info/downloads</a> (not recommended and not supported on OS X 10.8 and later).</p>
+ <p>If you have Growl.app installed and would prefer to use Notification Center notifications for Adium, you need to make the change in Growl's preferences.</p>
<p>To uninstall the Growl application, follow the <a class="ext_link" href="http://growl.info/documentation/growl-package-removal.php">instructions on the Growl website</a>.</p>
More information about the commits
mailing list