adium 6018:b869f17ba7f1: Closed branch adium-1.5.10.5

[com...@adium.im]

details: http://hg.adium.im/adium/rev/b869f17ba7f1
revision: 6018:b869f17ba7f1
branch: adium-1.5.10.5
author: Evan Schoenberg
date: Fri Nov 15 06:58:05 2019 -0500

Closed branch adium-1.5.10.5
Subject: adium 6019:3596522bc931: Changes updates for 1.5.11 which will be the upcoming release

details: http://hg.adium.im/adium/rev/3596522bc931
revision: 6019:3596522bc931
branch: adium-1.5.11
author: Evan Schoenberg
date: Fri Nov 15 07:01:42 2019 -0500

Changes updates for 1.5.11 which will be the upcoming release

diffs (truncated from 57479 to 1000 lines):

diff -r 200a01709ba4 -r 3596522bc931 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Thu Nov 14 20:40:08 2019 -0500
+++ b/Adium.xcodeproj/project.pbxproj Fri Nov 15 07:01:42 2019 -0500
@@ -1226,8 +1226,6 @@
633400B20F9C14C2003C77A9 /* AITabViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFE70F9C14C1003C77A9 /* AITabViewAdditions.m */; };
633400B30F9C14C2003C77A9 /* AITextAttachmentAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFE80F9C14C1003C77A9 /* AITextAttachmentAdditions.m */; };
633400B40F9C14C2003C77A9 /* AITextAttachmentAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFE90F9C14C1003C77A9 /* AITextAttachmentAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 633400B50F9C14C2003C77A9 /* AITextViewAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFEA0F9C14C1003C77A9 /* AITextViewAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 633400B60F9C14C2003C77A9 /* AITextViewAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFEB0F9C14C1003C77A9 /* AITextViewAdditions.m */; };
633400B70F9C14C2003C77A9 /* AIURLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFEC0F9C14C1003C77A9 /* AIURLAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
633400B80F9C14C2003C77A9 /* AIURLAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6334FFED0F9C14C1003C77A9 /* AIURLAdditions.m */; };
633400B90F9C14C2003C77A9 /* AIViewAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 6334FFEE0F9C14C1003C77A9 /* AIViewAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1312,11 +1310,14 @@
6EC1684D06C170A000F9FAD3 /* DCInviteToChatPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684806C170A000F9FAD3 /* DCInviteToChatPlugin.m */; };
6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
6EC1685006C170A000F9FAD3 /* InviteToChatWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.nib */; };
+ 761D6A251ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 761D6A231ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib */; };
7627CDE61E839A29002079F2 /* JSONKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8154413B663700022C8C4 /* JSONKit.h */; };
7627CDE71E839A30002079F2 /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8154513B663700022C8C4 /* JSONKit.m */; };
7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
766ABAB61306D1020049FFB7 /* AIUnreadMessagesTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */; };
+ 766F66A51ACBDF0D002079F2 /* auth_gtalk.c in Sources */ = {isa = PBXBuildFile; fileRef = 766F66A31ACBDF0D002079F2 /* auth_gtalk.c */; };
+ 766F66A61ACBDF0D002079F2 /* auth_gtalk.h in Headers */ = {isa = PBXBuildFile; fileRef = 766F66A41ACBDF0D002079F2 /* auth_gtalk.h */; };
76731DE215F90538007728C3 /* libgcrypt.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE015F90538007728C3 /* libgcrypt.framework */; };
76731DE315F90538007728C3 /* libgpgerror.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE115F90538007728C3 /* libgpgerror.framework */; };
76731DE415F9057F007728C3 /* libgcrypt.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE015F90538007728C3 /* libgcrypt.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
@@ -4105,8 +4106,6 @@
6334FFE70F9C14C1003C77A9 /* AITabViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITabViewAdditions.m; path = "Frameworks/AIUtilities Framework/Source/AITabViewAdditions.m"; sourceTree = "<group>"; };
6334FFE80F9C14C1003C77A9 /* AITextAttachmentAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITextAttachmentAdditions.m; path = "Frameworks/AIUtilities Framework/Source/AITextAttachmentAdditions.m"; sourceTree = "<group>"; };
6334FFE90F9C14C1003C77A9 /* AITextAttachmentAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AITextAttachmentAdditions.h; path = "Frameworks/AIUtilities Framework/Source/AITextAttachmentAdditions.h"; sourceTree = "<group>"; };
- 6334FFEA0F9C14C1003C77A9 /* AITextViewAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AITextViewAdditions.h; path = "Frameworks/AIUtilities Framework/Source/AITextViewAdditions.h"; sourceTree = "<group>"; };
- 6334FFEB0F9C14C1003C77A9 /* AITextViewAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITextViewAdditions.m; path = "Frameworks/AIUtilities Framework/Source/AITextViewAdditions.m"; sourceTree = "<group>"; };
6334FFEC0F9C14C1003C77A9 /* AIURLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIURLAdditions.h; path = "Frameworks/AIUtilities Framework/Source/AIURLAdditions.h"; sourceTree = "<group>"; };
6334FFED0F9C14C1003C77A9 /* AIURLAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIURLAdditions.m; path = "Frameworks/AIUtilities Framework/Source/AIURLAdditions.m"; sourceTree = "<group>"; };
6334FFEE0F9C14C1003C77A9 /* AIViewAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIViewAdditions.h; path = "Frameworks/AIUtilities Framework/Source/AIViewAdditions.h"; sourceTree = "<group>"; };
@@ -4296,11 +4295,41 @@
6FB330A20C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvIncomingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m; sourceTree = SOURCE_ROOT; };
6FB330A30C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = EKEzvOutgoingFileTransfer.h; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.h; sourceTree = SOURCE_ROOT; };
6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvOutgoingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m; sourceTree = SOURCE_ROOT; };
+ 761D6A241ACC5F0B002079F2 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 761D6A261ACC5F0F002079F2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sl; path = "Plugins/Purple Service/Resources/sl.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
7664EAA4162E086A008CF995 /* libffi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libffi.framework; path = Frameworks/libffi.framework; sourceTree = "<group>"; };
766ABAB41306D1020049FFB7 /* AIUnreadMessagesTooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIUnreadMessagesTooltip.h; path = Source/AIUnreadMessagesTooltip.h; sourceTree = "<group>"; };
766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIUnreadMessagesTooltip.m; path = Source/AIUnreadMessagesTooltip.m; sourceTree = "<group>"; };
+ 766F66A31ACBDF0D002079F2 /* auth_gtalk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = auth_gtalk.c; sourceTree = "<group>"; };
+ 766F66A41ACBDF0D002079F2 /* auth_gtalk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = auth_gtalk.h; sourceTree = "<group>"; };
76731DE015F90538007728C3 /* libgcrypt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgcrypt.framework; path = Frameworks/libgcrypt.framework; sourceTree = "<group>"; };
76731DE115F90538007728C3 /* libgpgerror.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgpgerror.framework; path = Frameworks/libgpgerror.framework; sourceTree = "<group>"; };
+ 767A13EC1ACC5F7B002079F2 /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sv; path = "Plugins/Purple Service/Resources/sv.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13F01ACC5F94002079F2 /* es */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = es; path = "Plugins/Purple Service/Resources/es.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13F11ACC5FA8002079F2 /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = hu; path = "Plugins/Purple Service/Resources/hu.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13F21ACC5FB0002079F2 /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = it; path = "Plugins/Purple Service/Resources/it.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13F31ACC5FB8002079F2 /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = nl; path = "Plugins/Purple Service/Resources/nl.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13F41ACC5FC3002079F2 /* da */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = da; path = "Plugins/Purple Service/Resources/da.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13F51ACC5FCB002079F2 /* nb */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = nb; path = "Plugins/Purple Service/Resources/nb.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13F61ACC5FD0002079F2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fi; path = "Plugins/Purple Service/Resources/fi.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13F71ACC5FD7002079F2 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ru; path = "Plugins/Purple Service/Resources/ru.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13F81ACC5FDE002079F2 /* is */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = is; path = "Plugins/Purple Service/Resources/is.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13F91ACC5FE9002079F2 /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ca; path = "Plugins/Purple Service/Resources/ca.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13FA1ACC5FEE002079F2 /* tr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = tr; path = "Plugins/Purple Service/Resources/tr.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13FB1ACC5FF3002079F2 /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = "Plugins/Purple Service/Resources/de.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13FC1ACC5FF8002079F2 /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr; path = "Plugins/Purple Service/Resources/fr.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13FD1ACC5FFD002079F2 /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = uk; path = "Plugins/Purple Service/Resources/uk.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13FE1ACC6003002079F2 /* cs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = cs; path = "Plugins/Purple Service/Resources/cs.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A13FF1ACC6009002079F2 /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pl; path = "Plugins/Purple Service/Resources/pl.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A140C1ACC61BA002079F2 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = el_GR; path = "Plugins/Purple Service/Resources/el_GR.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A140D1ACC61C2002079F2 /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_AU; path = "Plugins/Purple Service/Resources/en_AU.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A140E1ACC61C8002079F2 /* en_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_CA; path = "Plugins/Purple Service/Resources/en_CA.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A140F1ACC61D1002079F2 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en_GB; path = "Plugins/Purple Service/Resources/en_GB.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A14101ACC6223002079F2 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr_CA; path = "Plugins/Purple Service/Resources/fr_CA.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A14111ACC622C002079F2 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt_PT; path = "Plugins/Purple Service/Resources/pt_PT.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A14121ACC6235002079F2 /* pt */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = pt; path = "Plugins/Purple Service/Resources/pt.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A14131ACC623B002079F2 /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = sk_SK; path = "Plugins/Purple Service/Resources/sk_SK.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
+ 767A14141ACC6254002079F2 /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ja; path = "Plugins/Purple Service/Resources/ja.lproj/ESPurpleGTalkAccountView.nib"; sourceTree = "<group>"; };
76889DEA12D3CA17007AEF00 /* get-info.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info.tiff"; path = "Resources/get-info.tiff"; sourceTree = "<group>"; };
76889DEE12D3CA40007AEF00 /* Personal.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Personal.tiff; path = Resources/Personal.tiff; sourceTree = "<group>"; };
76C1AF9A125A906A00D269A9 /* AIAdiumURLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAdiumURLProtocol.h; path = "Plugins/WebKit Message View/AIAdiumURLProtocol.h"; sourceTree = "<group>"; };
@@ -4399,8 +4428,8 @@
9EF0DBF309D944A300FBCC1E /* msg-block-contact.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-block-contact.tiff"; path = "Resources/msg-block-contact.tiff"; sourceTree = "<group>"; };
9EF0DBF409D944A300FBCC1E /* msg-unblock-contact.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-unblock-contact.tiff"; path = "Resources/msg-unblock-contact.tiff"; sourceTree = "<group>"; };
A3C042D108D7483100B48CE1 /* PurpleDefaultsGTalk.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = PurpleDefaultsGTalk.plist; path = "Plugins/Purple Service/PurpleDefaultsGTalk.plist"; sourceTree = "<group>"; };
- A3C0431B08D74D3100B48CE1 /* AIPurpleGTalkAccount.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIPurpleGTalkAccount.h; path = "Plugins/Purple Service/AIPurpleGTalkAccount.h"; sourceTree = "<group>"; };
- A3C0431C08D74D3100B48CE1 /* AIPurpleGTalkAccount.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIPurpleGTalkAccount.m; path = "Plugins/Purple Service/AIPurpleGTalkAccount.m"; sourceTree = "<group>"; };
+ A3C0431B08D74D3100B48CE1 /* AIPurpleGTalkAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPurpleGTalkAccount.h; path = "Plugins/Purple Service/AIPurpleGTalkAccount.h"; sourceTree = "<group>"; };
+ A3C0431C08D74D3100B48CE1 /* AIPurpleGTalkAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIPurpleGTalkAccount.m; path = "Plugins/Purple Service/AIPurpleGTalkAccount.m"; sourceTree = "<group>"; };
A3C0431D08D74D3100B48CE1 /* AIPurpleGTalkAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIPurpleGTalkAccountViewController.h; path = "Plugins/Purple Service/AIPurpleGTalkAccountViewController.h"; sourceTree = "<group>"; };
A3C0431E08D74D3100B48CE1 /* AIPurpleGTalkAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIPurpleGTalkAccountViewController.m; path = "Plugins/Purple Service/AIPurpleGTalkAccountViewController.m"; sourceTree = "<group>"; };
A3C0431F08D74D3100B48CE1 /* AIGTalkService.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIGTalkService.h; path = "Plugins/Purple Service/AIGTalkService.h"; sourceTree = "<group>"; };
@@ -4803,6 +4832,8 @@
11EE1B480CDCFAF40097F246 /* libpurple_extensions */ = {
isa = PBXGroup;
children = (
+ 766F66A31ACBDF0D002079F2 /* auth_gtalk.c */,
+ 766F66A41ACBDF0D002079F2 /* auth_gtalk.h */,
11EE1B490CDCFAF40097F246 /* oscar-adium.c */,
11EE1B4A0CDCFAF40097F246 /* oscar-adium.h */,
811033500CDE170B00EC6038 /* ssl-cdsa.c */,
@@ -7581,8 +7612,6 @@
6334FFE70F9C14C1003C77A9 /* AITabViewAdditions.m */,
6334FFE80F9C14C1003C77A9 /* AITextAttachmentAdditions.m */,
6334FFE90F9C14C1003C77A9 /* AITextAttachmentAdditions.h */,
- 6334FFEA0F9C14C1003C77A9 /* AITextViewAdditions.h */,
- 6334FFEB0F9C14C1003C77A9 /* AITextViewAdditions.m */,
6334FFEC0F9C14C1003C77A9 /* AIURLAdditions.h */,
6334FFED0F9C14C1003C77A9 /* AIURLAdditions.m */,
6334FFEE0F9C14C1003C77A9 /* AIViewAdditions.h */,
@@ -8046,6 +8075,7 @@
A3C0405808D744B200B48CE1 /* Google Talk */ = {
isa = PBXGroup;
children = (
+ 761D6A231ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib */,
A3C0431B08D74D3100B48CE1 /* AIPurpleGTalkAccount.h */,
A3C0431C08D74D3100B48CE1 /* AIPurpleGTalkAccount.m */,
A3C0431D08D74D3100B48CE1 /* AIPurpleGTalkAccountViewController.h */,
@@ -8520,6 +8550,7 @@
3485DB7109EBCE7400232CC4 /* AIPurpleGTalkAccountViewController.h in Headers */,
3485DB7309EBCE7400232CC4 /* AIGTalkService.h in Headers */,
3485DB7609EBCE7400232CC4 /* ESMeanwhileService.h in Headers */,
+ 766F66A61ACBDF0D002079F2 /* auth_gtalk.h in Headers */,
3485DB7809EBCE7400232CC4 /* ESPurpleMeanwhileAccount.h in Headers */,
3485DB7A09EBCE7400232CC4 /* DCPurpleMeanwhileJoinChatViewController.h in Headers */,
3485DB7D09EBCE7400232CC4 /* ESPurpleMeanwhileAccountViewController.h in Headers */,
@@ -8799,7 +8830,6 @@
633400AF0F9C14C2003C77A9 /* AITableViewAdditions.h in Headers */,
633400B10F9C14C2003C77A9 /* AITabViewAdditions.h in Headers */,
633400B40F9C14C2003C77A9 /* AITextAttachmentAdditions.h in Headers */,
- 633400B50F9C14C2003C77A9 /* AITextViewAdditions.h in Headers */,
633400B70F9C14C2003C77A9 /* AIURLAdditions.h in Headers */,
633400B90F9C14C2003C77A9 /* AIViewAdditions.h in Headers */,
633400BB0F9C14C2003C77A9 /* AIWindowAdditions.h in Headers */,
@@ -9020,6 +9050,16 @@
sk_SK,
uk,
pt_PT,
+ "zh-Hant",
+ "zh-Hans",
+ "en-CA",
+ "en-AU",
+ "pt-BR",
+ "fr-CA",
+ "en-GB",
+ "el-GR",
+ "sk-SK",
+ "pt-PT",
);
mainGroup = 29B97314FDCFA39411CA2CEA /* CocAIMe2 */;
projectDirPath = "";
@@ -9118,6 +9158,7 @@
3485DBBB09EBCE7400232CC4 /* ESPurpleZephyrAccountView.nib in Resources */,
3485DBBC09EBCE7400232CC4 /* PurpleDefaultsZephyr.plist in Resources */,
3485DBC309EBCE7400232CC4 /* PurpleMultilineRequestWindow.nib in Resources */,
+ 761D6A251ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib in Resources */,
3485DBC409EBCE7400232CC4 /* PurpleSinglelineRequestWindow.nib in Resources */,
3485DBD009EBCE8200232CC4 /* Localizable.strings in Resources */,
34E036780A75AA4F00394F11 /* DCPurpleOscarJoinChatView.nib in Resources */,
@@ -9661,6 +9702,7 @@
3485DB7209EBCE7400232CC4 /* AIPurpleGTalkAccountViewController.m in Sources */,
3485DB7409EBCE7400232CC4 /* AIGTalkService.m in Sources */,
3485DB7709EBCE7400232CC4 /* ESMeanwhileService.m in Sources */,
+ 766F66A51ACBDF0D002079F2 /* auth_gtalk.c in Sources */,
3485DB7909EBCE7400232CC4 /* ESPurpleMeanwhileAccount.m in Sources */,
3485DB7B09EBCE7400232CC4 /* DCPurpleMeanwhileJoinChatViewController.m in Sources */,
3485DB7E09EBCE7400232CC4 /* ESPurpleMeanwhileAccountViewController.m in Sources */,
@@ -10261,7 +10303,6 @@
633400B00F9C14C2003C77A9 /* AITableViewAdditions.m in Sources */,
633400B20F9C14C2003C77A9 /* AITabViewAdditions.m in Sources */,
633400B30F9C14C2003C77A9 /* AITextAttachmentAdditions.m in Sources */,
- 633400B60F9C14C2003C77A9 /* AITextViewAdditions.m in Sources */,
633400B80F9C14C2003C77A9 /* AIURLAdditions.m in Sources */,
633400BA0F9C14C2003C77A9 /* AIViewAdditions.m in Sources */,
633400BC0F9C14C2003C77A9 /* AIWindowAdditions.m in Sources */,
@@ -11846,6 +11887,41 @@
name = Localizable.strings;
sourceTree = "<group>";
};
+ 761D6A231ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 761D6A241ACC5F0B002079F2 /* en */,
+ 761D6A261ACC5F0F002079F2 /* sl */,
+ 767A13EC1ACC5F7B002079F2 /* sv */,
+ 767A13F01ACC5F94002079F2 /* es */,
+ 767A13F11ACC5FA8002079F2 /* hu */,
+ 767A13F21ACC5FB0002079F2 /* it */,
+ 767A13F31ACC5FB8002079F2 /* nl */,
+ 767A13F41ACC5FC3002079F2 /* da */,
+ 767A13F51ACC5FCB002079F2 /* nb */,
+ 767A13F61ACC5FD0002079F2 /* fi */,
+ 767A13F71ACC5FD7002079F2 /* ru */,
+ 767A13F81ACC5FDE002079F2 /* is */,
+ 767A13F91ACC5FE9002079F2 /* ca */,
+ 767A13FA1ACC5FEE002079F2 /* tr */,
+ 767A13FB1ACC5FF3002079F2 /* de */,
+ 767A13FC1ACC5FF8002079F2 /* fr */,
+ 767A13FD1ACC5FFD002079F2 /* uk */,
+ 767A13FE1ACC6003002079F2 /* cs */,
+ 767A13FF1ACC6009002079F2 /* pl */,
+ 767A140C1ACC61BA002079F2 /* el_GR */,
+ 767A140D1ACC61C2002079F2 /* en_AU */,
+ 767A140E1ACC61C8002079F2 /* en_CA */,
+ 767A140F1ACC61D1002079F2 /* en_GB */,
+ 767A14101ACC6223002079F2 /* fr_CA */,
+ 767A14111ACC622C002079F2 /* pt_PT */,
+ 767A14121ACC6235002079F2 /* pt */,
+ 767A14131ACC623B002079F2 /* sk_SK */,
+ 767A14141ACC6254002079F2 /* ja */,
+ );
+ name = ESPurpleGTalkAccountView.nib;
+ sourceTree = "<group>";
+ };
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
@@ -12072,6 +12148,7 @@
RELEASE_BUILD,
DEBUG_BUILD,
);
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_BUNDLE_IDENTIFIER = com.adiumX.adiumX;
};
name = "Release-Debug";
diff -r 200a01709ba4 -r 3596522bc931 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Thu Nov 14 20:40:08 2019 -0500
+++ b/ChangeLogs/Changes.txt Fri Nov 15 07:01:42 2019 -0500
@@ -2,11 +2,16 @@
Adium Version History
-----------------------

