adium/adium
Merged GoogleOAuth2 into adium-1.6
+88
-3
+1
-1
+3
-0
+1
-0
+0
-0
+1
-2
+7
-1
+230
-0
+7
-1
+48
-3
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+2905
-0
+0
-0
+75
-0
+4
-0
+2
-4
+0
-0
+++ b/Adium.xcodeproj/project.pbxproj Wed Apr 01 20:32:24 2015 +0200
@@ -1354,11 +1354,14 @@
765F5D71162F483F00C57904 /* AIOTRSMPSharedSecretWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5D70162F483F00C57904 /* AIOTRSMPSharedSecretWindowController.xib */; };
765F5D74162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 765F5D73162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m */; };
765F5DC51635934400C57904 /* AIRejoinGroupChatTopBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */; };
+ 761D6A251ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 761D6A231ACC5F0B002079F2 /* ESPurpleGTalkAccountView.nib */; };
7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
76674647178D8A9000F65048 /* AIOTRTopBarUnverifiedContactController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76674646178D8A9000F65048 /* AIOTRTopBarUnverifiedContactController.m */; };
7667464C178D8B2700F65048 /* AIOTRTopBarUnverifiedContactController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7667464B178D8B2700F65048 /* AIOTRTopBarUnverifiedContactController.xib */; };
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 */; };
@@ -4433,16 +4436,46 @@
765F5D72162F48FA00C57904 /* AIOTRSMPSharedSecretWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIOTRSMPSharedSecretWindowController.h; path = Source/AIOTRSMPSharedSecretWindowController.h; sourceTree = "<group>"; };
765F5D73162F48FB00C57904 /* AIOTRSMPSharedSecretWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIOTRSMPSharedSecretWindowController.m; path = Source/AIOTRSMPSharedSecretWindowController.m; sourceTree = "<group>"; };
765F5DC61635934400C57904 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/AIRejoinGroupChatTopBar.xib; sourceTree = "<group>"; };
+ 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>"; };
76674645178D8A8F00F65048 /* AIOTRTopBarUnverifiedContactController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIOTRTopBarUnverifiedContactController.h; path = Source/AIOTRTopBarUnverifiedContactController.h; sourceTree = "<group>"; };
76674646178D8A9000F65048 /* AIOTRTopBarUnverifiedContactController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIOTRTopBarUnverifiedContactController.m; path = Source/AIOTRTopBarUnverifiedContactController.m; sourceTree = "<group>"; };
7667464B178D8B2700F65048 /* AIOTRTopBarUnverifiedContactController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AIOTRTopBarUnverifiedContactController.xib; path = Resources/AIOTRTopBarUnverifiedContactController.xib; 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>"; };
767870E21634045C00BD0E4D /* AIMessageViewTopBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMessageViewTopBarController.h; path = Source/AIMessageViewTopBarController.h; sourceTree = "<group>"; };
767870E31634045C00BD0E4D /* AIMessageViewTopBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMessageViewTopBarController.m; path = Source/AIMessageViewTopBarController.m; 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>"; };
76980AC0173E6C8800FBDA15 /* libidn.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libidn.framework; path = Frameworks/libidn.framework; sourceTree = "<group>"; };
769D634A17393CBE008B97BC /* AMPurpleJabberDiscoveryBrowser.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AMPurpleJabberDiscoveryBrowser.xib; path = "Plugins/Purple Service/AMPurpleJabberDiscoveryBrowser.xib"; sourceTree = "<group>"; };
@@ -4561,8 +4594,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 = 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>"; };
@@ -5072,6 +5105,8 @@
@@ -8543,6 +8578,7 @@
@@ -9024,6 +9060,7 @@
@@ -9368,7 +9405,7 @@
@@ -9565,6 +9602,16 @@
@@ -9672,6 +9719,8 @@
@@ -10225,6 +10274,7 @@
@@ -12435,6 +12485,41 @@
+++ b/AdiumHelp/pgs/Accounts-CreatingAccounts.html Wed Apr 01 20:32:24 2015 +0200
@@ -53,7 +53,7 @@
+++ b/ChangeLogs/Changes.txt Wed Apr 01 20:32:24 2015 +0200
@@ -81,6 +81,9 @@
+++ b/Copyright.txt Wed Apr 01 20:32:24 2015 +0200
@@ -71,6 +71,7 @@
+++ b/Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m Wed Apr 01 20:32:24 2015 +0200
@@ -311,7 +311,7 @@
[[[manager client] client] reportError:[NSString stringWithFormat: @"Download failed! Error - %@ %@",
@@ -335,7 +335,6 @@
+++ b/Plugins/Purple Service/AIPurpleGTalkAccount.h Wed Apr 01 20:32:24 2015 +0200
@@ -16,8 +16,14 @@
+++ b/Plugins/Purple Service/AIPurpleGTalkAccount.m Wed Apr 01 20:32:24 2015 +0200
@@ -15,6 +15,17 @@
@@ -39,6 +50,13 @@
@@ -84,4 +102,216 @@
+ NSString *refresh_token = [[AIKeychain defaultKeychain_error:NULL] findGenericPasswordForService:self.service.serviceID
+ withDescription:[NSString stringWithFormat:AILocalizedString(@"Adium uses a new, more secure way to sign in to Google Talk. To use this, you must authorize your account.", nil)]
+ NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"https://www.googleapis.com/oauth2/v3/token"]];
+ [request setValue:@"application/x-www-form-urlencoded ; charset=UTF-8" forHTTPHeaderField:@"Content-Type"];
+ [request setValue:[NSString stringWithFormat:@"%u", (unsigned int)[data length]] forHTTPHeaderField:@"Content-Length"];
+ @"&grant_type=authorization_code", [self preferenceForKey:KEY_GTALK_CODE group:GROUP_ACCOUNT_STATUS]];
+ NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"https://www.googleapis.com/oauth2/v3/token"]];
+ [request setValue:@"application/x-www-form-urlencoded ; charset=UTF-8" forHTTPHeaderField:@"Content-Type"];
+ [request setValue:[NSString stringWithFormat:@"%u", (unsigned int)[data length]] forHTTPHeaderField:@"Content-Length"];
+ [[AIKeychain defaultKeychain_error:NULL] addGenericPassword:[responseDict objectForKey:@"refresh_token"]
+ [self setLastDisconnectionError:[NSString stringWithFormat:AILocalizedString(@"OAuth authentication failed: %@", nil), error.description]];
+++ b/Plugins/Purple Service/AIPurpleGTalkAccountViewController.h Wed Apr 01 20:32:24 2015 +0200
@@ -17,7 +17,13 @@
+++ b/Plugins/Purple Service/AIPurpleGTalkAccountViewController.m Wed Apr 01 20:32:24 2015 +0200
@@ -15,10 +15,15 @@
@@ -30,9 +35,49 @@
+++ b/Plugins/Purple Service/Resources/ca.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/cs.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/da.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/de.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/el_GR.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/en.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/en_AU.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/en_CA.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/en_GB.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/es.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/fi.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/fr.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/fr_CA.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/hu.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/is.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/it.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/ja.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/nb.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/nl.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/pl.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/pt.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/pt_PT.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/ru.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/sk_SK.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/sl.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/sv.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/tr.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/Resources/uk.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,2905 @@
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser and copy the generated code to Adium.</string>
+ <string key="minorKey">AdiumLibpurple.framework/Headers/AIPurpleGTalkAccountViewController.h</string>
+++ b/Plugins/Purple Service/libpurple_extensions/auth_gtalk.c Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,75 @@
+++ b/Plugins/Purple Service/libpurple_extensions/auth_gtalk.h Wed Apr 01 20:32:24 2015 +0200
@@ -0,0 +1,4 @@
+++ b/README.md Wed Apr 01 20:32:24 2015 +0200
@@ -1,11 +1,9 @@
+[](https://sourceforge.net/projects/adium/files/Adium_1.5.10.dmg/download?accel_key=67%3A1400803646%3Ahttps%253A//adium.im/%3A5c8289c7%2445aedffbd5670cadf988490fc5ac9588a4a1621e&click_id=38f81be2-e20e-11e3-8070-0200ac1d1d8c-1&source=accel)