adium 4319:e053e15ad337: Backout 8983c14bea2f since some people ...
commits at adium.im
commits at adium.im
Mon Nov 28 05:48:46 UTC 2011
details: http://hg.adium.im/adium/rev/e053e15ad337
revision: 4319:e053e15ad337
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sun Nov 27 18:13:28 2011 -0500
Backout 8983c14bea2f since some people have issues compiling Adium. Fixes #15391
Subject: adium 4320:427187278827: Correct 21ab21e877e0 by making 'Reopen Closed Tab' localizable. Fixes #15606
details: http://hg.adium.im/adium/rev/427187278827
revision: 4320:427187278827
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sun Nov 27 18:25:56 2011 -0500
Correct 21ab21e877e0 by making 'Reopen Closed Tab' localizable. Fixes #15606
Subject: adium 4321:193d1847862a: Fix #15567 by moving the border to be on top of the gear button.
details: http://hg.adium.im/adium/rev/193d1847862a
revision: 4321:193d1847862a
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sun Nov 27 18:36:17 2011 -0500
Fix #15567 by moving the border to be on top of the gear button.
Subject: adium 4322:7612c9430b24: To make life easier I turned Facebook's account view into a nib and removed the AILocalizedStrings since -sizeToFit doesn't take height into account. Fixes #15607 and localizable-strings has been run.
details: http://hg.adium.im/adium/rev/7612c9430b24
revision: 4322:7612c9430b24
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Mon Nov 28 00:39:52 2011 -0500
To make life easier I turned Facebook's account view into a nib and removed the AILocalizedStrings since -sizeToFit doesn't take height into account. Fixes #15607 and localizable-strings has been run.
diffs (truncated from 5635 to 1000 lines):
diff -r b08eeb55787a -r 7612c9430b24 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sat Nov 26 16:01:20 2011 -0800
+++ b/Adium.xcodeproj/project.pbxproj Mon Nov 28 00:39:52 2011 -0500
@@ -382,6 +382,7 @@
346BA33F0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA33D0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m */; };
346BA3450774C2D200628F06 /* ESGlobalEventsPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 346BA3430774C2D200628F06 /* ESGlobalEventsPreferences.m */; };
346BA3640774C35500628F06 /* GlobalEventsPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 346BA3630774C35400628F06 /* GlobalEventsPreferences.nib */; };
+ 346F5D3208A43E7B0055C610 /* CurrentTunes.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 346F5CB308A418FB0055C610 /* CurrentTunes.scpt */; };
347374BD0AA9206B00AD18E3 /* ShortcutRecorder.strings in Resources */ = {isa = PBXBuildFile; fileRef = 347374BB0AA9206B00AD18E3 /* ShortcutRecorder.strings */; };
3474E000082550FD00BF30F0 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 3474DFFF082550FD00BF30F0 /* Credits.rtf */; };
3474E0910825634300BF30F0 /* StatusPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3474E0900825634300BF30F0 /* StatusPreferences.nib */; };
@@ -674,7 +675,6 @@
34D0FF8509569FE500DCB678 /* PersonalPreferencesDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D0FF8409569FE500DCB678 /* PersonalPreferencesDefaults.plist */; };
34D8153A13B663650022C8C4 /* AIFacebookXMPPAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */; };
34D8153B13B663650022C8C4 /* AIFacebookXMPPAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */; };
- 34D8153C13B663650022C8C4 /* AIFacebookXMPPAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D8153213B663650022C8C4 /* AIFacebookXMPPAccountView.xib */; };
34D8153D13B663650022C8C4 /* AIFacebookXMPPAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */; };
34D8153E13B663650022C8C4 /* AIFacebookXMPPAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153413B663650022C8C4 /* AIFacebookXMPPAccountViewController.m */; };
34D8153F13B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34D8153513B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib */; };
@@ -1110,18 +1110,7 @@
4F1CB64C0D640F4F0073A1E6 /* ContactInfoInspector.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.nib */; };
5A1781860EC1215D00BA1E04 /* AIAutoScrollTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */; };
5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A17D65C130F76B4002C852F /* AIGradientView.m */; };
- 5A23E0B513EDB9950032EF52 /* CurrentTunes.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0B413EDB9950032EF52 /* CurrentTunes.applescript */; };
- 5A23E0BC13EDB9CD0032EF52 /* AdiumAddressBookAction_AIM.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0B613EDB9CD0032EF52 /* AdiumAddressBookAction_AIM.applescript */; };
- 5A23E0BD13EDB9CD0032EF52 /* AdiumAddressBookAction_ICQ.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0B713EDB9CD0032EF52 /* AdiumAddressBookAction_ICQ.applescript */; };
- 5A23E0BE13EDB9CD0032EF52 /* AdiumAddressBookAction_Jabber.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0B813EDB9CD0032EF52 /* AdiumAddressBookAction_Jabber.applescript */; };
- 5A23E0BF13EDB9CD0032EF52 /* AdiumAddressBookAction_MSN.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0B913EDB9CD0032EF52 /* AdiumAddressBookAction_MSN.applescript */; };
- 5A23E0C013EDB9CD0032EF52 /* AdiumAddressBookAction_SMS.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0BA13EDB9CD0032EF52 /* AdiumAddressBookAction_SMS.applescript */; };
- 5A23E0C113EDB9CD0032EF52 /* AdiumAddressBookAction_Yahoo.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0BB13EDB9CD0032EF52 /* AdiumAddressBookAction_Yahoo.applescript */; };
- 5A23E0CB13EDC2E50032EF52 /* ActiveApplication.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0C613EDC2E50032EF52 /* ActiveApplication.applescript */; };
- 5A23E0CC13EDC2E50032EF52 /* AdiumBuild.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0C713EDC2E50032EF52 /* AdiumBuild.applescript */; };
- 5A23E0CD13EDC2E50032EF52 /* AdiumVersion.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0C813EDC2E50032EF52 /* AdiumVersion.applescript */; };
- 5A23E0CE13EDC2E50032EF52 /* StatusMessage.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0C913EDC2E50032EF52 /* StatusMessage.applescript */; };
- 5A23E0CF13EDC2E50032EF52 /* Uptime.applescript in Sources */ = {isa = PBXBuildFile; fileRef = 5A23E0CA13EDC2E50032EF52 /* Uptime.applescript */; };
+ 5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.nib */; };
5A5F601D12962EC0007A2232 /* AISegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A5F601A12962D06007A2232 /* AISegmentedControl.m */; };
5A5F601E12962ECE007A2232 /* AISegmentedControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A5F601912962D06007A2232 /* AISegmentedControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
5A5F8BBD12D560E400019727 /* AIDockNameOverlay.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A5F8BBC12D560E400019727 /* AIDockNameOverlay.m */; };
@@ -1369,6 +1358,12 @@
636D92BE0E4E97AA00E5F558 /* AIAddressBookUserIconSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 3403F4310D2EF01D006B08FB /* AIAddressBookUserIconSource.m */; };
636D92CD0E4E990500E5F558 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 348E5ACA06D2A74C004C051C /* AddressBook.framework */; };
636D93400E4E9ED600E5F558 /* AB Display Format Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4E207B59B65006641B9 /* AB Display Format Defaults.plist */; };
+ 636D93890E4EA23F00E5F558 /* AdiumAddressBookAction_Yahoo.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 636D93660E4E9FD300E5F558 /* AdiumAddressBookAction_Yahoo.scpt */; };
+ 636D938A0E4EA23F00E5F558 /* AdiumAddressBookAction_SMS.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 636D93670E4E9FD300E5F558 /* AdiumAddressBookAction_SMS.scpt */; };
+ 636D938B0E4EA23F00E5F558 /* AdiumAddressBookAction_MSN.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 636D93680E4E9FD300E5F558 /* AdiumAddressBookAction_MSN.scpt */; };
+ 636D938C0E4EA23F00E5F558 /* AdiumAddressBookAction_Jabber.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 636D93690E4E9FD300E5F558 /* AdiumAddressBookAction_Jabber.scpt */; };
+ 636D938D0E4EA23F00E5F558 /* AdiumAddressBookAction_ICQ.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 636D936A0E4E9FD300E5F558 /* AdiumAddressBookAction_ICQ.scpt */; };
+ 636D938E0E4EA23F00E5F558 /* AdiumAddressBookAction_AIM.scpt in Resources */ = {isa = PBXBuildFile; fileRef = 636D936B0E4E9FD300E5F558 /* AdiumAddressBookAction_AIM.scpt */; };
636D93F40E4EAB7500E5F558 /* AIContactObserverManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 34555C5E0DB6BCE500649CD4 /* AIContactObserverManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
636D94090E4EAB9D00E5F558 /* AIContactObserverManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 34555C5F0DB6BCE500649CD4 /* AIContactObserverManager.m */; };
637864550F9BE1AB0040DEDA /* AutoHyperlinks.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 3496A8EA07CE6CA30055BBAB /* AutoHyperlinks.framework */; };
@@ -2962,6 +2957,7 @@
346C9C200E70E1F8002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = hu; path = "Plugins/WebKit Message View/hu.lproj/WebKitPreferencesView.nib"; sourceTree = "<group>"; };
346CFDC4087B7836009711C8 /* AdiumIdleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AdiumIdleManager.h; path = Source/AdiumIdleManager.h; sourceTree = "<group>"; };
346CFDC5087B7836009711C8 /* AdiumIdleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AdiumIdleManager.m; path = Source/AdiumIdleManager.m; sourceTree = "<group>"; };
+ 346F5CB308A418FB0055C610 /* CurrentTunes.scpt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.scpt; name = CurrentTunes.scpt; path = Resources/CurrentTunes.scpt; sourceTree = "<group>"; };
347065E406015DC5004F0D20 /* WebKit Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; name = "WebKit Defaults.plist"; path = "Plugins/WebKit Message View/WebKit Defaults.plist"; sourceTree = "<group>"; };
347374BC0AA9206B00AD18E3 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
347374F00AA920F300AD18E3 /* ca */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = ca; path = Resources/ca.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -3560,7 +3556,6 @@
34D43504051ADC10003B2F21 /* DualWindowDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = DualWindowDefaults.plist; path = "Plugins/Dual Window Interface/DualWindowDefaults.plist"; sourceTree = "<group>"; };
34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFacebookXMPPAccount.h; path = "Plugins/Purple Service/AIFacebookXMPPAccount.h"; sourceTree = "<group>"; };
34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIFacebookXMPPAccount.m; path = "Plugins/Purple Service/AIFacebookXMPPAccount.m"; sourceTree = "<group>"; };
- 34D8153213B663650022C8C4 /* AIFacebookXMPPAccountView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AIFacebookXMPPAccountView.xib; path = "Plugins/Purple Service/AIFacebookXMPPAccountView.xib"; sourceTree = "<group>"; };
34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFacebookXMPPAccountViewController.h; path = "Plugins/Purple Service/AIFacebookXMPPAccountViewController.h"; sourceTree = "<group>"; };
34D8153413B663650022C8C4 /* AIFacebookXMPPAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIFacebookXMPPAccountViewController.m; path = "Plugins/Purple Service/AIFacebookXMPPAccountViewController.m"; sourceTree = "<group>"; };
34D8153513B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AIFacebookXMPPOauthWebViewWindow.xib; path = "Plugins/Purple Service/AIFacebookXMPPOauthWebViewWindow.xib"; sourceTree = "<group>"; };
@@ -4059,18 +4054,7 @@
5A17D65B130F76B4002C852F /* AIGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIGradientView.h; path = Source/AIGradientView.h; sourceTree = "<group>"; };
5A17D65C130F76B4002C852F /* AIGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIGradientView.m; path = Source/AIGradientView.m; sourceTree = "<group>"; };
5A1FEA601334549300C14951 /* MessageView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MessageView.xib; path = "Plugins/Dual Window Interface/MessageView.xib"; sourceTree = "<group>"; };
- 5A23E0B413EDB9950032EF52 /* CurrentTunes.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = CurrentTunes.applescript; path = Resources/CurrentTunes.applescript; sourceTree = "<group>"; };
- 5A23E0B613EDB9CD0032EF52 /* AdiumAddressBookAction_AIM.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = AdiumAddressBookAction_AIM.applescript; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.applescript"; sourceTree = "<group>"; };
- 5A23E0B713EDB9CD0032EF52 /* AdiumAddressBookAction_ICQ.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = AdiumAddressBookAction_ICQ.applescript; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_ICQ.applescript"; sourceTree = "<group>"; };
- 5A23E0B813EDB9CD0032EF52 /* AdiumAddressBookAction_Jabber.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = AdiumAddressBookAction_Jabber.applescript; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Jabber.applescript"; sourceTree = "<group>"; };
- 5A23E0B913EDB9CD0032EF52 /* AdiumAddressBookAction_MSN.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = AdiumAddressBookAction_MSN.applescript; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_MSN.applescript"; sourceTree = "<group>"; };
- 5A23E0BA13EDB9CD0032EF52 /* AdiumAddressBookAction_SMS.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = AdiumAddressBookAction_SMS.applescript; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_SMS.applescript"; sourceTree = "<group>"; };
- 5A23E0BB13EDB9CD0032EF52 /* AdiumAddressBookAction_Yahoo.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = AdiumAddressBookAction_Yahoo.applescript; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.applescript"; sourceTree = "<group>"; };
- 5A23E0C613EDC2E50032EF52 /* ActiveApplication.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = ActiveApplication.applescript; path = "Resources/Scripts/System Statistics.AdiumScripts/ActiveApplication.applescript"; sourceTree = "<group>"; };
- 5A23E0C713EDC2E50032EF52 /* AdiumBuild.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = AdiumBuild.applescript; path = "Resources/Scripts/System Statistics.AdiumScripts/AdiumBuild.applescript"; sourceTree = "<group>"; };
- 5A23E0C813EDC2E50032EF52 /* AdiumVersion.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = AdiumVersion.applescript; path = "Resources/Scripts/System Statistics.AdiumScripts/AdiumVersion.applescript"; sourceTree = "<group>"; };
- 5A23E0C913EDC2E50032EF52 /* StatusMessage.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = StatusMessage.applescript; path = "Resources/Scripts/System Statistics.AdiumScripts/StatusMessage.applescript"; sourceTree = "<group>"; };
- 5A23E0CA13EDC2E50032EF52 /* Uptime.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; name = Uptime.applescript; path = "Resources/Scripts/System Statistics.AdiumScripts/Uptime.applescript"; sourceTree = "<group>"; };
+ 5A22D6E114834F44004E15F7 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = "Plugins/Purple Service/en.lproj/AIFacebookXMPPAccountView.nib"; sourceTree = "<group>"; };
5A5F601912962D06007A2232 /* AISegmentedControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AISegmentedControl.h; path = "Frameworks/AIUtilities Framework/Source/AISegmentedControl.h"; sourceTree = "<group>"; };
5A5F601A12962D06007A2232 /* AISegmentedControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AISegmentedControl.m; path = "Frameworks/AIUtilities Framework/Source/AISegmentedControl.m"; sourceTree = "<group>"; };
5A5F8BBB12D560E400019727 /* AIDockNameOverlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIDockNameOverlay.h; path = "Plugins/Dock Icon Badging/AIDockNameOverlay.h"; sourceTree = "<group>"; };
@@ -4435,6 +4419,12 @@
6360B2590BF2EB93004CD99B /* AIWebKitDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIWebKitDelegate.m; path = "Plugins/WebKit Message View/AIWebKitDelegate.m"; sourceTree = "<group>"; };
636C6E5D0ED56D0100E0E528 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; };
636D8C970E4E95A500E5F558 /* AIAddressBookController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAddressBookController.m; path = "Frameworks/Adium Framework/Source/AIAddressBookController.m"; sourceTree = "<group>"; };
+ 636D93660E4E9FD300E5F558 /* AdiumAddressBookAction_Yahoo.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_Yahoo.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.scpt"; sourceTree = "<group>"; };
+ 636D93670E4E9FD300E5F558 /* AdiumAddressBookAction_SMS.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_SMS.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_SMS.scpt"; sourceTree = "<group>"; };
+ 636D93680E4E9FD300E5F558 /* AdiumAddressBookAction_MSN.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_MSN.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_MSN.scpt"; sourceTree = "<group>"; };
+ 636D93690E4E9FD300E5F558 /* AdiumAddressBookAction_Jabber.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_Jabber.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Jabber.scpt"; sourceTree = "<group>"; };
+ 636D936A0E4E9FD300E5F558 /* AdiumAddressBookAction_ICQ.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_ICQ.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_ICQ.scpt"; sourceTree = "<group>"; };
+ 636D936B0E4E9FD300E5F558 /* AdiumAddressBookAction_AIM.scpt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.scpt; name = AdiumAddressBookAction_AIM.scpt; path = "Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.scpt"; sourceTree = "<group>"; };
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>"; };
@@ -5644,7 +5634,7 @@
children = (
34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */,
34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */,
- 34D8153213B663650022C8C4 /* AIFacebookXMPPAccountView.xib */,
+ 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.nib */,
34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */,
34D8153413B663650022C8C4 /* AIFacebookXMPPAccountViewController.m */,
34D8153513B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib */,
@@ -6241,7 +6231,7 @@
34CF9DEF085B8B3D00D87E37 /* iTunes Now Playing */ = {
isa = PBXGroup;
children = (
- 5A23E0B413EDB9950032EF52 /* CurrentTunes.applescript */,
+ 346F5CB308A418FB0055C610 /* CurrentTunes.scpt */,
34CF9DF2085B8B7900D87E37 /* ESiTunesPlugin.h */,
34CF9DF3085B8B7900D87E37 /* ESiTunesPlugin.m */,
);
@@ -7216,7 +7206,6 @@
4BF2E6BE067CB72400743318 /* Xtras (Built In) */ = {
isa = PBXGroup;
children = (
- 5A23E0C513EDC2C40032EF52 /* System Statistics */,
112B483E0F82E91200690E84 /* Group Chat Status Icons */,
34A29D9406ED68BF00E1366C /* Contact List */,
3408254D075B078B00703011 /* Dock Icons */,
@@ -7333,18 +7322,6 @@
name = Growl;
sourceTree = "<group>";
};
- 5A23E0C513EDC2C40032EF52 /* System Statistics */ = {
- isa = PBXGroup;
- children = (
- 5A23E0C613EDC2E50032EF52 /* ActiveApplication.applescript */,
- 5A23E0C713EDC2E50032EF52 /* AdiumBuild.applescript */,
- 5A23E0C813EDC2E50032EF52 /* AdiumVersion.applescript */,
- 5A23E0C913EDC2E50032EF52 /* StatusMessage.applescript */,
- 5A23E0CA13EDC2E50032EF52 /* Uptime.applescript */,
- );
- name = "System Statistics";
- sourceTree = "<group>";
- };
5A8A6A46124456B1004965A8 /* Segmented control with menu popup */ = {
isa = PBXGroup;
children = (
@@ -8065,12 +8042,12 @@
636D930E0E4E9DDD00E5F558 /* Address Book Integration */ = {
isa = PBXGroup;
children = (
- 5A23E0B613EDB9CD0032EF52 /* AdiumAddressBookAction_AIM.applescript */,
- 5A23E0B713EDB9CD0032EF52 /* AdiumAddressBookAction_ICQ.applescript */,
- 5A23E0B813EDB9CD0032EF52 /* AdiumAddressBookAction_Jabber.applescript */,
- 5A23E0B913EDB9CD0032EF52 /* AdiumAddressBookAction_MSN.applescript */,
- 5A23E0BA13EDB9CD0032EF52 /* AdiumAddressBookAction_SMS.applescript */,
- 5A23E0BB13EDB9CD0032EF52 /* AdiumAddressBookAction_Yahoo.applescript */,
+ 636D93660E4E9FD300E5F558 /* AdiumAddressBookAction_Yahoo.scpt */,
+ 636D93670E4E9FD300E5F558 /* AdiumAddressBookAction_SMS.scpt */,
+ 636D93680E4E9FD300E5F558 /* AdiumAddressBookAction_MSN.scpt */,
+ 636D93690E4E9FD300E5F558 /* AdiumAddressBookAction_Jabber.scpt */,
+ 636D936A0E4E9FD300E5F558 /* AdiumAddressBookAction_ICQ.scpt */,
+ 636D936B0E4E9FD300E5F558 /* AdiumAddressBookAction_AIM.scpt */,
34E2A2EE07B018B1006735BC /* AIAddressBookController.h */,
636D8C970E4E95A500E5F558 /* AIAddressBookController.m */,
3403F4300D2EF01D006B08FB /* AIAddressBookUserIconSource.h */,
@@ -9236,7 +9213,6 @@
4BF2E91F067CB76300743318 /* Copy Built-in Xtras */,
34BD9D6A053146CC000AB133 /* Copy AdiumPlugins */,
345DFF4A05564DB200CEE7B3 /* Run Generate Buildnum File Script */,
- 5A23E0D513EDC4E60032EF52 /* Move System Statistics Scripts */,
);
buildRules = (
81F9D1DF0A7F81A5004A35BD /* PBXBuildRule */,
@@ -9505,10 +9481,10 @@
345D68990F1FD56B002F2D01 /* facebook.png in Resources */,
345D689A0F1FD56B002F2D01 /* facebook-small.png in Resources */,
1150A9960FBE48D600E0BD31 /* ESIRCAccountView.nib in Resources */,
- 34D8153C13B663650022C8C4 /* AIFacebookXMPPAccountView.xib in Resources */,
34D8153F13B663650022C8C4 /* AIFacebookXMPPOauthWebViewWindow.xib in Resources */,
34C8D06C13B688670073718A /* f_logo_small.png in Resources */,
34C8D06D13B688670073718A /* f_logo.png in Resources */,
+ 5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.nib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9525,6 +9501,7 @@
6318DBA60F8D93F200C5E584 /* Template.html in Resources */,
9EF0DBFA09D944C200FBCC1E /* Resources/block.png in Resources */,
9EF0DBFB09D944C200FBCC1E /* Resources/unblock.png in Resources */,
+ 346F5D3208A43E7B0055C610 /* CurrentTunes.scpt in Resources */,
349C30790867ADA3000BF883 /* AdiumApplescriptRunner in Resources */,
349C7C7A07C9AE1B005EB896 /* ContactListAdvancedPrefs.nib in Resources */,
34E0EA0807CC53ED00A82198 /* NewMessagePrompt.nib in Resources */,
@@ -9772,6 +9749,12 @@
buildActionMask = 2147483647;
files = (
636D93400E4E9ED600E5F558 /* AB Display Format Defaults.plist in Resources */,
+ 636D93890E4EA23F00E5F558 /* AdiumAddressBookAction_Yahoo.scpt in Resources */,
+ 636D938A0E4EA23F00E5F558 /* AdiumAddressBookAction_SMS.scpt in Resources */,
+ 636D938B0E4EA23F00E5F558 /* AdiumAddressBookAction_MSN.scpt in Resources */,
+ 636D938C0E4EA23F00E5F558 /* AdiumAddressBookAction_Jabber.scpt in Resources */,
+ 636D938D0E4EA23F00E5F558 /* AdiumAddressBookAction_ICQ.scpt in Resources */,
+ 636D938E0E4EA23F00E5F558 /* AdiumAddressBookAction_AIM.scpt in Resources */,
34DC8A590A7EEEF7003E1636 /* PresetManagement.nib in Resources */,
34DC8A5C0A7EEEF7003E1636 /* PresetNameSheet.nib in Resources */,
34DC8A650A7EEEF7003E1636 /* AccountSetup.nib in Resources */,
@@ -9888,26 +9871,6 @@
shellPath = /bin/sh;
shellScript = "#############################################################################################\n# Set framework bundles to have their executables' dates, thereby letting Xcode suck less. #\n#############################################################################################\ntouch \"$SRCROOT/Frameworks/libpurple.framework\"\ntouch \"$SRCROOT/Frameworks/Growl.framework\"\ntouch \"$SRCROOT/Frameworks/LMX.framework\"\ntouch \"$SRCROOT/Frameworks/PSMTabBarControl.framework\"\ntouch \"$SRCROOT/Frameworks/Sparkle.framework\"\ntouch \"$SRCROOT/Frameworks/libotr.framework\"\n";
};
- 5A23E0D513EDC4E60032EF52 /* Move System Statistics Scripts */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "$(BUILT_PRODUCTS_DIR)/Adium.app/Contents/Resources/ActiveApplication.scpt",
- "$(BUILT_PRODUCTS_DIR)/Adium.app/Contents/Resources/AdiumBuild.scpt",
- "$(BUILT_PRODUCTS_DIR)/Adium.app/Contents/Resources/AdiumVersion.scpt",
- "$(BUILT_PRODUCTS_DIR)/Adium.app/Contents/Resources/StatusMessage.scpt",
- "$(BUILT_PRODUCTS_DIR)/Adium.app/Contents/Resources/Uptime.scpt",
- );
- name = "Move System Statistics Scripts";
- outputPaths = (
- "$(BUILT_PRODUCTS_DIR)/Adium.app/Contents/Resources/Scripts/System Statistics.AdiumScripts//",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "mv \"$SCRIPT_INPUT_FILE_0\" \"$SCRIPT_OUTPUT_FILE_0\"\nmv \"$SCRIPT_INPUT_FILE_1\" \"$SCRIPT_OUTPUT_FILE_0\"\nmv \"$SCRIPT_INPUT_FILE_2\" \"$SCRIPT_OUTPUT_FILE_0\"\nmv \"$SCRIPT_INPUT_FILE_3\" \"$SCRIPT_OUTPUT_FILE_0\"\nmv \"$SCRIPT_INPUT_FILE_4\" \"$SCRIPT_OUTPUT_FILE_0\"";
- };
F53C25AD0A2F95F100F7B73D /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -10434,12 +10397,6 @@
5A5F8BBD12D560E400019727 /* AIDockNameOverlay.m in Sources */,
5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */,
97AF5CDB13191DE200550C41 /* AIContactListUserPictureMenuController.m in Sources */,
- 5A23E0B513EDB9950032EF52 /* CurrentTunes.applescript in Sources */,
- 5A23E0CB13EDC2E50032EF52 /* ActiveApplication.applescript in Sources */,
- 5A23E0CC13EDC2E50032EF52 /* AdiumBuild.applescript in Sources */,
- 5A23E0CD13EDC2E50032EF52 /* AdiumVersion.applescript in Sources */,
- 5A23E0CE13EDC2E50032EF52 /* StatusMessage.applescript in Sources */,
- 5A23E0CF13EDC2E50032EF52 /* Uptime.applescript in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -10549,12 +10506,6 @@
112B47680F82E0FC00690E84 /* AIXtraInfo.m in Sources */,
34F17FCF0F8EAC34009C5A39 /* AIListOutlineView+Drawing.m in Sources */,
63B0EC9C0F8FBB660062476B /* AIProxyListObject.m in Sources */,
- 5A23E0BC13EDB9CD0032EF52 /* AdiumAddressBookAction_AIM.applescript in Sources */,
- 5A23E0BD13EDB9CD0032EF52 /* AdiumAddressBookAction_ICQ.applescript in Sources */,
- 5A23E0BE13EDB9CD0032EF52 /* AdiumAddressBookAction_Jabber.applescript in Sources */,
- 5A23E0BF13EDB9CD0032EF52 /* AdiumAddressBookAction_MSN.applescript in Sources */,
- 5A23E0C013EDB9CD0032EF52 /* AdiumAddressBookAction_SMS.applescript in Sources */,
- 5A23E0C113EDB9CD0032EF52 /* AdiumAddressBookAction_Yahoo.applescript in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -12185,6 +12136,14 @@
name = EmoticonNames.strings;
sourceTree = "<group>";
};
+ 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.nib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 5A22D6E114834F44004E15F7 /* en */,
+ );
+ name = AIFacebookXMPPAccountView.nib;
+ sourceTree = "<group>";
+ };
633D50ED0F9D31BD004F491E /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
diff -r b08eeb55787a -r 7612c9430b24 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.applescript
--- a/Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.applescript Sat Nov 26 16:01:20 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-using terms from application "Address Book"
- on action property
- return "aim"
- end action property
-
- on action title for aPerson with screenName
- return ("Adium: Chat with " & (value of screenName as string))
- end action title
-
- on should enable action for aPerson with screenName
- return true
- end should enable action
-
- on perform action for aPerson with screenName
- set screenName to (value of screenName as string)
- using terms from application "Adium"
- tell application "Adium"
- (* We want a AIM account to be online or connecting before proceeding *)
- if ((accounts of service "AIM" whose status type is not offline) = 0) then
- tell (the first account of service "AIM") to go online
- (* Ideally, this activate will not return until Adium is ready to make a new chat window. Just to be sure, we'll busy wait. *)
- repeat while ((accounts of service "AIM" whose status type is not offline) = 0)
- activate
- end repeat
- end if
- (* Create the chat and find the contact it is with *)
- tell (first account of service "AIM" whose status type is not offline)
- set myContact to make new contact with properties {name:screenName}
- make new chat with contacts {myContact} with new chat window
- end tell
- activate
- end tell
- end using terms from
- return true
- end perform action
-end using terms from
\ No newline at end of file
diff -r b08eeb55787a -r 7612c9430b24 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.scpt
Binary file Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.scpt has changed
diff -r b08eeb55787a -r 7612c9430b24 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_ICQ.applescript
--- a/Frameworks/Adium Framework/Resources/AdiumAddressBookAction_ICQ.applescript Sat Nov 26 16:01:20 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-using terms from application "Address Book"
- on action property
- return "icq"
- end action property
-
- on action title for aPerson with screenName
- return ("Adium: Chat with " & (value of screenName as string))
- end action title
-
- on should enable action for aPerson with screenName
- return true
- end should enable action
-
- on perform action for aPerson with screenName
- set screenName to (value of screenName as string)
- using terms from application "Adium"
-
- tell application "Adium"
- (* We want a ICQ account to be online or connecting before proceeding *)
- if ((accounts of service "ICQ" whose status type is not offline) = 0) then
- tell (the first account of service "ICQ") to go online
- (* Ideally, this activate will not return until Adium is ready to make a new chat window. Just to be sure, we'll busy wait. *)
- repeat while ((accounts of service "ICQ" whose status type is not offline) = 0)
- activate
- end repeat
- end if
- (* Create the chat and find the contact it is with *)
- tell (first account of service "ICQ" whose status type is not offline)
- set myContact to make new contact with properties {name:screenName}
- make new chat with contacts {myContact} with new chat window
- end tell
- activate
- end tell
- end using terms from
- return true
- end perform action
-end using terms from
\ No newline at end of file
diff -r b08eeb55787a -r 7612c9430b24 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_ICQ.scpt
Binary file Frameworks/Adium Framework/Resources/AdiumAddressBookAction_ICQ.scpt has changed
diff -r b08eeb55787a -r 7612c9430b24 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Jabber.applescript
--- a/Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Jabber.applescript Sat Nov 26 16:01:20 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-using terms from application "Address Book"
- on action property
- return "jabber"
- end action property
-
- on action title for aPerson with screenName
- return ("Adium: Chat with " & (value of screenName as string))
- end action title
-
- on should enable action for aPerson with screenName
- return true
- end should enable action
-
- on perform action for aPerson with screenName
- set screenName to (value of screenName as string)
- using terms from application "Adium"
- (* We want a Jabber account to be online or connecting before proceeding *)
- if ((accounts of service "Jabber" whose status type is not offline) = 0) then
- tell (the first account of service "Jabber") to go online
- (* Ideally, this activate will not return until Adium is ready to make a new chat window. Just to be sure, we'll busy wait. *)
- repeat while ((accounts of service "Jabber" whose status type is not offline) = 0)
- activate
- end repeat
- end if
- (* Create the chat and find the contact it is with *)
- tell (first account of service "Jabber" whose status type is not offline)
- set myContact to make new contact with properties {name:screenName}
- make new chat with contacts {myContact} with new chat window
- end tell
- activate
- end using terms from
- return true
- end perform action
-end using terms from
\ No newline at end of file
diff -r b08eeb55787a -r 7612c9430b24 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Jabber.scpt
Binary file Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Jabber.scpt has changed
diff -r b08eeb55787a -r 7612c9430b24 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_MSN.applescript
--- a/Frameworks/Adium Framework/Resources/AdiumAddressBookAction_MSN.applescript Sat Nov 26 16:01:20 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-using terms from application "Address Book"
- on action property
- return "msn"
- end action property
-
- on action title for aPerson with screenName
- return ("Adium: Chat with " & (value of screenName as string))
- end action title
-
- on should enable action for aPerson with screenName
- return true
- end should enable action
-
- on perform action for aPerson with screenName
- set screenName to (value of screenName as string)
- using terms from application "Adium"
- tell application "Adium"
- (* We want a MSN account to be online or connecting before proceeding *)
- if ((accounts of service "MSN" whose status type is not offline) = 0) then
- tell (the first account of service "MSN") to go online
- (* Ideally, this activate will not return until Adium is ready to make a new chat window. Just to be sure, we'll busy wait. *)
- repeat while ((accounts of service "MSN" whose status type is not offline) = 0)
- activate
- end repeat
- end if
- (* Create the chat and find the contact it is with *)
- tell (first account of service "MSN" whose status type is not offline)
- set myContact to make new contact with properties {name:screenName}
- make new chat with contacts {myContact} with new chat window
- end tell
- activate
- end tell
- end using terms from
- return true
- end perform action
-end using terms from
\ No newline at end of file
diff -r b08eeb55787a -r 7612c9430b24 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_MSN.scpt
Binary file Frameworks/Adium Framework/Resources/AdiumAddressBookAction_MSN.scpt has changed
diff -r b08eeb55787a -r 7612c9430b24 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_SMS.applescript
--- a/Frameworks/Adium Framework/Resources/AdiumAddressBookAction_SMS.applescript Sat Nov 26 16:01:20 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-on cleanString(str, chars)
- set tid to AppleScript's text item delimiters
- repeat with c in chars
- set AppleScript's text item delimiters to {c}
- set chunks to text items of str
- set AppleScript's text item delimiters to ""
- set str to chunks as Unicode text
- end repeat
- set AppleScript's text item delimiters to tid
- return str
-end cleanString
-
-using terms from application "Address Book"
- on action property
- return "phone"
- end action property
-
- on action title for aPerson with phoneNumber
- return ("Adium: Send message to " & (value of phoneNumber as string))
- end action title
-
- on should enable action for aPerson with phoneNumber
- return true
- end should enable action
-
- on perform action for aPerson with phoneNumber
- (* remove ignored phone characters *)
- set phoneNumber to my cleanString(value of phoneNumber as string, {" ", "-", ")", "(", "."})
-
- if (phoneNumber does not start with "1") and (phoneNumber does not start with "+") then
- (* If the phone number neither starts with "1" nor with "+", add "+1" to it *)
- set phoneNumber to "+1" & phoneNumber
- else if (phoneNumber does not start with "+") then
- (* If the phone number does not start with "+", add "+" to it *)
- set phoneNumber to "+" & phoneNumber
- end if
-
- using terms from application "Adium"
- tell application "Adium"
- (* We want a AIM account to be online or connecting before proceeding *)
- if ((accounts of service "AIM" whose status type is not offline) = 0) then
- tell (the first account of service "AIM") to go online
- (* Ideally, this activate will not return until Adium is ready to make a new chat window. Just to be sure, we'll busy wait. *)
- repeat while ((accounts of service "AIM" whose status type is not offline) = 0)
- activate
- end repeat
- end if
- (* Create the chat and find the contact it is with *)
- tell (first account of service "AIM" whose status type is not offline)
- set myContact to make new contact with properties {name:phoneNumber}
- make new chat with contacts {myContact} with new chat window
- end tell
- activate
- end tell
- end using terms from
-
- return true
- end perform action
-
-end using terms from
\ No newline at end of file
diff -r b08eeb55787a -r 7612c9430b24 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_SMS.scpt
Binary file Frameworks/Adium Framework/Resources/AdiumAddressBookAction_SMS.scpt has changed
diff -r b08eeb55787a -r 7612c9430b24 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.applescript
--- a/Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.applescript Sat Nov 26 16:01:20 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-using terms from application "Address Book"
- on action property
- return "yahoo"
- end action property
-
- on action title for aPerson with screenName
- return ("Adium: Chat with " & (value of screenName as string))
- end action title
-
- on should enable action for aPerson with screenName
- return true
- end should enable action
-
- on perform action for aPerson with screenName
- set screenName to (value of screenName as string)
- using terms from application "Adium"
- tell application "Adium"
- (* We want a Yahoo! account to be online or connecting before proceeding *)
- if ((accounts of service "Yahoo!" whose status type is not offline) = 0) then
- tell (the first account of service "Yahoo!") to go online
- (* Ideally, this activate will not return until Adium is ready to make a new chat window. Just to be sure, we'll busy wait. *)
- repeat while ((accounts of service "Yahoo!" whose status type is not offline) = 0)
- activate
- end repeat
- end if
- (* Create the chat and find the contact it is with *)
- tell (first account of service "Yahoo!" whose status type is not offline)
- set myContact to make new contact with properties {name:screenName}
- make new chat with contacts {myContact} with new chat window
- end tell
- activate
- end tell
- end using terms from
- return true
- end perform action
-end using terms from
\ No newline at end of file
diff -r b08eeb55787a -r 7612c9430b24 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.scpt
Binary file Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.scpt has changed
diff -r b08eeb55787a -r 7612c9430b24 Plugins/Dual Window Interface/MessageView.xib
--- a/Plugins/Dual Window Interface/MessageView.xib Sat Nov 26 16:01:20 2011 -0800
+++ b/Plugins/Dual Window Interface/MessageView.xib Mon Nov 28 00:39:52 2011 -0500
@@ -67,11 +67,13 @@
<int key="NSvFlags">274</int>
<string key="NSFrame">{{1, 1}, {479, 0}}</string>
<reference key="NSSuperview" ref="632298351"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="351509238"/>
</object>
</array>
<string key="NSFrameSize">{481, 1}</string>
<reference key="NSSuperview" ref="687025598"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="739771638"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -111,6 +113,7 @@
</array>
<string key="NSFrame">{{0, 302}, {481, 59}}</string>
<reference key="NSSuperview" ref="465253647"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="632298351"/>
<string key="NSClassName">AIAccountSelectionView</string>
</object>
@@ -143,11 +146,13 @@
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{345, 264}</string>
<reference key="NSSuperview" ref="916213062"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="881321079"/>
</object>
</array>
<string key="NSFrameSize">{345, 264}</string>
<reference key="NSSuperview" ref="60130733"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="819870531"/>
<reference key="NSDocView" ref="819870531"/>
<object class="NSColor" key="NSBGColor">
@@ -166,6 +171,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {15, 188}}</string>
<reference key="NSSuperview" ref="60130733"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="657097854"/>
<reference key="NSTarget" ref="60130733"/>
<string key="NSAction">_doScroller:</string>
@@ -177,6 +183,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {278, 15}}</string>
<reference key="NSSuperview" ref="60130733"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="916213062"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="60130733"/>
@@ -186,6 +193,7 @@
</array>
<string key="NSFrameSize">{345, 264}</string>
<reference key="NSSuperview" ref="1034558317"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="916213062"/>
<int key="NSsFlags">133120</int>
<reference key="NSVScroller" ref="881321079"/>
@@ -195,6 +203,7 @@
</array>
<string key="NSFrameSize">{345, 264}</string>
<reference key="NSSuperview" ref="469967666"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="60130733"/>
<string key="NSClassName">NSView</string>
</object>
@@ -215,6 +224,7 @@
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{344, 18}</string>
<reference key="NSSuperview" ref="382054263"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="559917187"/>
<string key="NSClassName">AIMessageEntryTextView</string>
<string key="NSExtension">NSTextView</string>
@@ -222,6 +232,7 @@
</array>
<string key="NSFrameSize">{345, 38}</string>
<reference key="NSSuperview" ref="1006380680"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="662114219"/>
<reference key="NSDocView" ref="662114219"/>
<reference key="NSBGColor" ref="33147168"/>
@@ -232,6 +243,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{331, 1}, {15, 16}}</string>
<reference key="NSSuperview" ref="1006380680"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="60271943"/>
<reference key="NSTarget" ref="1006380680"/>
<string key="NSAction">_doScroller:</string>
@@ -243,6 +255,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {343, 15}}</string>
<reference key="NSSuperview" ref="1006380680"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="382054263"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="1006380680"/>
@@ -252,6 +265,7 @@
</array>
<string key="NSFrameSize">{345, 38}</string>
<reference key="NSSuperview" ref="944644976"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="382054263"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="949636887"/>
@@ -261,12 +275,14 @@
</array>
<string key="NSFrame">{{0, 265}, {345, 38}}</string>
<reference key="NSSuperview" ref="469967666"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1006380680"/>
<string key="NSClassName">NSView</string>
</object>
</array>
<string key="NSFrameSize">{345, 303}</string>
<reference key="NSSuperview" ref="988585566"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1034558317"/>
<int key="NSDividerStyle">2</int>
<string key="NSAutosaveName">AdiumMessageView</string>
@@ -274,6 +290,7 @@
</array>
<string key="NSFrameSize">{345, 303}</string>
<reference key="NSSuperview" ref="351509238"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="469967666"/>
<string key="NSClassName">NSView</string>
</object>
@@ -285,11 +302,55 @@
<reference key="NSNextResponder" ref="60271943"/>
<int key="NSvFlags">294</int>
<array class="NSMutableArray" key="NSSubviews">
+ <object class="NSBox" id="140880223">
+ <reference key="NSNextResponder" ref="561723111"/>
+ <int key="NSvFlags">14</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSView" id="274308108">
+ <reference key="NSNextResponder" ref="140880223"/>
+ <int key="NSvFlags">274</int>
+ <string key="NSFrame">{{1, 1}, {138, 3}}</string>
+ <reference key="NSSuperview" ref="140880223"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="282711289"/>
+ </object>
+ </array>
+ <string key="NSFrame">{{-3, 20}, {140, 5}}</string>
+ <reference key="NSSuperview" ref="561723111"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="274308108"/>
+ <string key="NSOffsets">{0, 0}</string>
+ <object class="NSTextFieldCell" key="NSTitleCell">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Box</string>
+ <object class="NSFont" key="NSSupport" id="26">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">11</double>
+ <int key="NSfFlags">3100</int>
+ </object>
+ <reference key="NSBackgroundColor" ref="71900893"/>
+ <object class="NSColor" key="NSTextColor">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+ </object>
+ </object>
+ <reference key="NSContentView" ref="274308108"/>
+ <int key="NSBorderType">1</int>
+ <int key="NSBoxType">4</int>
+ <int key="NSTitlePosition">0</int>
+ <bool key="NSTransparent">NO</bool>
+ <object class="NSColor" key="NSBorderColor2">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC42NTg4MjM1Mjk0IDAuNjU4ODIzNTI5NCAwLjY1ODgyMzUyOTQAA</bytes>
+ </object>
+ </object>
<object class="NSTextField" id="657371372">
<reference key="NSNextResponder" ref="561723111"/>
<int key="NSvFlags">294</int>
<string key="NSFrame">{{35, 3}, {84, 14}}</string>
<reference key="NSSuperview" ref="561723111"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="864763355">
<int key="NSCellFlags">68288064</int>
@@ -323,6 +384,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{-1, -2}, {30, 24}}</string>
<reference key="NSSuperview" ref="561723111"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="657371372"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="285849080">
@@ -343,50 +405,10 @@
<int key="NSPeriodicInterval">75</int>
</object>
</object>
- <object class="NSBox" id="140880223">
- <reference key="NSNextResponder" ref="561723111"/>
- <int key="NSvFlags">14</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSView" id="274308108">
- <reference key="NSNextResponder" ref="140880223"/>
- <int key="NSvFlags">274</int>
- <string key="NSFrame">{{1, 1}, {138, 3}}</string>
- <reference key="NSSuperview" ref="140880223"/>
- <reference key="NSNextKeyView" ref="282711289"/>
- </object>
- </array>
- <string key="NSFrame">{{-3, 20}, {140, 5}}</string>
- <reference key="NSSuperview" ref="561723111"/>
- <reference key="NSNextKeyView" ref="274308108"/>
- <string key="NSOffsets">{0, 0}</string>
- <object class="NSTextFieldCell" key="NSTitleCell">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Box</string>
- <object class="NSFont" key="NSSupport" id="26">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">3100</int>
- </object>
- <reference key="NSBackgroundColor" ref="71900893"/>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
- </object>
- </object>
- <reference key="NSContentView" ref="274308108"/>
- <int key="NSBorderType">1</int>
- <int key="NSBoxType">4</int>
- <int key="NSTitlePosition">0</int>
- <bool key="NSTransparent">NO</bool>
- <object class="NSColor" key="NSBorderColor2">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MC42NTg4MjM1Mjk0IDAuNjU4ODIzNTI5NCAwLjY1ODgyMzUyOTQAA</bytes>
- </object>
- </object>
</array>
<string key="NSFrameSize">{136, 21}</string>
<reference key="NSSuperview" ref="60271943"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="140880223"/>
<string key="NSClassName">AIGradientView</string>
</object>
@@ -403,6 +425,7 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{136, 283}</string>
<reference key="NSSuperview" ref="697712038"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="990929380"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
@@ -476,6 +499,7 @@
</array>
<string key="NSFrameSize">{136, 283}</string>
<reference key="NSSuperview" ref="652921259"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="824656698"/>
<reference key="NSDocView" ref="824656698"/>
<reference key="NSBGColor" ref="367010068"/>
@@ -486,6 +510,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{119, 0}, {15, 326}}</string>
<reference key="NSSuperview" ref="652921259"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="282731645"/>
<reference key="NSTarget" ref="652921259"/>
<string key="NSAction">_doScroller:</string>
@@ -496,6 +521,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{0, 326}, {119, 15}}</string>
<reference key="NSSuperview" ref="652921259"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="561723111"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="652921259"/>
@@ -505,6 +531,7 @@
</array>
<string key="NSFrame">{{0, 20}, {136, 283}}</string>
<reference key="NSSuperview" ref="60271943"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="697712038"/>
<int key="NSsFlags">133680</int>
<reference key="NSVScroller" ref="990929380"/>
@@ -515,12 +542,14 @@
</array>
<string key="NSFrame">{{346, 0}, {136, 303}}</string>
<reference key="NSSuperview" ref="351509238"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="652921259"/>
<string key="NSClassName">NSView</string>
</object>
</array>
<string key="NSFrameSize">{482, 303}</string>
<reference key="NSSuperview" ref="465253647"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="988585566"/>
<bool key="NSIsVertical">YES</bool>
<int key="NSDividerStyle">2</int>
@@ -528,11 +557,13 @@
</array>
<string key="NSFrameSize">{481, 361}</string>
<reference key="NSSuperview" ref="472278389"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="687025598"/>
</object>
</array>
<string key="NSFrameSize">{481, 361}</string>
<reference key="NSSuperview" ref="498346344"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="465253647"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -561,6 +592,7 @@
</array>
<string key="NSFrameSize">{481, 361}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="472278389"/>
<string key="NSClassName">NSView</string>
</object>
@@ -1035,7 +1067,231 @@
<nil key="sourceID"/>
<int key="maxID">186</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes"/>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <array class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <object class="IBPartialClassDescription">
+ <string key="className">AIAccountSelectionView</string>
+ <string key="superclassName">NSView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIAccountSelectionView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIAlternatingRowOutlineView</string>
+ <string key="superclassName">AIOutlineView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIAlternatingRowOutlineView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIAutoScrollView</string>
+ <string key="superclassName">NSScrollView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIAutoScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIGradientView</string>
+ <string key="superclassName">NSView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIGradientView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIListOutlineView</string>
+ <string key="superclassName">AIMultiCellOutlineView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIListOutlineView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIMessageEntryTextView</string>
+ <string key="superclassName">AISendingTextView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AIMessageEntryTextView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIMessageViewController</string>
+ <string key="superclassName">NSObject</string>
+ <dictionary class="NSMutableDictionary" key="actions">
+ <string key="didSendMessage:">id</string>
+ <string key="sendMessage:">id</string>
+ <string key="sendMessageLater:">id</string>
+ <string key="showActionMenu:">id</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="didSendMessage:">
+ <string key="name">didSendMessage:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="sendMessage:">
+ <string key="name">sendMessage:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="sendMessageLater:">
+ <string key="name">sendMessageLater:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="showActionMenu:">
+ <string key="name">showActionMenu:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="actionBarView">AIGradientView</string>
+ <string key="label_userCount">NSTextField</string>
+ <string key="performAction">NSButton</string>
+ <string key="scrollView_messages">AIMessageWindowOutgoingScrollView</string>
+ <string key="scrollView_textEntry">NSScrollView</string>
+ <string key="scrollView_userList">AIAutoScrollView</string>
+ <string key="splitView_textEntryHorizontal">NSSplitView</string>
+ <string key="splitView_verticalSplit">NSSplitView</string>
+ <string key="textView_outgoing">AIMessageEntryTextView</string>
+ <string key="userListView">AIListOutlineView</string>
+ <string key="view_accountSelection">AIAccountSelectionView</string>
+ <string key="view_contents">NSView</string>
+ <string key="view_messages">NSView</string>
+ <string key="view_userList">NSView</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="actionBarView">
+ <string key="name">actionBarView</string>
+ <string key="candidateClassName">AIGradientView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_userCount">
+ <string key="name">label_userCount</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="performAction">
+ <string key="name">performAction</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="scrollView_messages">
+ <string key="name">scrollView_messages</string>
+ <string key="candidateClassName">AIMessageWindowOutgoingScrollView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="scrollView_textEntry">
+ <string key="name">scrollView_textEntry</string>
+ <string key="candidateClassName">NSScrollView</string>
More information about the commits
mailing list