-Version 1.5.10.4 (04/XX/2017)
+Version 1.5.11 (11/YY/2019)
+ * Fixed message window scrolling in macOS Catalina
+ * Fixed a problem with signing in to Yahoo!. ("reanimus") (#16678)
+ * Google Talk now authenticates using OAuth2, making logging in simpler when using two-factor authentication and more secure. (#16161)
+ * Fixed UI glitches in Adium’s preferences on OS X 10.10. (#16803)
+
+Version 1.5.10.4 (04/27/2017)
* Fixed an issue where the user interface got corrupted when opening the "Default Client" pane in Adium's advanced preferences.
* Updated Sparkle update framework to 1.17.0 from 1.13.1.

-
Version 1.5.10.3 (04/22/2017)
* Updated libpurple to 2.12.0 from 2.10.12, fixing a security issue that could lead to remote code execution (CVE 2017-2640).
* AIM: Updated AIM connectivity for continued AIM support. (#17097)
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/AIUtilities Framework/Source/AIBorderlessWindow.m
--- a/Frameworks/AIUtilities Framework/Source/AIBorderlessWindow.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIBorderlessWindow.m Fri Nov 15 07:01:42 2019 -0500
@@ -26,8 +26,8 @@

@implementation AIBorderlessWindow

-- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag {
-
+- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)style backing:(NSBackingStoreType)backingStoreType defer:(BOOL)flag
+{
//Call NSWindow's version of this function, but pass in the all-important value of NSBorderlessWindowMask
//for the styleMask so that the window doesn't have a title bar
if ((self = [super initWithContentRect:contentRect
@@ -169,25 +169,25 @@
BOOL changed = NO;

//Left
- if ((labs(NSMinX((*inWindowFrame)) - NSMinX(inScreenFrame)) < BORDERLESS_WINDOW_DOCKING_DISTANCE)) {
+ if ((fabs(NSMinX((*inWindowFrame)) - NSMinX(inScreenFrame)) < BORDERLESS_WINDOW_DOCKING_DISTANCE)) {
(*inWindowFrame).origin.x = inScreenFrame.origin.x;
changed = YES;
}

//Bottom
- if ((labs(NSMinY(*inWindowFrame) - NSMinY(inScreenFrame)) < BORDERLESS_WINDOW_DOCKING_DISTANCE)) {
+ if ((fabs(NSMinY(*inWindowFrame) - NSMinY(inScreenFrame)) < BORDERLESS_WINDOW_DOCKING_DISTANCE)) {
(*inWindowFrame).origin.y = inScreenFrame.origin.y;
changed = YES;
}

//Right
- if ((labs(NSMaxX(*inWindowFrame) - NSMaxX(inScreenFrame)) < BORDERLESS_WINDOW_DOCKING_DISTANCE)) {
+ if ((fabs(NSMaxX(*inWindowFrame) - NSMaxX(inScreenFrame)) < BORDERLESS_WINDOW_DOCKING_DISTANCE)) {
(*inWindowFrame).origin.x -= NSMaxX(*inWindowFrame) - NSMaxX(inScreenFrame);
changed = YES;
}

//Top
- if ((labs(NSMaxY(*inWindowFrame) - NSMaxY(inScreenFrame)) < BORDERLESS_WINDOW_DOCKING_DISTANCE)) {
+ if ((fabs(NSMaxY(*inWindowFrame) - NSMaxY(inScreenFrame)) < BORDERLESS_WINDOW_DOCKING_DISTANCE)) {
(*inWindowFrame).origin.y -= NSMaxY(*inWindowFrame) - NSMaxY(inScreenFrame);
changed = YES;
}
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/AIUtilities Framework/Source/AIDockingWindow.m
--- a/Frameworks/AIUtilities Framework/Source/AIDockingWindow.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIDockingWindow.m Fri Nov 15 07:01:42 2019 -0500
@@ -37,9 +37,9 @@

@implementation AIDockingWindow

-- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag
+- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSWindowStyleMask)style backing:(NSBackingStoreType)backingStoreType defer:(BOOL)flag
{
- if ((self = [super initWithContentRect:contentRect styleMask:aStyle backing:bufferingType defer:flag])) {
+ if ((self = [super initWithContentRect:contentRect styleMask:style backing:backingStoreType defer:flag])) {
[self _initDockingWindow];
}

@@ -157,22 +157,22 @@
- (NSRect)dockWindowFrame:(NSRect)windowFrame toScreenFrame:(NSRect)screenFrame
{
//Left
- if (labs(NSMinX(windowFrame) - NSMinX(screenFrame)) < WINDOW_DOCKING_DISTANCE) {
+ if (fabs(NSMinX(windowFrame) - NSMinX(screenFrame)) < WINDOW_DOCKING_DISTANCE) {
windowFrame.origin.x = screenFrame.origin.x;
}

//Bottom
- if (labs(NSMinY(windowFrame) - NSMinY(screenFrame)) < WINDOW_DOCKING_DISTANCE) {
+ if (fabs(NSMinY(windowFrame) - NSMinY(screenFrame)) < WINDOW_DOCKING_DISTANCE) {
windowFrame.origin.y = screenFrame.origin.y;
}

//Right
- if (labs(NSMaxX(windowFrame) - NSMaxX(screenFrame)) < WINDOW_DOCKING_DISTANCE) {
+ if (fabs(NSMaxX(windowFrame) - NSMaxX(screenFrame)) < WINDOW_DOCKING_DISTANCE) {
windowFrame.origin.x -= NSMaxX(windowFrame) - NSMaxX(screenFrame);
}

//Top
- if (labs(NSMaxY(windowFrame) - NSMaxY(screenFrame)) < WINDOW_DOCKING_DISTANCE) {
+ if (fabs(NSMaxY(windowFrame) - NSMaxY(screenFrame)) < WINDOW_DOCKING_DISTANCE) {
windowFrame.origin.y -= NSMaxY(windowFrame) - NSMaxY(screenFrame);
}

diff -r 200a01709ba4 -r 3596522bc931 Frameworks/AIUtilities Framework/Source/AIImageCollectionView.h
--- a/Frameworks/AIUtilities Framework/Source/AIImageCollectionView.h Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIImageCollectionView.h Fri Nov 15 07:01:42 2019 -0500
@@ -27,9 +27,6 @@
* supports item highlighting and selection
*/
@interface AIImageCollectionView : NSCollectionView {
-
- id <AIImageCollectionViewDelegate> delegate;
-
@protected
IBOutlet NSArrayController *itemsController;

@@ -40,7 +37,7 @@
NSUInteger highlightedIndex;
}

-@property (readwrite, assign, nonatomic) id <AIImageCollectionViewDelegate> delegate;
+@property (readwrite, assign) id <AIImageCollectionViewDelegate, NSCollectionViewDelegate> delegate;

@property (assign) IBOutlet NSArrayController *itemsController;

diff -r 200a01709ba4 -r 3596522bc931 Frameworks/AIUtilities Framework/Source/AIImageCollectionView.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageCollectionView.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIImageCollectionView.m Fri Nov 15 07:01:42 2019 -0500
@@ -34,8 +34,7 @@

@implementation AIImageCollectionView

-
-@synthesize delegate;
+@dynamic delegate;
@synthesize itemsController;
@synthesize highlightStyle, highlightSize, highlightCornerRadius;
@synthesize highlightedIndex;
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h Fri Nov 15 07:01:42 2019 -0500
@@ -19,7 +19,6 @@
- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode;
- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode tag:(NSInteger)tag;
- (NSMenuItem *)addItemWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode representedObject:(id)object;
-- (void)removeAllItems;
- (void)removeAllItemsButFirst;
- (void)removeAllItemsAfterIndex:(NSInteger)idx;

diff -r 200a01709ba4 -r 3596522bc931 Frameworks/AIUtilities Framework/Source/AIMenuAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.m Fri Nov 15 07:01:42 2019 -0500
@@ -50,15 +50,6 @@
return [theMenuItem autorelease];
}

-
-- (void)removeAllItems
-{
- NSInteger count = [self numberOfItems];
- while (count--) {
- [self removeItemAtIndex:0];
- }
-}
-
- (void)removeAllItemsButFirst
{
NSInteger count = [self numberOfItems];
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AIAbstractListController.m
--- a/Frameworks/Adium Framework/Source/AIAbstractListController.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIAbstractListController.m Fri Nov 15 07:01:42 2019 -0500
@@ -649,7 +649,7 @@
{
if ([outlineView isKindOfClass:[AIListOutlineView class]]) {
[(AIListCell *)cell setProxyListObject:item];
- [(AIListCell *)cell setControlView:(AIListOutlineView *)outlineView];
+ [(AIListCell *)cell setOutlineControlView:(AIListOutlineView *)outlineView];
[(AIListCell *)cell setIndentation:indentationPerLevel[[outlineView levelForItem:item]]];
}
}
@@ -708,7 +708,7 @@
{
BOOL isGroup = [listObject isKindOfClass:[AIListGroup class]];

- NSMutableArray *locationsArray = [NSArray arrayWithObjects:
+ NSArray *locationsArray = [NSArray arrayWithObjects:
[NSNumber numberWithInt:(isGroup ? Context_Group_Manage : Context_Contact_Manage)],
[NSNumber numberWithInt:(isGroup ? Context_Group_AttachDetach : Context_Contact_AttachDetach)],
[NSNumber numberWithInt:Context_Contact_Action],
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m
--- a/Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIAccountPlusFieldPromptController.m Fri Nov 15 07:01:42 2019 -0500
@@ -203,7 +203,8 @@

- (void)controlTextDidChange:(NSNotification *)aNotification
{
- if (!aNotification || [aNotification object] == textField_handle) {
+ if ([aNotification object] == nil ||
+ [aNotification object] == textField_handle) {
[button_okay setEnabled:([[textField_handle stringValue] length] > 0)];
}

diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AIListCell.h
--- a/Frameworks/Adium Framework/Source/AIListCell.h Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListCell.h Fri Nov 15 07:01:42 2019 -0500
@@ -22,7 +22,7 @@
#define DROP_HIGHLIGHT_HEIGHT_MARGIN 1.0f

@interface AIListCell : NSCell {
- AIListOutlineView *controlView;
+ AIListOutlineView *outlineControlView;
AIProxyListObject *proxyObject;
BOOL isGroup;

@@ -52,10 +52,9 @@

- (void)setProxyListObject:(AIProxyListObject *)inObject;
@property (readonly, nonatomic) BOOL isGroup;
-@property (readwrite, assign, nonatomic) AIListOutlineView *controlView;
+@property (readwrite, assign, nonatomic) AIListOutlineView *outlineControlView;

//Display options
-@property (readwrite, retain, nonatomic) NSFont *font;
@property (readwrite, nonatomic) NSTextAlignment textAlignment;
@property (readwrite, retain, nonatomic) NSColor *textColor;
@property (readwrite, retain, nonatomic) NSColor *invertedTextColor;
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AIListCell.m
--- a/Frameworks/Adium Framework/Source/AIListCell.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListCell.m Fri Nov 15 07:01:42 2019 -0500
@@ -106,10 +106,10 @@
isGroup = [[proxyObject listObject] isKindOfClass:[AIListGroup class]];
}

-@synthesize isGroup, controlView;
+@synthesize isGroup, outlineControlView;

//Return that this cell is draggable
-- (NSUInteger)hitTestForEvent:(NSEvent *)event inRect:(NSRect)cellFrame ofView:(NSView *)controlView
+- (NSCellHitResult)hitTestForEvent:(NSEvent *)event inRect:(NSRect)cellFrame ofView:(NSView *)controlView
{
return NSCellHitContentArea;
}
@@ -370,8 +370,8 @@
- (BOOL)cellIsSelected
{
return ([self isHighlighted] &&
- [[controlView window] isKeyWindow] &&
- [[controlView window] firstResponder] == controlView);
+ [[self.outlineControlView window] isKeyWindow] &&
+ [[self.outlineControlView window] firstResponder] == self.outlineControlView);
}

//YES if a grid would be visible behind this cell (needs to be drawn)
@@ -384,10 +384,10 @@
- (NSColor *)backgroundColor
{
//We could just call backgroundColorForRow: but it's best to avoid doing a rowForItem lookup if there is no grid
- if ([controlView usesAlternatingRowBackgroundColors]) {
- return [controlView backgroundColorForRow:[controlView rowForItem:proxyObject]];
+ if ([self.outlineControlView usesAlternatingRowBackgroundColors]) {
+ return [self.outlineControlView backgroundColorForRow:[self.outlineControlView rowForItem:proxyObject]];
} else {
- return [controlView backgroundColor];
+ return [self.outlineControlView backgroundColor];
}
}

@@ -434,7 +434,7 @@
value = [self labelString];

} else if ([attribute isEqualToString:NSAccessibilityWindowAttribute]) {
- value = [controlView window];
+ value = [self.outlineControlView window];

} else {
value = [super accessibilityAttributeValue:attribute];
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AIListContactBubbleCell.m
--- a/Frameworks/Adium Framework/Source/AIListContactBubbleCell.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListContactBubbleCell.m Fri Nov 15 07:01:42 2019 -0500
@@ -111,7 +111,7 @@
- (void)drawSelectionWithFrame:(NSRect)cellFrame
{
if ([self cellIsSelected]) {
- NSColor *highlightColor = [controlView highlightColor];
+ NSColor *highlightColor = [self.outlineControlView highlightColor];
NSGradient *gradient = highlightColor
? [[[NSGradient alloc] initWithStartingColor:highlightColor endingColor:[highlightColor darkenAndAdjustSaturationBy:0.4f]] autorelease]
: [NSGradient selectedControlGradient];
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AIListContactMockieCell.m
--- a/Frameworks/Adium Framework/Source/AIListContactMockieCell.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListContactMockieCell.m Fri Nov 15 07:01:42 2019 -0500
@@ -53,8 +53,8 @@
- (NSBezierPath *)bezierPathForDrawingInRect:(NSRect)rect
{
NSBezierPath *bezierPath;
- NSInteger row = [controlView rowForItem:proxyObject];
- NSInteger numberOfRows = [controlView numberOfRows];
+ NSInteger row = [self.outlineControlView rowForItem:proxyObject];
+ NSInteger numberOfRows = [self.outlineControlView numberOfRows];

if (row == 0) {
if (numberOfRows > 1) {
@@ -68,7 +68,9 @@
bezierPath = [NSBezierPath bezierPathWithRoundedRect:rect radius:MOCKIE_RADIUS];
}

- } else if (row >= (numberOfRows-1) || [(id<AIMultiCellOutlineViewDelegate>)[controlView delegate] outlineView:controlView isGroup:[controlView itemAtRow:row+1]]) {
+ } else if (row >= (numberOfRows-1) ||
+ [(id<AIMultiCellOutlineViewDelegate>)self.outlineControlView.delegate outlineView:self.outlineControlView
+ isGroup:[self.outlineControlView itemAtRow:row+1]]) {
//Draw the bottom corners rounded if this is the last cell in a group
bezierPath = [NSBezierPath bezierPathWithRoundedBottomCorners:rect radius:MOCKIE_RADIUS];

@@ -105,7 +107,7 @@
- (void)drawSelectionWithFrame:(NSRect)cellFrame
{
if ([self cellIsSelected]) {
- NSColor *highlightColor = [controlView highlightColor];
+ NSColor *highlightColor = [self.outlineControlView highlightColor];
NSGradient *gradient = (highlightColor ?
[[[NSGradient alloc] initWithStartingColor:highlightColor endingColor:[highlightColor darkenAndAdjustSaturationBy:0.4f]] autorelease] :
[NSGradient selectedControlGradient]);
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AIListGroupBubbleCell.m
--- a/Frameworks/Adium Framework/Source/AIListGroupBubbleCell.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListGroupBubbleCell.m Fri Nov 15 07:01:42 2019 -0500
@@ -73,7 +73,7 @@
- (void)drawSelectionWithFrame:(NSRect)cellFrame
{
if ([self cellIsSelected]) {
- NSColor *highlightColor = [controlView highlightColor];
+ NSColor *highlightColor = [self.outlineControlView highlightColor];
NSGradient *gradient = (highlightColor ?
[[[NSGradient alloc] initWithStartingColor:highlightColor endingColor:[highlightColor darkenAndAdjustSaturationBy:0.4f]] autorelease] :
[NSGradient selectedControlGradient]);
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AIListGroupCell.m
--- a/Frameworks/Adium Framework/Source/AIListGroupCell.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListGroupCell.m Fri Nov 15 07:01:42 2019 -0500
@@ -181,7 +181,7 @@
NSBezierPath *arrowPath = [NSBezierPath bezierPath];
NSPoint center = NSMakePoint(rect.origin.x + rect.size.height*0.4f, rect.origin.y + (rect.size.height/2.0f));

- if ([controlView isItemExpanded:proxyObject]) {
+ if ([self.outlineControlView isItemExpanded:proxyObject]) {
[arrowPath moveToPoint:NSMakePoint(center.x - rect.size.height*0.3f, center.y - rect.size.height*0.15f)];
[arrowPath relativeLineToPoint:NSMakePoint( rect.size.height*0.6f, 0)];
[arrowPath relativeLineToPoint:NSMakePoint(-rect.size.height*0.3f, rect.size.height*0.4f)];
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AIListGroupMockieCell.m
--- a/Frameworks/Adium Framework/Source/AIListGroupMockieCell.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIListGroupMockieCell.m Fri Nov 15 07:01:42 2019 -0500
@@ -62,7 +62,7 @@
} else {
if (![self cellIsSelected]) {
[[self backgroundColor] set];
- if ([controlView isItemExpanded:proxyObject]) {
+ if ([self.outlineControlView isItemExpanded:proxyObject]) {
[[NSBezierPath bezierPathWithRoundedTopCorners:rect radius:MOCKIE_RADIUS] fill];
} else {
[[NSBezierPath bezierPathWithRoundedRect:rect radius:MOCKIE_RADIUS] fill];
@@ -75,12 +75,12 @@
- (void)drawSelectionWithFrame:(NSRect)cellFrame
{
if ([self cellIsSelected]) {
- NSColor *highlightColor = [controlView highlightColor];
+ NSColor *highlightColor = [self.outlineControlView highlightColor];
NSGradient *gradient = (highlightColor ?
[[[NSGradient alloc] initWithStartingColor:highlightColor endingColor:[highlightColor darkenAndAdjustSaturationBy:0.4f]] autorelease] :
[NSGradient selectedControlGradient]);

- if ([controlView isItemExpanded:proxyObject]) {
+ if ([self.outlineControlView isItemExpanded:proxyObject]) {
[gradient drawInBezierPath:[NSBezierPath bezierPathWithRoundedTopCorners:cellFrame radius:MOCKIE_RADIUS] angle:90.0f];
} else {
[gradient drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:cellFrame radius:MOCKIE_RADIUS] angle:90.0f];
@@ -91,7 +91,7 @@
//Remake of the cachedGradient method in AIListGroupCell, except supporting 2 gradients depending on group state
- (NSImage *)cachedGradient:(NSSize)inSize
{
- AIGroupState state = ([controlView isItemExpanded:proxyObject] ? AIGroupExpanded : AIGroupCollapsed);
+ AIGroupState state = ([self.outlineControlView isItemExpanded:proxyObject] ? AIGroupExpanded : AIGroupCollapsed);

if (!_mockieGradient[state] || !NSEqualSizes(inSize,_mockieGradientSize[state])) {
[_mockieGradient[state] release];
@@ -119,7 +119,7 @@
//upper corners so the group smoothly transitions to the contact below it.
- (void)drawBackgroundGradientInRect:(NSRect)rect
{
- if ([controlView isItemExpanded:proxyObject]) {
+ if ([self.outlineControlView isItemExpanded:proxyObject]) {
[[self backgroundGradient] drawInBezierPath:[NSBezierPath bezierPathWithRoundedTopCorners:rect radius:MOCKIE_RADIUS] angle:90.0f];
} else {
[[self backgroundGradient] drawInBezierPath:[NSBezierPath bezierPathWithRoundedRect:rect radius:MOCKIE_RADIUS] angle:90.0f];
@@ -147,7 +147,7 @@
rect.origin.y += DROP_HIGHLIGHT_HEIGHT_MARGIN / 2.0f;

NSBezierPath *path;
- if ([controlView isItemExpanded:proxyObject]) {
+ if ([self.outlineControlView isItemExpanded:proxyObject]) {
path = [NSBezierPath bezierPathWithRoundedTopCorners:rect radius:MOCKIE_RADIUS];
} else {
path = [NSBezierPath bezierPathWithRoundedRect:rect radius:MOCKIE_RADIUS];
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AIMessageEntryTextView.h
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Fri Nov 15 07:01:42 2019 -0500
@@ -68,7 +68,7 @@
NSColor *savedTextColor;
}

-@property (readwrite, assign, nonatomic) id<AIMessageEntryTextViewDelegate> delegate;
+@property (readwrite, assign, atomic) id<AIMessageEntryTextViewDelegate, NSTextDelegate> delegate;

//Configure
@property (readwrite, nonatomic) BOOL clearOnEscape;
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m Fri Nov 15 07:01:42 2019 -0500
@@ -79,6 +79,7 @@
@implementation AISimpleTextView

@synthesize string;
+
- (void)dealloc
{
[string release];
@@ -121,6 +122,8 @@

@implementation AIMessageEntryTextView

+@dynamic delegate;
+
- (void)_initMessageEntryTextView
{
associatedView = nil;
@@ -214,16 +217,6 @@
[super dealloc];
}

-- (void) setDelegate:(id<AIMessageEntryTextViewDelegate>)del
-{
- super.delegate = del;
-}
-
-- (id<AIMessageEntryTextViewDelegate>)delegate
-{
- return (id<AIMessageEntryTextViewDelegate>)super.delegate;
-}
-
- (void)keyDown:(NSEvent *)inEvent
{
NSString *charactersIgnoringModifiers = [inEvent charactersIgnoringModifiers];
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AITextAttachmentExtension.h
--- a/Frameworks/Adium Framework/Source/AITextAttachmentExtension.h Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AITextAttachmentExtension.h Fri Nov 15 07:01:42 2019 -0500
@@ -31,7 +31,6 @@
@property (readwrite, nonatomic) BOOL shouldSaveImageForLogging;
@property (readwrite, nonatomic) BOOL hasAlternate;
@property (readwrite, nonatomic, copy) NSString *path;
-@property (readwrite, nonatomic, retain) NSImage *image;
@property (readonly, nonatomic) NSImage *iconImage;
@property (readonly, nonatomic) BOOL attachesAnImage;
@property (readwrite, nonatomic) BOOL shouldAlwaysSendAsText;
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/AIXMLElement.m
--- a/Frameworks/Adium Framework/Source/AIXMLElement.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/AIXMLElement.m Fri Nov 15 07:01:42 2019 -0500
@@ -141,9 +141,9 @@
*/
- (void)setAttributeNames:(NSArray *)newAttrNames values:(NSArray *)newAttrVals
{
- NSAssert2([newAttrNames count] == [newAttrVals count], @"Attribute names and values have different lengths, %ui and %ui respectively", [newAttrNames count], [newAttrVals count]);
+ NSAssert2([newAttrNames count] == [newAttrVals count], @"Attribute names and values have different lengths, %lui and %lui respectively", (unsigned long)[newAttrNames count], [newAttrVals count]);
NSUInteger numberOfDuplicates = [newAttrNames count] - [[NSSet setWithArray:newAttrNames] count];
- NSAssert1(numberOfDuplicates == 0, @"Duplicate attributes are not allowed; found %ui duplicate(s)", numberOfDuplicates);
+ NSAssert1(numberOfDuplicates == 0, @"Duplicate attributes are not allowed; found %lui duplicate(s)", (unsigned long)numberOfDuplicates);

[attributeNames setArray:newAttrNames];
[attributeValues setArray:newAttrVals];
diff -r 200a01709ba4 -r 3596522bc931 Frameworks/Adium Framework/Source/JVFontPreviewField.m
--- a/Frameworks/Adium Framework/Source/JVFontPreviewField.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Frameworks/Adium Framework/Source/JVFontPreviewField.m Fri Nov 15 07:01:42 2019 -0500
@@ -67,7 +67,7 @@
[__delegate fontPreviewField:self didChangeToFont:font];
}

-- (NSUInteger) validModesForFontPanel:(NSFontPanel *) fontPanel
+- (NSFontPanelModeMask)validModesForFontPanel:(NSFontPanel *)fontPanel
{
unsigned int ret = NSFontPanelStandardModesMask;
if (!_showPointSize) ret ^= NSFontPanelSizeModeMask;
diff -r 200a01709ba4 -r 3596522bc931 Plists/Info.plist
--- a/Plists/Info.plist Thu Nov 14 20:40:08 2019 -0500
+++ b/Plists/Info.plist Fri Nov 15 07:01:42 2019 -0500
@@ -354,7 +354,7 @@
<key>CFBundleExecutable</key>
<string>Adium</string>
<key>CFBundleGetInfoString</key>
- <string>1.5.10.5hg, Copyright © 2001-2019 The Adium Team</string>
+ <string>1.5.11b3, Copyright © 2001-2016 The Adium Team</string>
<key>CFBundleHelpBookFolder</key>
<string>AdiumHelp</string>
<key>CFBundleHelpBookName</key>
@@ -370,7 +370,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.5.10.5hg</string>
+ <string>1.5.11b3</string>
<key>CFBundleSignature</key>
<string>AdIM</string>
<key>CFBundleURLTypes</key>
@@ -459,7 +459,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.5.10.5hg</string>
+ <string>1.5.11b3</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.social-networking</string>
<key>LSFileQuarantineEnabled</key>
@@ -841,5 +841,7 @@
</dict>
</dict>
</array>
+ <key>NSSupportsAutomaticGraphicsSwitching</key>
+ <true/>
</dict>
</plist>
diff -r 200a01709ba4 -r 3596522bc931 Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m
--- a/Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m Fri Nov 15 07:01:42 2019 -0500
@@ -491,7 +491,7 @@
NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:filePath error:NULL];
if (attributes && [attributes objectForKey:NSFilePosixPermissions]) {
NSNumber *posixInfo = [attributes objectForKey:NSFilePosixPermissions];
- posixFlags = [NSString stringWithFormat:@"%X", [posixInfo longValue]];
+ posixFlags = [NSString stringWithFormat:@"%lX", [posixInfo longValue]];
}

return posixFlags;
diff -r 200a01709ba4 -r 3596522bc931 Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Fri Nov 15 07:01:42 2019 -0500
@@ -383,7 +383,7 @@
// Let's create the hash
CC_SHA1([JPEGData bytes], (CC_LONG)[JPEGData length], digest);
imagehash = [[NSData dataWithBytes:digest length:20] retain];
- AILogWithSignature(@"Will update with hash %@; length is %u", imagehash, [JPEGData length]);
+ AILogWithSignature(@"Will update with hash %@; length is %lu", imagehash, (unsigned long)[JPEGData length]);
[self updatePHSH];
} else {
[[client client] reportError:@"Error adding image record" ofLevel:AWEzvWarning];
@@ -438,7 +438,7 @@
// Stop looking for new rendezvous clients
- (void)stopBrowsing
{
- AILogWithSignature(@"fServiceBrowser is %@ (retain count %i)", fServiceBrowser, [fServiceBrowser retainCount]);
+ AILogWithSignature(@"fServiceBrowser is %@ (retain count %lu)", fServiceBrowser, (unsigned long)[fServiceBrowser retainCount]);
[fServiceBrowser release]; fServiceBrowser = nil;
}

@@ -971,7 +971,7 @@
[self release];

} else {
- AILog(@"DNSServiceProcessResult() for socket descriptor %d returned an error! %d with CFSocketCallBackType %d and data %s\n",
+ AILog(@"DNSServiceProcessResult() for socket descriptor %d returned an error! %d with CFSocketCallBackType %lu and data %s\n",
DNSServiceRefSockFD(info), err, type, data);
}
}
diff -r 200a01709ba4 -r 3596522bc931 Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvRendezvousData.m Fri Nov 15 07:01:42 2019 -0500
@@ -612,7 +612,7 @@
}
hexdata[[(NSData *)value length] * 2] = '\0';

- [infoData appendFormat:@"%c", ([(NSData *)value length] * 2 + [key length] + 1)];
+ [infoData appendFormat:@"%lu", ([(NSData *)value length] * 2 + [key length] + 1)];
[infoData appendString:key];
[infoData appendString:@"="];
[infoData appendString:[NSString stringWithUTF8String:hexdata]];
@@ -620,7 +620,7 @@
} else {
const char *val = [(NSString *)value UTF8String];
NSInteger len = strlen(val);
- [infoData appendFormat:@"%c", len + [key length] + 1];
+ [infoData appendFormat:@"%lu", len + [key length] + 1];
[infoData appendString:key];
[infoData appendString:@"="];
[infoData appendString:value];
diff -r 200a01709ba4 -r 3596522bc931 Plugins/Bonjour/libezv/Private Classes/AWEzvXMLNode.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLNode.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLNode.m Fri Nov 15 07:01:42 2019 -0500
@@ -155,6 +155,6 @@

[string appendFormat:@"</%@>", name];

- return [NSString stringWithFormat:@"<AWEzvXMLNode %x:type %i:\"%@\">",self,type,string];
+ return [NSString stringWithFormat:@"<AWEzvXMLNode %@:type %i:\"%@\">",self,type,string];
}
@end
diff -r 200a01709ba4 -r 3596522bc931 Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Fri Nov 15 07:01:42 2019 -0500
@@ -1586,7 +1586,7 @@
NSMutableString *ms = [[NSMutableString alloc] init];
[ms appendString: [NSString stringWithFormat:@"<AsyncSocket %p", self]];
[ms appendString: [NSString stringWithFormat:@" local %@ remote %@ ", selfstr, peerstr]];
- [ms appendString: [NSString stringWithFormat:@"has queued %d reads %d writes, ", [theReadQueue count], [theWriteQueue count] ]];
+ [ms appendString: [NSString stringWithFormat:@"has queued %lu reads %d writes, ", (unsigned long)[theReadQueue count], [theWriteQueue count] ]];

if (theCurrentRead == nil)
[ms appendString: @"no current read, "];
@@ -1599,8 +1599,8 @@
else
percentDone = 100;

- [ms appendString: [NSString stringWithFormat:@"currently read %u bytes (%d%% done), ",
- [theCurrentRead->buffer length],
+ [ms appendString: [NSString stringWithFormat:@"currently read %lu bytes (%d%% done), ",
+ (unsigned long)[theCurrentRead->buffer length],
theCurrentRead->bytesDone ? percentDone : 0]];
}

@@ -1615,8 +1615,8 @@
else
percentDone = 100;

- [ms appendString: [NSString stringWithFormat:@"currently written %u (%d%%), ",
- [theCurrentWrite->buffer length],
+ [ms appendString: [NSString stringWithFormat:@"currently written %lu (%d%%), ",
+ (unsigned long)[theCurrentWrite->buffer length],
theCurrentWrite->bytesDone ? percentDone : 0]];
}

diff -r 200a01709ba4 -r 3596522bc931 Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m Fri Nov 15 07:01:42 2019 -0500
@@ -375,7 +375,7 @@
// Status Code 200 - OK
CFHTTPMessageRef response = CFHTTPMessageCreateResponse(kCFAllocatorDefault, 200, NULL, kCFHTTPVersion1_1);
[self setHeaderFields:response forURI:[uri relativeString] appleSingle: isAppleSingle keepAlive:isKeepAlive];
- NSString *contentLength = [NSString stringWithFormat:@"%i", [data length]];
+ NSString *contentLength = [NSString stringWithFormat:@"%lu", (unsigned long)[data length]];
CFHTTPMessageSetHeaderFieldValue(response, CFSTR("Content-Length"), (CFStringRef)contentLength);

//NSDictionary *responseHeaders = [(NSDictionary *)CFHTTPMessageCopyAllHeaderFields(response) autorelease];
diff -r 200a01709ba4 -r 3596522bc931 Plugins/Dual Window Interface/AIMessageTabViewItem.h
--- a/Plugins/Dual Window Interface/AIMessageTabViewItem.h Thu Nov 14 20:40:08 2019 -0500
+++ b/Plugins/Dual Window Interface/AIMessageTabViewItem.h Fri Nov 15 07:01:42 2019 -0500
@@ -32,12 +32,10 @@
- (void)tabViewItemWillDeselect;
- (void)tabViewDidChangeVisibility;

-@property (readonly, nonatomic) NSString *label;
@property (readonly, nonatomic) NSImage *icon;
@property (readonly, nonatomic) NSImage *statusIcon;
@property (readonly, nonatomic) NSImage *stateIcon;
@property (readonly, nonatomic) AIChat *chat;
-@property (readonly, nonatomic) NSImage *image;
@property (readonly, nonatomic) AIMessageViewController *messageViewController;
@property (readwrite, nonatomic, retain) AIMessageWindowController *windowController;

diff -r 200a01709ba4 -r 3596522bc931 Plugins/Dual Window Interface/AIMessageWindowController.h
--- a/Plugins/Dual Window Interface/AIMessageWindowController.h Thu Nov 14 20:40:08 2019 -0500
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.h Fri Nov 15 07:01:42 2019 -0500
@@ -71,11 +71,6 @@
*/
@property (readonly, nonatomic) NSArray *containedChats;

-/*
- * @brief The window
- */
-@property (readonly, nonatomic) NSWindow *window;
-
//Contained Chats
- (void)addTabViewItem:(AIMessageTabViewItem *)inTabViewItem;
- (void)addTabViewItem:(AIMessageTabViewItem *)inTabViewItem atIndex:(NSInteger)index silent:(BOOL)silent;
diff -r 200a01709ba4 -r 3596522bc931 Plugins/Image Uploading Plugin/AIGenericMultipartImageUploader.m
--- a/Plugins/Image Uploading Plugin/AIGenericMultipartImageUploader.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Plugins/Image Uploading Plugin/AIGenericMultipartImageUploader.m Fri Nov 15 07:01:42 2019 -0500
@@ -128,8 +128,8 @@

NSBitmapImageFileType bestType;

- NSData *pngRepresentation = [[image largestBitmapImageRep] representationUsingType:NSPNGFileType properties:nil];
- NSData *jpgRepresentation = [[image largestBitmapImageRep] representationUsingType:NSJPEGFileType properties:nil];
+ NSData *pngRepresentation = [[image largestBitmapImageRep] representationUsingType:NSPNGFileType properties:@{}];
+ NSData *jpgRepresentation = [[image largestBitmapImageRep] representationUsingType:NSJPEGFileType properties:@{}];
NSData *imageRepresentation;

if (pngRepresentation.length > jpgRepresentation.length) {
diff -r 200a01709ba4 -r 3596522bc931 Plugins/Purple Service/AIPurpleGTalkAccount.h
--- a/Plugins/Purple Service/AIPurpleGTalkAccount.h Thu Nov 14 20:40:08 2019 -0500
+++ b/Plugins/Purple Service/AIPurpleGTalkAccount.h Fri Nov 15 07:01:42 2019 -0500
@@ -16,8 +16,15 @@

#import "ESPurpleJabberAccount.h"

+#define KEY_GTALK_CODE @"GTalk:Code"
+#define KEY_GTALK_UPGRADED_OAUTH2 @"GTalk:OAuth2 Upgraded"
+
+#define ADIUM_GTALK_CLIENT_ID @"853036734951.apps.googleusercontent.com"
+#define ADIUM_GTALK_SECRET @"TSXNUaq34k_0YU7DZT4HbmQd"
+
@interface AIPurpleGTalkAccount : ESPurpleJabberAccount {
-
+ NSMutableData *response;
+ NSURLConnection *conn;
}

@end
diff -r 200a01709ba4 -r 3596522bc931 Plugins/Purple Service/AIPurpleGTalkAccount.m
--- a/Plugins/Purple Service/AIPurpleGTalkAccount.m Thu Nov 14 20:40:08 2019 -0500
+++ b/Plugins/Purple Service/AIPurpleGTalkAccount.m Fri Nov 15 07:01:42 2019 -0500
@@ -15,6 +15,17 @@
*/

#import "AIPurpleGTalkAccount.h"
+#import "auth_gtalk.h"
+#import "AIKeychain.h"
+
+#import "JSONKit.h"
+
+#import "AIService.h"
+
+#import <Adium/AIAccountControllerProtocol.h>
+#import <Adium/AIInterfaceControllerProtocol.h>
+
+#import "NSData+Base64.h"

@implementation AIPurpleGTalkAccount

@@ -39,6 +50,13 @@
return [completeUserName UTF8String];
}

+- (void)dealloc {
+ [response release];
+ [conn release];
+
+ [super dealloc];
+}
+
- (NSString *)serverSuffix
{
return @"@gmail.com";
@@ -84,4 +102,230 @@
return NO;
}

+/* Add the authentication mechanism for X-OAUTH2. Note that if the server offers it,
+ * it will be used preferentially over any other mechanism e.g. PLAIN. */
+- (void)setGTalkMechEnabled:(BOOL)inEnabled
+{
+ static BOOL enabledGTalkMech = NO;
+ if (inEnabled != enabledGTalkMech) {
+ if (inEnabled)
+ jabber_auth_add_mech(jabber_auth_get_gtalk_mech());
+ else
+ jabber_auth_remove_mech(jabber_auth_get_gtalk_mech());
+
+ enabledGTalkMech = inEnabled;
+ }
+}
+
+- (void)promptUpgrade:(NSNumber *)number userInfo:(id)info suppression:(NSNumber *)suppressed {
+ if ([number integerValue] == 1) {
+ [adium.accountController editAccount:self onWindow:nil notifyingTarget:self];
+ }
+}
+
+- (void)connect
+{
+ if (!self.UID.length) {