adium 4121:8983c14bea2f: Patch from dak180 with extra work by me...
commits at adium.im
commits at adium.im
Sun Aug 7 04:34:12 UTC 2011
details: http://hg.adium.im/adium/rev/8983c14bea2f
revision: 4121:8983c14bea2f
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sat Aug 06 23:07:46 2011 -0400
Patch from dak180 with extra work by me to have most of our AppleScripts in text rather than compiled for easier diffing and such. Fixes #13940.
Subject: adium 4122:238e364990a1: Fix a couple emoticon names.
details: http://hg.adium.im/adium/rev/238e364990a1
revision: 4122:238e364990a1
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sat Aug 06 23:22:15 2011 -0400
Fix a couple emoticon names.
Subject: adium 4123:fc2829162d69: Move a smile emoticon shortcut fixes #13924
details: http://hg.adium.im/adium/rev/fc2829162d69
revision: 4123:fc2829162d69
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sat Aug 06 23:38:19 2011 -0400
Move a smile emoticon shortcut fixes #13924
Subject: adium 4124:e4730679faf7: Remove some angry emoticon shortcuts fixes #11450
details: http://hg.adium.im/adium/rev/e4730679faf7
revision: 4124:e4730679faf7
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sun Aug 07 00:08:20 2011 -0400
Remove some angry emoticon shortcuts fixes #11450
Subject: adium 4125:bccd8c847ff4: "Drop 10.5 and use blocks, dispatch_once" Done and done.
details: http://hg.adium.im/adium/rev/bccd8c847ff4
revision: 4125:bccd8c847ff4
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sun Aug 07 00:26:39 2011 -0400
"Drop 10.5 and use blocks, dispatch_once" Done and done.
diffs (733 lines):
diff -r 34999f4a034b -r bccd8c847ff4 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Fri Aug 05 09:18:22 2011 -0500
+++ b/Adium.xcodeproj/project.pbxproj Sun Aug 07 00:26:39 2011 -0400
@@ -392,7 +392,6 @@
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 */; };
@@ -1130,6 +1129,18 @@
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 */; };
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 */; };
@@ -1377,12 +1388,6 @@
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 */; };
@@ -3020,7 +3025,6 @@
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>"; };
@@ -4118,6 +4122,18 @@
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>"; };
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>"; };
@@ -4482,12 +4498,6 @@
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>"; };
@@ -6313,7 +6323,7 @@
34CF9DEF085B8B3D00D87E37 /* iTunes Now Playing */ = {
isa = PBXGroup;
children = (
- 346F5CB308A418FB0055C610 /* CurrentTunes.scpt */,
+ 5A23E0B413EDB9950032EF52 /* CurrentTunes.applescript */,
34CF9DF2085B8B7900D87E37 /* ESiTunesPlugin.h */,
34CF9DF3085B8B7900D87E37 /* ESiTunesPlugin.m */,
);
@@ -7332,6 +7342,7 @@
4BF2E6BE067CB72400743318 /* Xtras (Built In) */ = {
isa = PBXGroup;
children = (
+ 5A23E0C513EDC2C40032EF52 /* System Statistics */,
112B483E0F82E91200690E84 /* Group Chat Status Icons */,
34A29D9406ED68BF00E1366C /* Contact List */,
3408254D075B078B00703011 /* Dock Icons */,
@@ -7448,6 +7459,18 @@
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 = (
@@ -8169,12 +8192,12 @@
636D930E0E4E9DDD00E5F558 /* Address Book Integration */ = {
isa = PBXGroup;
children = (
- 636D93660E4E9FD300E5F558 /* AdiumAddressBookAction_Yahoo.scpt */,
- 636D93670E4E9FD300E5F558 /* AdiumAddressBookAction_SMS.scpt */,
- 636D93680E4E9FD300E5F558 /* AdiumAddressBookAction_MSN.scpt */,
- 636D93690E4E9FD300E5F558 /* AdiumAddressBookAction_Jabber.scpt */,
- 636D936A0E4E9FD300E5F558 /* AdiumAddressBookAction_ICQ.scpt */,
- 636D936B0E4E9FD300E5F558 /* AdiumAddressBookAction_AIM.scpt */,
+ 5A23E0B613EDB9CD0032EF52 /* AdiumAddressBookAction_AIM.applescript */,
+ 5A23E0B713EDB9CD0032EF52 /* AdiumAddressBookAction_ICQ.applescript */,
+ 5A23E0B813EDB9CD0032EF52 /* AdiumAddressBookAction_Jabber.applescript */,
+ 5A23E0B913EDB9CD0032EF52 /* AdiumAddressBookAction_MSN.applescript */,
+ 5A23E0BA13EDB9CD0032EF52 /* AdiumAddressBookAction_SMS.applescript */,
+ 5A23E0BB13EDB9CD0032EF52 /* AdiumAddressBookAction_Yahoo.applescript */,
34E2A2EE07B018B1006735BC /* AIAddressBookController.h */,
636D8C970E4E95A500E5F558 /* AIAddressBookController.m */,
3403F4300D2EF01D006B08FB /* AIAddressBookUserIconSource.h */,
@@ -9347,6 +9370,7 @@
4BF2E91F067CB76300743318 /* Copy Built-in Xtras */,
34BD9D6A053146CC000AB133 /* Copy AdiumPlugins */,
345DFF4A05564DB200CEE7B3 /* Run Generate Buildnum File Script */,
+ 5A23E0D513EDC4E60032EF52 /* Move System Statistics Scripts */,
);
buildRules = (
81F9D1DF0A7F81A5004A35BD /* PBXBuildRule */,
@@ -9635,7 +9659,6 @@
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 */,
@@ -9885,12 +9908,6 @@
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 */,
@@ -10007,6 +10024,26 @@
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;
@@ -10538,6 +10575,12 @@
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;
};
@@ -10648,6 +10691,12 @@
34F17FCF0F8EAC34009C5A39 /* AIListOutlineView+Drawing.m in Sources */,
63B0EC9C0F8FBB660062476B /* AIProxyListObject.m in Sources */,
118199C710D0B65A003E8ECA /* AIMedia.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;
};
diff -r 34999f4a034b -r bccd8c847ff4 Frameworks/AIUtilities Framework/Source/AITooltipUtilities.m
--- a/Frameworks/AIUtilities Framework/Source/AITooltipUtilities.m Fri Aug 05 09:18:22 2011 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AITooltipUtilities.m Sun Aug 07 00:26:39 2011 -0400
@@ -292,12 +292,10 @@
BOOL hasTitle = tooltipTitle && [tooltipTitle length];
BOOL hasBody = tooltipBody && [tooltipBody length];
- //init titleAndBodyMarginLineColor only once (Drop 10.5 and use blocks, dispatch_once)
- if(!titleAndBodyMarginLineColor) {
- NSColor *newTitleAndBodyMarginLineColor = [[[NSColor grayColor] colorWithAlphaComponent:.7f] retain];
- if(!OSAtomicCompareAndSwapPtrBarrier(nil, newTitleAndBodyMarginLineColor, (void *)&titleAndBodyMarginLineColor))
- [newTitleAndBodyMarginLineColor release];
- }
+ static dispatch_once_t setTitleAndBodyMarginLineColor;
+ dispatch_once(&setTitleAndBodyMarginLineColor, ^{
+ titleAndBodyMarginLineColor = [[[NSColor grayColor] colorWithAlphaComponent:.7f] retain];
+ });
if (hasTitle) {
//Make sure we're not wrapping by default
diff -r 34999f4a034b -r bccd8c847ff4 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.applescript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.applescript Sun Aug 07 00:26:39 2011 -0400
@@ -0,0 +1,36 @@
+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 34999f4a034b -r bccd8c847ff4 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.scpt
Binary file Frameworks/Adium Framework/Resources/AdiumAddressBookAction_AIM.scpt has changed
diff -r 34999f4a034b -r bccd8c847ff4 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_ICQ.applescript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/Adium Framework/Resources/AdiumAddressBookAction_ICQ.applescript Sun Aug 07 00:26:39 2011 -0400
@@ -0,0 +1,37 @@
+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 34999f4a034b -r bccd8c847ff4 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_ICQ.scpt
Binary file Frameworks/Adium Framework/Resources/AdiumAddressBookAction_ICQ.scpt has changed
diff -r 34999f4a034b -r bccd8c847ff4 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Jabber.applescript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Jabber.applescript Sun Aug 07 00:26:39 2011 -0400
@@ -0,0 +1,34 @@
+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 34999f4a034b -r bccd8c847ff4 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Jabber.scpt
Binary file Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Jabber.scpt has changed
diff -r 34999f4a034b -r bccd8c847ff4 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_MSN.applescript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/Adium Framework/Resources/AdiumAddressBookAction_MSN.applescript Sun Aug 07 00:26:39 2011 -0400
@@ -0,0 +1,36 @@
+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 34999f4a034b -r bccd8c847ff4 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_MSN.scpt
Binary file Frameworks/Adium Framework/Resources/AdiumAddressBookAction_MSN.scpt has changed
diff -r 34999f4a034b -r bccd8c847ff4 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_SMS.applescript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/Adium Framework/Resources/AdiumAddressBookAction_SMS.applescript Sun Aug 07 00:26:39 2011 -0400
@@ -0,0 +1,60 @@
+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 34999f4a034b -r bccd8c847ff4 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_SMS.scpt
Binary file Frameworks/Adium Framework/Resources/AdiumAddressBookAction_SMS.scpt has changed
diff -r 34999f4a034b -r bccd8c847ff4 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.applescript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.applescript Sun Aug 07 00:26:39 2011 -0400
@@ -0,0 +1,36 @@
+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 34999f4a034b -r bccd8c847ff4 Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.scpt
Binary file Frameworks/Adium Framework/Resources/AdiumAddressBookAction_Yahoo.scpt has changed
diff -r 34999f4a034b -r bccd8c847ff4 Resources/CurrentTunes.applescript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/CurrentTunes.applescript Sun Aug 07 00:26:39 2011 -0400
@@ -0,0 +1,32 @@
+try
+ tell application "System Events"
+ set iTunes to ((application processes whose (name is equal to "iTunes")) count)
+ end tell
+
+ if iTunes is greater than 0 then
+ with timeout of 3 seconds
+ using terms from application "iTunes"
+ tell application "iTunes"
+ if player state is not stopped then
+ set seperator to ",$!$,"
+ set songname to name of current track
+ set songartist to artist of current track
+ set songalbum to album of current track
+ set songyear to year of current track
+ set songurl to ""
+
+ if player state is paused then
+ set playerstate to "Paused"
+ else
+ set playerstate to "Playing"
+ end if
+
+ set info to (songalbum & seperator) & (songartist & seperator) & (composer of current track & seperator) & (genre of current track & seperator) & (playerstate & seperator) & (songname & seperator) & ((songyear as string) & seperator) & songurl as string
+ return info
+ end if
+ end tell
+ end using terms from
+ end timeout
+ end if
+ return "None"
+end try
\ No newline at end of file
diff -r 34999f4a034b -r bccd8c847ff4 Resources/CurrentTunes.scpt
Binary file Resources/CurrentTunes.scpt has changed
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Emoticons/Default.AdiumEmoticonset/Emoticons.plist
--- a/Resources/Emoticons/Default.AdiumEmoticonset/Emoticons.plist Fri Aug 05 09:18:22 2011 -0500
+++ b/Resources/Emoticons/Default.AdiumEmoticonset/Emoticons.plist Sun Aug 07 00:26:39 2011 -0400
@@ -30,9 +30,6 @@
<array>
<string>:-@</string>
<string>:@</string>
- <string><_<</string>
- <string>>:(</string>
- <string>>:</string>
</array>
<key>Name</key>
<string>Angry</string>
@@ -95,7 +92,6 @@
<dict>
<key>Equivalents</key>
<array>
- <string>:^)</string>
<string>:/</string>
<string>=/</string>
<string>=l</string>
@@ -197,6 +193,7 @@
<dict>
<key>Equivalents</key>
<array>
+ <string>:^)</string>
<string>:-)</string>
<string>:)</string>
<string>=)</string>
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Emoticons/MSN.AdiumEmoticonset/Coffee cup.png
Binary file Resources/Emoticons/MSN.AdiumEmoticonset/Coffee cup.png has changed
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Emoticons/MSN.AdiumEmoticonset/Coffee up.png
Binary file Resources/Emoticons/MSN.AdiumEmoticonset/Coffee up.png has changed
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Emoticons/MSN.AdiumEmoticonset/Emoticons.plist
--- a/Resources/Emoticons/MSN.AdiumEmoticonset/Emoticons.plist Fri Aug 05 09:18:22 2011 -0500
+++ b/Resources/Emoticons/MSN.AdiumEmoticonset/Emoticons.plist Sun Aug 07 00:26:39 2011 -0400
@@ -49,10 +49,6 @@
<array>
<string>:-@</string>
<string>:@</string>
- <string><_<</string>
- <string>>:(</string>
- <string>>:[</string>
- <string>>:</string>
</array>
<key>Name</key>
<string>Angry</string>
@@ -131,7 +127,7 @@
<string>(NAH)</string>
</array>
<key>Name</key>
- <string>Deer</string>
+ <string>Goat</string>
</dict>
<key>Cat face.png</key>
<dict>
@@ -170,7 +166,7 @@
<key>Name</key>
<string>Clock</string>
</dict>
- <key>Coffee up.png</key>
+ <key>Coffee cup.png</key>
<dict>
<key>Equivalents</key>
<array>
@@ -178,7 +174,7 @@
<string>(c)</string>
</array>
<key>Name</key>
- <string>Coffee up</string>
+ <string>Coffee cup</string>
</dict>
<key>Computer.png</key>
<dict>
@@ -371,7 +367,6 @@
<dict>
<key>Equivalents</key>
<array>
- <string>:^)</string>
<string>:/</string>
<string>=/</string>
<string>=l</string>
@@ -639,6 +634,7 @@
<dict>
<key>Equivalents</key>
<array>
+ <string>:^)</string>
<string>:-)</string>
<string>:)</string>
<string>=)</string>
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Scripts/System Statistics.AdiumScripts/ActiveApplication.applescript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Scripts/System Statistics.AdiumScripts/ActiveApplication.applescript Sun Aug 07 00:26:39 2011 -0400
@@ -0,0 +1,10 @@
+--Active app shows the current app.
+on substitute()
+ tell application "System Events"
+ set appName to name of item 1 of (application processes whose frontmost is true)
+ if appName is "ScreenSaverEngine" then
+ set appName to "(#)" & "Screen Saver"
+ end if
+ return appName
+ end tell
+end substitute
\ No newline at end of file
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Scripts/System Statistics.AdiumScripts/ActiveApplication.scpt
Binary file Resources/Scripts/System Statistics.AdiumScripts/ActiveApplication.scpt has changed
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Scripts/System Statistics.AdiumScripts/AdiumBuild.applescript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Scripts/System Statistics.AdiumScripts/AdiumBuild.applescript Sun Aug 07 00:26:39 2011 -0400
@@ -0,0 +1,3 @@
+on substitute()
+ return do shell script "awk -F\" [|] \" '{print $1}' " & (POSIX path of (path to application "Adium" as string)) & "Contents/Resources/buildnum" & "| grep \"[a-z0-9]\""
+end substitute
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Scripts/System Statistics.AdiumScripts/AdiumBuild.scpt
Binary file Resources/Scripts/System Statistics.AdiumScripts/AdiumBuild.scpt has changed
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Scripts/System Statistics.AdiumScripts/AdiumVersion.applescript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Scripts/System Statistics.AdiumScripts/AdiumVersion.applescript Sun Aug 07 00:26:39 2011 -0400
@@ -0,0 +1,12 @@
+on title()
+ return "Adium Version"
+end title
+
+on keyword()
+ return "%_adiumversion"
+end keyword
+
+on substitute()
+ return "<HTML><A HREF=\"http://www.adiumx.com\">Adium " & (version of application "Adium") & "</A></HTML>"
+end substitute
+return "<HTML><A HREF=\"http://www.adiumx.com\">Adium " & (version of application "Adium") & "</A></HTML>"
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Scripts/System Statistics.AdiumScripts/AdiumVersion.scpt
Binary file Resources/Scripts/System Statistics.AdiumScripts/AdiumVersion.scpt has changed
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Scripts/System Statistics.AdiumScripts/StatusMessage.applescript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Scripts/System Statistics.AdiumScripts/StatusMessage.applescript Sun Aug 07 00:26:39 2011 -0400
@@ -0,0 +1,6 @@
+on substitute()
+ tell application "Adium"
+ set myStatusMessage to Çclass PstmÈ of the global status
+ return myStatusMessage
+ end tell
+end substitute
\ No newline at end of file
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Scripts/System Statistics.AdiumScripts/StatusMessage.scpt
Binary file Resources/Scripts/System Statistics.AdiumScripts/StatusMessage.scpt has changed
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Scripts/System Statistics.AdiumScripts/Uptime.applescript
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Scripts/System Statistics.AdiumScripts/Uptime.applescript Sun Aug 07 00:26:39 2011 -0400
@@ -0,0 +1,19 @@
+-- There are different patterns used by 'uptime':
+
+-- uptime < 60 secs
+-- e.g. '19:04 up 41 secs, 2 users, load averages: 2.17 0.59 0.22'
+
+-- uptime < 60 mins
+-- e.g. '19:09 up 6 mins, 2 users, load averages: 0.65 1.23 0.68'
+
+-- uptime < 24 hours
+-- e.g. '20:09 up 1:06, 3 users, load averages: 1.25 1.30 1.05'
+
+-- uptime >= 24 hours
+-- The three patterns are repeated, but with 'x day(s)' added in front.
+-- e.g. '19:20 up 1 day, 3 mins, 2 users, load averages: 0.69 0.19 0.11'
+
+on substitute()
+ -- Take the output from 'uptime' and return the segment located between 'up' and ', x users'.
+ return do shell script "/usr/bin/uptime | /usr/bin/awk -F'up[ ]+|, [0-9]+ user[s]*' '{print $2}'" as string
+end substitute
\ No newline at end of file
diff -r 34999f4a034b -r bccd8c847ff4 Resources/Scripts/System Statistics.AdiumScripts/Uptime.scpt
Binary file Resources/Scripts/System Statistics.AdiumScripts/Uptime.scpt has changed
More information about the commits
mailing list