adium 5215:87db7ecbed82: Minor changes to the new message window:
commits at adium.im
commits at adium.im
Wed Oct 31 11:15:16 UTC 2012
details: http://hg.adium.im/adium/rev/87db7ecbed82
revision: 5215:87db7ecbed82
branch: adium-1.6
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Wed Oct 31 12:12:03 2012 +0100
Minor changes to the new message window:
- Don't show strangers
- Show the source account's UID too, so people can distingiush the same contact on different accounts
- Center the window
Subject: adium 5216:40608a21c9f7: Merged.
details: http://hg.adium.im/adium/rev/40608a21c9f7
revision: 5216:40608a21c9f7
branch: adium-1.6
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Wed Oct 31 12:14:32 2012 +0100
Merged.
diffs (truncated from 4993 to 1000 lines):
diff -r 5de1870f10b9 -r 40608a21c9f7 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Tue Oct 23 23:00:32 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj Wed Oct 31 12:14:32 2012 +0100
@@ -107,7 +107,6 @@
112E7FA60FC86BB400657119 /* AITwitterActionsHTMLFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = 112E7FA50FC86BB400657119 /* AITwitterActionsHTMLFilter.m */; };
1130EA99109B445500FB3454 /* pref-defaultclient.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA98109B445500FB3454 /* pref-defaultclient.tiff */; };
1130EA9D109B445D00FB3454 /* pref-mention.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9B109B445D00FB3454 /* pref-mention.tiff */; };
- 1130EA9E109B445D00FB3454 /* pref-messagealerts.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1130EA9C109B445D00FB3454 /* pref-messagealerts.tiff */; };
113891830F6B6AFF00A7D7DC /* AILaconicaService.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891820F6B6AFF00A7D7DC /* AILaconicaService.m */; };
1138918A0F6B6B2800A7D7DC /* AILaconicaAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 113891890F6B6B2800A7D7DC /* AILaconicaAccount.m */; };
1138918D0F6B6B3F00A7D7DC /* AILaconicaPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 1138918C0F6B6B3F00A7D7DC /* AILaconicaPlugin.m */; };
@@ -239,12 +238,9 @@
3419DE750A81042F00C3FC68 /* ContactPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326607CBD598006466F2 /* ContactPrefs.plist */; };
3419DE760A81042F00C3FC68 /* default-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326707CBD598006466F2 /* default-icon.png */; };
3419DE770A81042F00C3FC68 /* DockPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326207CBD598006466F2 /* DockPrefs.plist */; };
- 3419DE780A81042F00C3FC68 /* emoticon32.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 3428B33E0815E1FB00C0D3DC /* emoticon32.tiff */; };
- 3419DE790A81042F00C3FC68 /* emoticon32_transparent.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F590608199746001F733C /* emoticon32_transparent.tiff */; };
3419DE7A0A81042F00C3FC68 /* FontPanelAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34B995D9092A832700E31E91 /* FontPanelAccessoryView.xib */; };
3419DE7C0A81042F00C3FC68 /* lock-locked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF53007A62EB100B92233 /* lock-locked.tiff */; };
3419DE7D0A81042F00C3FC68 /* lock-unlocked.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF52607A62EB000B92233 /* lock-unlocked.tiff */; };
- 3419DE7E0A81042F00C3FC68 /* remove.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 347E787507CA975900350507 /* remove.tiff */; };
3419DE7F0A81042F00C3FC68 /* msg-send-file.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326307CBD598006466F2 /* msg-send-file.tiff */; };
3419DE820A81042F00C3FC68 /* ToolbarPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8327607CBD5B3006466F2 /* ToolbarPrefs.plist */; };
3419DF3B0A8119BF00C3FC68 /* AICalendarDate.m in Sources */ = {isa = PBXBuildFile; fileRef = 340D0A000A7DD1F40059A3AF /* AICalendarDate.m */; };
@@ -323,7 +319,7 @@
345DA0680CA09AD0009F1989 /* Statuses.strings in Resources */ = {isa = PBXBuildFile; fileRef = 345DA0660CA09AD0009F1989 /* Statuses.strings */; };
345EE2DF0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 345EE2DD0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m */; };
345F566B08178356001F733C /* AdiumServiceIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 345F566A08178356001F733C /* AdiumServiceIcons.icns */; };
- 345F57400817FF80001F733C /* pref-contactList.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F573F0817FF80001F733C /* pref-contactList.tiff */; };
+ 345F57400817FF80001F733C /* pref-contact-list.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F573F0817FF80001F733C /* pref-contact-list.tiff */; };
345F583E08197E74001F733C /* AdiumStatusIcons.icns in Resources */ = {isa = PBXBuildFile; fileRef = 345F583D08197E74001F733C /* AdiumStatusIcons.icns */; };
345F58C7081990FF001F733C /* msg-log-viewer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 345F58C6081990FF001F733C /* msg-log-viewer.tiff */; };
34607EE909B228FE000DB3D2 /* AIContactListNameButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 34607EE709B228FE000DB3D2 /* AIContactListNameButton.m */; };
@@ -356,7 +352,6 @@
347E39DC0A98AA4A00961B0E /* missing_image.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E39DB0A98AA4A00961B0E /* missing_image.png */; };
347E77F407CA94FF00350507 /* ESAccountEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E77F207CA94FE00350507 /* ESAccountEvents.m */; };
347E781407CA961300350507 /* ESUserIconHandlingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */; };
- 347E781A07CA962100350507 /* events-contact.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E781907CA962100350507 /* events-contact.png */; };
347E782907CA964600350507 /* AIContactSortSelectionPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782507CA964600350507 /* AIContactSortSelectionPlugin.m */; };
347E782A07CA964700350507 /* ESContactSortConfigurationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782607CA964600350507 /* ESContactSortConfigurationWindowController.m */; };
347E783407CA967100350507 /* SortingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E783307CA967100350507 /* SortingDefaults.plist */; };
@@ -659,7 +654,6 @@
34D8333307CBD741006466F2 /* events-applescript-alert.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8333107CBD741006466F2 /* events-applescript-alert.tiff */; };
34D8333B07CBD758006466F2 /* ESApplescriptContactAlertPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8333707CBD758006466F2 /* ESApplescriptContactAlertPlugin.m */; };
34D8333C07CBD758006466F2 /* ESPanelApplescriptDetailPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8333807CBD758006466F2 /* ESPanelApplescriptDetailPane.m */; };
- 34D8337107CBD808006466F2 /* pref-general.tif in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336807CBD807006466F2 /* pref-general.tif */; };
34D8337407CBD808006466F2 /* pref-file-transfer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336B07CBD807006466F2 /* pref-file-transfer.tiff */; };
34D8337507CBD808006466F2 /* pref-events.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336C07CBD807006466F2 /* pref-events.tiff */; };
34D8337707CBD808006466F2 /* pref-advanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 34D8336E07CBD807006466F2 /* pref-advanced.tiff */; };
@@ -995,14 +989,11 @@
4BAE6D3D07CFA0BC007E2820 /* AIAppearancePreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6D3B07CFA0BC007E2820 /* AIAppearancePreferences.m */; };
4BAE6D4307CFA0CB007E2820 /* AIAppearancePreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BAE6D4107CFA0CB007E2820 /* AIAppearancePreferencesPlugin.m */; };
4BB1E493067F2EAC00D1DB86 /* Scripts in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BB1E47D067F2E9F00D1DB86 /* Scripts */; };
- 4BB2EB220D88D76100CA7A7D /* timestamp32.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BB2EB200D88D76100CA7A7D /* timestamp32.tiff */; };
- 4BB2EB230D88D76100CA7A7D /* timestamp32_transparent.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BB2EB210D88D76100CA7A7D /* timestamp32_transparent.tiff */; };
4BB5B78207D2DC4900CFE06F /* pref-status.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BB5B78107D2DC4900CFE06F /* pref-status.tiff */; };
4BB9972B083D1A5F006ACD6F /* SMContactListShowBehaviorPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99727083D1A5F006ACD6F /* SMContactListShowBehaviorPlugin.m */; };
4BB9972D083D1A5F006ACD6F /* SMContactListShowDetailsPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB99729083D1A5F006ACD6F /* SMContactListShowDetailsPane.m */; };
4BB9972F083D1A74006ACD6F /* ContactListShowBehavior.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BB9972E083D1A74006ACD6F /* ContactListShowBehavior.xib */; };
4BCAB5F307B59967006641B9 /* EditAccountSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAB5F007B59967006641B9 /* EditAccountSheet.xib */; };
- 4BCAC4D907B59B2E006641B9 /* AddressBook.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4D807B59B2E006641B9 /* AddressBook.tiff */; };
4BCAC4E607B59B65006641B9 /* Alias Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4E307B59B65006641B9 /* Alias Defaults.plist */; };
4BCAC4E707B59B65006641B9 /* Display Format Defaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC4E407B59B65006641B9 /* Display Format Defaults.plist */; };
4BCAC56D07B5A31A006641B9 /* Sounds in Resources */ = {isa = PBXBuildFile; fileRef = 4BCAC56C07B5A31A006641B9 /* Sounds */; };
@@ -1032,7 +1023,7 @@
4BE9FFE8055981AB00359B15 /* Adium.pch in Resources */ = {isa = PBXBuildFile; fileRef = 4BE9FFE7055981AB00359B15 /* Adium.pch */; };
4BF2EA3F067CB7A200743318 /* Emoticons in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BF2E194067CAE9200743318 /* Emoticons */; };
4BF2EA40067CB7A200743318 /* Message Styles in Copy Built-in Xtras */ = {isa = PBXBuildFile; fileRef = 4BF2E6B3067CB70E00743318 /* Message Styles */; };
- 4BF3CB4207D1771E00A8112A /* pref-appearance.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BF3CB4107D1771E00A8112A /* pref-appearance.tiff */; };
+ 4BF3CB4207D1771E00A8112A /* pref-icons.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BF3CB4107D1771E00A8112A /* pref-icons.tiff */; };
4BF3CBED07D192F500A8112A /* pref-accounts.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4BF3CBEC07D192F500A8112A /* pref-accounts.tiff */; };
4BF98DCD06D149EE00E8781D /* ContactStatusColoringDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B31E8C404C46A9100A8010A /* ContactStatusColoringDefaults.plist */; };
4BFC2E7907E357F00063D70C /* emoticonBlank.png in Resources */ = {isa = PBXBuildFile; fileRef = 4BFC2E7807E357F00063D70C /* emoticonBlank.png */; };
@@ -1044,7 +1035,6 @@
4F1CB6320D640D7F0073A1E6 /* AIEventsInspectorPane.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1CB6310D640D7F0073A1E6 /* AIEventsInspectorPane.m */; };
4F1CB6390D640D900073A1E6 /* AIEventsInspectorPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB6350D640D8F0073A1E6 /* AIEventsInspectorPane.xib */; };
4F1CB63A0D640D900073A1E6 /* AIInfoInspectorPane.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB6360D640D900073A1E6 /* AIInfoInspectorPane.xib */; };
- 4F1CB63F0D640DA40073A1E6 /* get-info-address-book.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63B0D640DA40073A1E6 /* get-info-address-book.tiff */; };
4F1CB6400D640DA40073A1E6 /* get-info-advanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63C0D640DA40073A1E6 /* get-info-advanced.tiff */; };
4F1CB6410D640DA40073A1E6 /* get-info-events.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB63D0D640DA40073A1E6 /* get-info-events.tiff */; };
4F1CB64C0D640F4F0073A1E6 /* ContactInfoInspector.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.xib */; };
@@ -1052,9 +1042,7 @@
5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A17D65C130F76B4002C852F /* AIGradientView.m */; };
5A1E3A1214DCE60400724574 /* Preferences-Xtras.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A1E3A1114DCE60400724574 /* Preferences-Xtras.xib */; };
5A22D6E214834F44004E15F7 /* AIFacebookXMPPAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5A22D6E014834F44004E15F7 /* AIFacebookXMPPAccountView.xib */; };
- 5A27FA7D14A272330063489D /* pref-messagehistory.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7914A272330063489D /* pref-messagehistory.png */; };
5A27FA7E14A272330063489D /* pref-messagestyle.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7A14A272330063489D /* pref-messagestyle.png */; };
- 5A27FA8014A272330063489D /* pref-windowhandling.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A27FA7C14A272330063489D /* pref-windowhandling.png */; };
5A4BD41D13F855B000A4D3F7 /* SearchTerms.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5A4BD41B13F855B000A4D3F7 /* SearchTerms.plist */; };
5A4BD41E13F8568100A4D3F7 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5ACF27331392C585004B6AEF /* Preferences.xib */; };
5A4BD43313F856E300A4D3F7 /* Preferences-AddressBookIntegration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */; };
@@ -1372,7 +1360,6 @@
76731DE515F90582007728C3 /* libgpgerror.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE115F90538007728C3 /* libgpgerror.framework */; };
767870E41634045D00BD0E4D /* AIMessageViewTopBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 767870E31634045C00BD0E4D /* AIMessageViewTopBarController.m */; };
76889DEB12D3CA17007AEF00 /* get-info.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEA12D3CA17007AEF00 /* get-info.tiff */; };
- 76889DEF12D3CA40007AEF00 /* Profile.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEE12D3CA40007AEF00 /* Profile.tiff */; };
76A79E0B16349477007A0497 /* AIGroupChat.h in Headers */ = {isa = PBXBuildFile; fileRef = 76A79E0916349477007A0497 /* AIGroupChat.h */; settings = {ATTRIBUTES = (Public, ); }; };
76A79E0C16349477007A0497 /* AIGroupChat.m in Sources */ = {isa = PBXBuildFile; fileRef = 76A79E0A16349477007A0497 /* AIGroupChat.m */; };
76AA110C1635585E00A6EC4B /* AIAccountSelectionTopBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76AA11091635585E00A6EC4B /* AIAccountSelectionTopBar.xib */; };
@@ -1454,7 +1441,22 @@
C4D29CC40C3C2E3C001545A2 /* BGICImportController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D29CC00C3C2E3C001545A2 /* BGICImportController.m */; };
C4D29CC60C3C2E3C001545A2 /* BGICLogImportController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4D29CC20C3C2E3C001545A2 /* BGICLogImportController.m */; };
C4D29CC80C3C2E49001545A2 /* ICImport.xib in Resources */ = {isa = PBXBuildFile; fileRef = C4D29CC70C3C2E49001545A2 /* ICImport.xib */; };
+ C613B07B1640AABB006683FF /* get-info-profile.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0791640AABB006683FF /* get-info-profile.tiff */; };
+ C613B0BD1640B226006683FF /* get-info-address-book.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0BC1640B226006683FF /* get-info-address-book.tiff */; };
+ C613B0F01640B6DD006683FF /* emoticon-sleep.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0EE1640B6DD006683FF /* emoticon-sleep.tiff */; };
+ C613B0F11640B6DD006683FF /* emoticon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0EF1640B6DD006683FF /* emoticon.tiff */; };
+ C613B0F41640B6F5006683FF /* transcripts-timestamp-in.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0F21640B6F5006683FF /* transcripts-timestamp-in.tiff */; };
+ C613B0F51640B6F5006683FF /* transcripts-timestamp-out.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0F31640B6F5006683FF /* transcripts-timestamp-out.tiff */; };
+ C613B0F71640B70B006683FF /* transcripts-remove.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B0F61640B70B006683FF /* transcripts-remove.tiff */; };
+ C613B1091640BF91006683FF /* pref-window-handling.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B1081640BF91006683FF /* pref-window-handling.tiff */; };
+ C613B10B1640BFE7006683FF /* pref-address-book.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B10A1640BFE7006683FF /* pref-address-book.tiff */; };
+ C613B10D1640C09A006683FF /* pref-message-alerts.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B10C1640C09A006683FF /* pref-message-alerts.tiff */; };
+ C613B10F1640C0DE006683FF /* pref-general.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B10E1640C0DE006683FF /* pref-general.tiff */; };
+ C613B1111640C370006683FF /* pref-profile.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B1101640C370006683FF /* pref-profile.tiff */; };
+ C613B143164112B3006683FF /* events-dock-name.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B142164112B3006683FF /* events-dock-name.tiff */; };
+ C613B1451641210B006683FF /* events-contact.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C613B1441641210B006683FF /* events-contact.tiff */; };
C61AFA9A15DD43C80001EDEF /* AboutDialog_bg at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C61AFA9915DD43C80001EDEF /* AboutDialog_bg at 2x.png */; };
+ C63BF3BE1637605400FF162B /* SRSnapback at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C63BF3BD1637605400FF162B /* SRSnapback at 2x.png */; };
C699374B15F75FB2007EFFA0 /* stackImage at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C647215515F75E3700206892 /* stackImage at 2x.png */; };
C6A42A8015C5B7290032FAB3 /* FTProgressReveal_Selected.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7415C5B7290032FAB3 /* FTProgressReveal_Selected.png */; };
C6A42A8115C5B7290032FAB3 /* FTProgressReveal_Selected at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = C6A42A7515C5B7290032FAB3 /* FTProgressReveal_Selected at 2x.png */; };
@@ -1804,7 +1806,6 @@
112E7FA50FC86BB400657119 /* AITwitterActionsHTMLFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITwitterActionsHTMLFilter.m; path = "Plugins/Twitter Plugin/AITwitterActionsHTMLFilter.m"; sourceTree = "<group>"; };
1130EA98109B445500FB3454 /* pref-defaultclient.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-defaultclient.tiff"; path = "Resources/pref-defaultclient.tiff"; sourceTree = "<group>"; };
1130EA9B109B445D00FB3454 /* pref-mention.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-mention.tiff"; path = "Resources/pref-mention.tiff"; sourceTree = "<group>"; };
- 1130EA9C109B445D00FB3454 /* pref-messagealerts.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-messagealerts.tiff"; path = "Resources/pref-messagealerts.tiff"; sourceTree = "<group>"; };
113891810F6B6AFF00A7D7DC /* AILaconicaService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AILaconicaService.h; path = "Plugins/Twitter Plugin/AILaconicaService.h"; sourceTree = "<group>"; };
113891820F6B6AFF00A7D7DC /* AILaconicaService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AILaconicaService.m; path = "Plugins/Twitter Plugin/AILaconicaService.m"; sourceTree = "<group>"; };
113891880F6B6B2800A7D7DC /* AILaconicaAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AILaconicaAccount.h; path = "Plugins/Twitter Plugin/AILaconicaAccount.h"; sourceTree = "<group>"; };
@@ -2248,7 +2249,6 @@
3428328607D2643F004F01C9 /* ESStatusPreferences.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESStatusPreferences.h; path = Source/ESStatusPreferences.h; sourceTree = "<group>"; };
3428328707D2643F004F01C9 /* ESStatusPreferencesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESStatusPreferencesPlugin.m; path = Source/ESStatusPreferencesPlugin.m; sourceTree = "<group>"; };
342838ED07D2D004004F01C9 /* Shared Dock Icon Images */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Shared Dock Icon Images"; path = "Resources/Shared Dock Icon Images"; sourceTree = "<group>"; };
- 3428B33E0815E1FB00C0D3DC /* emoticon32.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = emoticon32.tiff; path = Resources/emoticon32.tiff; sourceTree = "<group>"; };
342910CA07AE228600C815F6 /* AIEmoticonPackPreviewTableView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIEmoticonPackPreviewTableView.h; path = Plugins/Emoticons/AIEmoticonPackPreviewTableView.h; sourceTree = "<group>"; };
342910CB07AE228600C815F6 /* AIEmoticonPackPreviewTableView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIEmoticonPackPreviewTableView.m; path = Plugins/Emoticons/AIEmoticonPackPreviewTableView.m; sourceTree = "<group>"; };
342928080628BB4200BB9217 /* ESPurpleYahooAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESPurpleYahooAccountViewController.h; path = "Plugins/Purple Service/ESPurpleYahooAccountViewController.h"; sourceTree = "<group>"; };
@@ -2671,7 +2671,7 @@
345EE2DC0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContactInfoImageViewWithImagePicker.h; path = Source/AIContactInfoImageViewWithImagePicker.h; sourceTree = "<group>"; };
345EE2DD0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIContactInfoImageViewWithImagePicker.m; path = Source/AIContactInfoImageViewWithImagePicker.m; sourceTree = "<group>"; };
345F566A08178356001F733C /* AdiumServiceIcons.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = AdiumServiceIcons.icns; path = Resources/AdiumServiceIcons.icns; sourceTree = "<group>"; };
- 345F573F0817FF80001F733C /* pref-contactList.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-contactList.tiff"; path = "Resources/pref-contactList.tiff"; sourceTree = "<group>"; };
+ 345F573F0817FF80001F733C /* pref-contact-list.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-contact-list.tiff"; path = "Resources/pref-contact-list.tiff"; sourceTree = "<group>"; };
345F583D08197E74001F733C /* AdiumStatusIcons.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = AdiumStatusIcons.icns; path = Resources/AdiumStatusIcons.icns; sourceTree = "<group>"; };
345F586308198E7F001F733C /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = nl; path = Resources/nl.lproj/AccountProxy.xib; sourceTree = "<group>"; };
345F586408198E87001F733C /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = de; path = Resources/de.lproj/AccountProxy.xib; sourceTree = "<group>"; };
@@ -2679,7 +2679,6 @@
345F589A08198F15001F733C /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = de; path = Resources/de.lproj/ListThemeSheet.xib; sourceTree = "<group>"; };
345F589C08198F15001F733C /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = de; path = Resources/de.lproj/StatusSortConfiguration.xib; sourceTree = "<group>"; };
345F58C6081990FF001F733C /* msg-log-viewer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-log-viewer.tiff"; path = "Resources/msg-log-viewer.tiff"; sourceTree = "<group>"; };
- 345F590608199746001F733C /* emoticon32_transparent.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = emoticon32_transparent.tiff; path = Resources/emoticon32_transparent.tiff; sourceTree = "<group>"; };
345F5B97081AC4F1001F733C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = zh_TW; path = Resources/zh_TW.lproj/AccountProxy.xib; sourceTree = "<group>"; };
345F5B99081AC4F1001F733C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = zh_TW; path = "Plugins/Purple Service/Resources/zh_TW.lproj/DCPurpleJabberJoinChatView.xib"; sourceTree = "<group>"; };
345F5B9A081AC4F1001F733C /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = zh_TW; path = "Plugins/Purple Service/Resources/zh_TW.lproj/DCPurpleMeanwhileJoinChatView.xib"; sourceTree = "<group>"; };
@@ -2886,7 +2885,6 @@
347E77F207CA94FE00350507 /* ESAccountEvents.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESAccountEvents.m; path = Source/ESAccountEvents.m; sourceTree = "<group>"; };
347E781107CA961300350507 /* ESUserIconHandlingPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESUserIconHandlingPlugin.h; path = Source/ESUserIconHandlingPlugin.h; sourceTree = "<group>"; };
347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESUserIconHandlingPlugin.m; path = Source/ESUserIconHandlingPlugin.m; sourceTree = "<group>"; };
- 347E781907CA962100350507 /* events-contact.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "events-contact.png"; path = "Resources/events-contact.png"; sourceTree = "<group>"; };
347E782407CA964600350507 /* ESContactSortConfigurationWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESContactSortConfigurationWindowController.h; path = Source/ESContactSortConfigurationWindowController.h; sourceTree = "<group>"; };
347E782507CA964600350507 /* AIContactSortSelectionPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIContactSortSelectionPlugin.m; path = Source/AIContactSortSelectionPlugin.m; sourceTree = "<group>"; };
347E782607CA964600350507 /* ESContactSortConfigurationWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESContactSortConfigurationWindowController.m; path = Source/ESContactSortConfigurationWindowController.m; sourceTree = "<group>"; };
@@ -2901,7 +2899,6 @@
347E786907CA972100350507 /* AddContact.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AddContact.xib; path = Resources/AddContact.xib; sourceTree = "<group>"; };
347E786A07CA972100350507 /* AddGroup.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AddGroup.xib; path = Resources/AddGroup.xib; sourceTree = "<group>"; };
347E787207CA975900350507 /* msg-add-contact.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "msg-add-contact.tiff"; path = "Resources/msg-add-contact.tiff"; sourceTree = "<group>"; };
- 347E787507CA975900350507 /* remove.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = remove.tiff; path = Resources/remove.tiff; sourceTree = "<group>"; };
347E788707CA978D00350507 /* CBActionSupportPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = CBActionSupportPlugin.m; path = Source/CBActionSupportPlugin.m; sourceTree = "<group>"; };
347E788807CA978D00350507 /* CBActionSupportPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CBActionSupportPlugin.h; path = Source/CBActionSupportPlugin.h; sourceTree = "<group>"; };
347E790D07CAA51400350507 /* AIManualSort.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIManualSort.m; path = Source/AIManualSort.m; sourceTree = "<group>"; };
@@ -3456,7 +3453,6 @@
34D8333907CBD758006466F2 /* ESPanelApplescriptDetailPane.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESPanelApplescriptDetailPane.h; path = Source/ESPanelApplescriptDetailPane.h; sourceTree = "<group>"; };
34D8333A07CBD758006466F2 /* ESApplescriptContactAlertPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESApplescriptContactAlertPlugin.h; path = Source/ESApplescriptContactAlertPlugin.h; sourceTree = "<group>"; };
34D8336707CBD807006466F2 /* pref-messages.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-messages.tiff"; path = "Resources/pref-messages.tiff"; sourceTree = "<group>"; };
- 34D8336807CBD807006466F2 /* pref-general.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-general.tif"; path = "Resources/pref-general.tif"; sourceTree = "<group>"; };
34D8336B07CBD807006466F2 /* pref-file-transfer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-file-transfer.tiff"; path = "Resources/pref-file-transfer.tiff"; sourceTree = "<group>"; };
34D8336C07CBD807006466F2 /* pref-events.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-events.tiff"; path = "Resources/pref-events.tiff"; sourceTree = "<group>"; };
34D8336E07CBD807006466F2 /* pref-advanced.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-advanced.tiff"; path = "Resources/pref-advanced.tiff"; sourceTree = "<group>"; };
@@ -3475,7 +3471,7 @@
34E0103307B956F6000DF265 /* ESPurpleNotifyEmailController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESPurpleNotifyEmailController.h; path = "Plugins/Purple Service/ESPurpleNotifyEmailController.h"; sourceTree = "<group>"; };
34E0EA0707CC53EC00A82198 /* NewMessagePrompt.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = NewMessagePrompt.xib; path = Resources/NewMessagePrompt.xib; sourceTree = "<group>"; };
34E0EA0B07CC53FE00A82198 /* AINewMessagePanelPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AINewMessagePanelPlugin.m; path = Source/AINewMessagePanelPlugin.m; sourceTree = "<group>"; };
- 34E0EA0C07CC53FE00A82198 /* AINewMessagePromptController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AINewMessagePromptController.m; path = Source/AINewMessagePromptController.m; sourceTree = "<group>"; };
+ 34E0EA0C07CC53FE00A82198 /* AINewMessagePromptController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AINewMessagePromptController.m; path = Source/AINewMessagePromptController.m; sourceTree = "<group>"; };
34E0EA0D07CC53FE00A82198 /* AINewMessagePanelPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AINewMessagePanelPlugin.h; path = Source/AINewMessagePanelPlugin.h; sourceTree = "<group>"; };
34E0EA0E07CC53FE00A82198 /* AINewMessagePromptController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AINewMessagePromptController.h; path = Source/AINewMessagePromptController.h; sourceTree = "<group>"; };
34E0EB8D07CD349200A82198 /* ESPurpleAIMAccount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESPurpleAIMAccount.h; path = "Plugins/Purple Service/ESPurpleAIMAccount.h"; sourceTree = "<group>"; };
@@ -3808,8 +3804,6 @@
4BAFD5E806E00D1700FF7FBC /* Service Icons */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Service Icons"; path = "Resources/Service Icons"; sourceTree = "<group>"; };
4BB19298079EE90900DAA523 /* PurpleDefaultsJabber.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = PurpleDefaultsJabber.plist; path = "Plugins/Purple Service/PurpleDefaultsJabber.plist"; sourceTree = "<group>"; };
4BB1E47D067F2E9F00D1DB86 /* Scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Scripts; path = Resources/Scripts; sourceTree = "<group>"; };
- 4BB2EB200D88D76100CA7A7D /* timestamp32.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = timestamp32.tiff; path = Resources/timestamp32.tiff; sourceTree = "<group>"; };
- 4BB2EB210D88D76100CA7A7D /* timestamp32_transparent.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = timestamp32_transparent.tiff; path = Resources/timestamp32_transparent.tiff; sourceTree = "<group>"; };
4BB5B78107D2DC4900CFE06F /* pref-status.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-status.tiff"; path = "Resources/pref-status.tiff"; sourceTree = "<group>"; };
4BB99726083D1A5F006ACD6F /* SMContactListShowBehaviorPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SMContactListShowBehaviorPlugin.h; path = Source/SMContactListShowBehaviorPlugin.h; sourceTree = SOURCE_ROOT; };
4BB99727083D1A5F006ACD6F /* SMContactListShowBehaviorPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = SMContactListShowBehaviorPlugin.m; path = Source/SMContactListShowBehaviorPlugin.m; sourceTree = SOURCE_ROOT; };
@@ -3829,7 +3823,6 @@
4BC5A5DA0764F75B0080ECF7 /* LocalVideoWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = LocalVideoWindow.xib; path = "Plugins/Video Chat Interface/LocalVideoWindow.xib"; sourceTree = "<group>"; };
4BCAB5EF07B59967006641B9 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = Resources/en.lproj/AccountProxy.xib; sourceTree = "<group>"; };
4BCAB5F007B59967006641B9 /* EditAccountSheet.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = EditAccountSheet.xib; path = Resources/EditAccountSheet.xib; sourceTree = "<group>"; };
- 4BCAC4D807B59B2E006641B9 /* AddressBook.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AddressBook.tiff; path = Resources/AddressBook.tiff; sourceTree = "<group>"; };
4BCAC4E207B59B65006641B9 /* AB Display Format Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = "AB Display Format Defaults.plist"; path = "Frameworks/Adium Framework/Resources/AB Display Format Defaults.plist"; sourceTree = "<group>"; };
4BCAC4E307B59B65006641B9 /* Alias Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = "Alias Defaults.plist"; path = "Resources/Alias Defaults.plist"; sourceTree = "<group>"; };
4BCAC4E407B59B65006641B9 /* Display Format Defaults.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = "Display Format Defaults.plist"; path = "Resources/Display Format Defaults.plist"; sourceTree = "<group>"; };
@@ -3860,7 +3853,7 @@
4BE9FFE7055981AB00359B15 /* Adium.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Adium.pch; sourceTree = SOURCE_ROOT; };
4BF2E194067CAE9200743318 /* Emoticons */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Emoticons; path = Resources/Emoticons; sourceTree = "<group>"; };
4BF2E6B3067CB70E00743318 /* Message Styles */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Message Styles"; path = "Resources/Message Styles"; sourceTree = "<group>"; };
- 4BF3CB4107D1771E00A8112A /* pref-appearance.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-appearance.tiff"; path = "Resources/pref-appearance.tiff"; sourceTree = "<group>"; };
+ 4BF3CB4107D1771E00A8112A /* pref-icons.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-icons.tiff"; path = "Resources/pref-icons.tiff"; sourceTree = "<group>"; };
4BF3CBEC07D192F500A8112A /* pref-accounts.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-accounts.tiff"; path = "Resources/pref-accounts.tiff"; sourceTree = "<group>"; };
4BF5BA10042F3CB200A8010A /* AIListContact.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIListContact.h; path = "Frameworks/Adium Framework/Source/AIListContact.h"; sourceTree = "<group>"; };
4BF5BA11042F3CB200A8010A /* AIListContact.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIListContact.m; path = "Frameworks/Adium Framework/Source/AIListContact.m"; sourceTree = "<group>"; };
@@ -3886,7 +3879,6 @@
4F1CB6310D640D7F0073A1E6 /* AIEventsInspectorPane.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIEventsInspectorPane.m; path = Source/AIEventsInspectorPane.m; sourceTree = "<group>"; };
4F1CB6350D640D8F0073A1E6 /* AIEventsInspectorPane.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AIEventsInspectorPane.xib; path = Resources/AIEventsInspectorPane.xib; sourceTree = "<group>"; };
4F1CB6360D640D900073A1E6 /* AIInfoInspectorPane.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = AIInfoInspectorPane.xib; path = Resources/AIInfoInspectorPane.xib; sourceTree = "<group>"; };
- 4F1CB63B0D640DA40073A1E6 /* get-info-address-book.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info-address-book.tiff"; path = "Resources/get-info-address-book.tiff"; sourceTree = "<group>"; };
4F1CB63C0D640DA40073A1E6 /* get-info-advanced.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info-advanced.tiff"; path = "Resources/get-info-advanced.tiff"; sourceTree = "<group>"; };
4F1CB63D0D640DA40073A1E6 /* get-info-events.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info-events.tiff"; path = "Resources/get-info-events.tiff"; sourceTree = "<group>"; };
4F1CB64B0D640F4F0073A1E6 /* ContactInfoInspector.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ContactInfoInspector.xib; path = Resources/ContactInfoInspector.xib; sourceTree = "<group>"; };
@@ -3899,9 +3891,7 @@
5A1E3A1114DCE60400724574 /* Preferences-Xtras.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-Xtras.xib"; path = "Resources/Preferences-Xtras.xib"; sourceTree = "<group>"; };
5A1FEA601334549300C14951 /* MessageView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MessageView.xib; path = "Plugins/Dual Window Interface/MessageView.xib"; sourceTree = "<group>"; };
5A22D6E114834F44004E15F7 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = "Plugins/Purple Service/Resources/en.lproj/AIFacebookXMPPAccountView.xib"; sourceTree = "<group>"; };
- 5A27FA7914A272330063489D /* pref-messagehistory.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-messagehistory.png"; path = "Resources/pref-messagehistory.png"; sourceTree = "<group>"; };
5A27FA7A14A272330063489D /* pref-messagestyle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-messagestyle.png"; path = "Resources/pref-messagestyle.png"; sourceTree = "<group>"; };
- 5A27FA7C14A272330063489D /* pref-windowhandling.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "pref-windowhandling.png"; path = "Resources/pref-windowhandling.png"; sourceTree = "<group>"; };
5A4BD41C13F855B000A4D3F7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = en; path = Resources/en.lproj/SearchTerms.plist; sourceTree = "<group>"; };
5A4BD47213F858EE00A4D3F7 /* Preferences-ContactList.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-ContactList.xib"; path = "Resources/Preferences-ContactList.xib"; sourceTree = "<group>"; };
5A4BD48813F859EF00A4D3F7 /* Preferences-WindowHandling.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = "Preferences-WindowHandling.xib"; path = "Resources/Preferences-WindowHandling.xib"; sourceTree = "<group>"; };
@@ -4412,7 +4402,6 @@
767870E21634045C00BD0E4D /* AIMessageViewTopBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMessageViewTopBarController.h; path = Source/AIMessageViewTopBarController.h; sourceTree = "<group>"; };
767870E31634045C00BD0E4D /* AIMessageViewTopBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMessageViewTopBarController.m; path = Source/AIMessageViewTopBarController.m; sourceTree = "<group>"; };
76889DEA12D3CA17007AEF00 /* get-info.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info.tiff"; path = "Resources/get-info.tiff"; sourceTree = "<group>"; };
- 76889DEE12D3CA40007AEF00 /* Profile.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Profile.tiff; path = Resources/Profile.tiff; sourceTree = "<group>"; };
76A79E0916349477007A0497 /* AIGroupChat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIGroupChat.h; path = "Frameworks/Adium Framework/Source/AIGroupChat.h"; sourceTree = "<group>"; };
76A79E0A16349477007A0497 /* AIGroupChat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIGroupChat.m; path = "Frameworks/Adium Framework/Source/AIGroupChat.m"; sourceTree = "<group>"; };
76AA11091635585E00A6EC4B /* AIAccountSelectionTopBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AIAccountSelectionTopBar.xib; path = "Plugins/Dual Window Interface/AIAccountSelectionTopBar.xib"; sourceTree = "<group>"; };
@@ -4533,7 +4522,22 @@
C4D29CC10C3C2E3C001545A2 /* BGICLogImportController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BGICLogImportController.h; path = Source/BGICLogImportController.h; sourceTree = SOURCE_ROOT; };
C4D29CC20C3C2E3C001545A2 /* BGICLogImportController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = BGICLogImportController.m; path = Source/BGICLogImportController.m; sourceTree = SOURCE_ROOT; };
C4D29CC70C3C2E49001545A2 /* ICImport.xib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ICImport.xib; path = Resources/ICImport.xib; sourceTree = SOURCE_ROOT; };
+ C613B0791640AABB006683FF /* get-info-profile.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info-profile.tiff"; path = "Resources/get-info-profile.tiff"; sourceTree = "<group>"; };
+ C613B0BC1640B226006683FF /* get-info-address-book.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info-address-book.tiff"; path = "Resources/get-info-address-book.tiff"; sourceTree = "<group>"; };
+ C613B0EE1640B6DD006683FF /* emoticon-sleep.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "emoticon-sleep.tiff"; path = "Resources/emoticon-sleep.tiff"; sourceTree = "<group>"; };
+ C613B0EF1640B6DD006683FF /* emoticon.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = emoticon.tiff; path = Resources/emoticon.tiff; sourceTree = "<group>"; };
+ C613B0F21640B6F5006683FF /* transcripts-timestamp-in.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "transcripts-timestamp-in.tiff"; path = "Resources/transcripts-timestamp-in.tiff"; sourceTree = "<group>"; };
+ C613B0F31640B6F5006683FF /* transcripts-timestamp-out.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "transcripts-timestamp-out.tiff"; path = "Resources/transcripts-timestamp-out.tiff"; sourceTree = "<group>"; };
+ C613B0F61640B70B006683FF /* transcripts-remove.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "transcripts-remove.tiff"; path = "Resources/transcripts-remove.tiff"; sourceTree = "<group>"; };
+ C613B1081640BF91006683FF /* pref-window-handling.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-window-handling.tiff"; path = "Resources/pref-window-handling.tiff"; sourceTree = "<group>"; };
+ C613B10A1640BFE7006683FF /* pref-address-book.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-address-book.tiff"; path = "Resources/pref-address-book.tiff"; sourceTree = "<group>"; };
+ C613B10C1640C09A006683FF /* pref-message-alerts.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-message-alerts.tiff"; path = "Resources/pref-message-alerts.tiff"; sourceTree = "<group>"; };
+ C613B10E1640C0DE006683FF /* pref-general.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-general.tiff"; path = "Resources/pref-general.tiff"; sourceTree = "<group>"; };
+ C613B1101640C370006683FF /* pref-profile.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-profile.tiff"; path = "Resources/pref-profile.tiff"; sourceTree = "<group>"; };
+ C613B142164112B3006683FF /* events-dock-name.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "events-dock-name.tiff"; path = "Resources/events-dock-name.tiff"; sourceTree = "<group>"; };
+ C613B1441641210B006683FF /* events-contact.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "events-contact.tiff"; path = "Resources/events-contact.tiff"; sourceTree = "<group>"; };
C61AFA9915DD43C80001EDEF /* AboutDialog_bg at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "AboutDialog_bg at 2x.png"; path = "Resources/AboutDialog_bg at 2x.png"; sourceTree = "<group>"; };
+ C63BF3BD1637605400FF162B /* SRSnapback at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "SRSnapback at 2x.png"; path = "Resources/SRSnapback at 2x.png"; sourceTree = "<group>"; };
C647215515F75E3700206892 /* stackImage at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "stackImage at 2x.png"; path = "Frameworks/Adium Framework/stackImage at 2x.png"; sourceTree = "<group>"; };
C6A42A7415C5B7290032FAB3 /* FTProgressReveal_Selected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FTProgressReveal_Selected.png; path = Resources/FTProgressReveal_Selected.png; sourceTree = "<group>"; };
C6A42A7515C5B7290032FAB3 /* FTProgressReveal_Selected at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "FTProgressReveal_Selected at 2x.png"; path = "Resources/FTProgressReveal_Selected at 2x.png"; sourceTree = "<group>"; };
@@ -5156,9 +5160,9 @@
34086A1005E5E17B00ABB759 /* User Icon Handling */ = {
isa = PBXGroup;
children = (
+ C613B1441641210B006683FF /* events-contact.tiff */,
347E781107CA961300350507 /* ESUserIconHandlingPlugin.h */,
347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */,
- 347E781907CA962100350507 /* events-contact.png */,
);
name = "User Icon Handling";
sourceTree = "<group>";
@@ -5300,7 +5304,6 @@
5AC7F26313B42952002D7265 /* Preferences-AddressBookIntegration.xib */,
34E2A2EC07B018B1006735BC /* ESAddressBookIntegrationAdvancedPreferences.h */,
34E2A2EF07B018B2006735BC /* ESAddressBookIntegrationAdvancedPreferences.m */,
- 4BCAC4D807B59B2E006641B9 /* AddressBook.tiff */,
);
name = "Address Book Integration";
sourceTree = "<group>";
@@ -6422,6 +6425,10 @@
34E6BBE50A78083A0076D7F0 /* Resources */ = {
isa = PBXGroup;
children = (
+ C613B0F21640B6F5006683FF /* transcripts-timestamp-in.tiff */,
+ C613B0F31640B6F5006683FF /* transcripts-timestamp-out.tiff */,
+ C613B0EE1640B6DD006683FF /* emoticon-sleep.tiff */,
+ C613B0EF1640B6DD006683FF /* emoticon.tiff */,
34D8326107CBD598006466F2 /* AccountPrefs.plist */,
317D83670E89F40500298BDB /* msg-bookmark-chat.tiff */,
34D8327507CBD5B3006466F2 /* BuiltInStatusStates.plist */,
@@ -6429,15 +6436,11 @@
34D8326707CBD598006466F2 /* default-icon.png */,
C6EE433D15C0A9BC00A4B96C /* default-icon at 2x.png */,
34D8326207CBD598006466F2 /* DockPrefs.plist */,
- 3428B33E0815E1FB00C0D3DC /* emoticon32.tiff */,
- 345F590608199746001F733C /* emoticon32_transparent.tiff */,
34B995D9092A832700E31E91 /* FontPanelAccessoryView.xib */,
34DFF53007A62EB100B92233 /* lock-locked.tiff */,
34DFF52607A62EB000B92233 /* lock-unlocked.tiff */,
- 347E787507CA975900350507 /* remove.tiff */,
+ C613B0F61640B70B006683FF /* transcripts-remove.tiff */,
34D8326307CBD598006466F2 /* msg-send-file.tiff */,
- 4BB2EB200D88D76100CA7A7D /* timestamp32.tiff */,
- 4BB2EB210D88D76100CA7A7D /* timestamp32_transparent.tiff */,
34D8327607CBD5B3006466F2 /* ToolbarPrefs.plist */,
);
name = Resources;
@@ -6696,6 +6699,7 @@
4B18A51F0459F89300A8010A /* Contact and Chat Dock Overlays */ = {
isa = PBXGroup;
children = (
+ C613B142164112B3006683FF /* events-dock-name.tiff */,
5A5F8BBB12D560E400019727 /* AIDockNameOverlay.h */,
5A5F8BBC12D560E400019727 /* AIDockNameOverlay.m */,
);
@@ -8250,25 +8254,25 @@
9C82689903D9B23F00F1D4AF /* Icons */ = {
isa = PBXGroup;
children = (
- 5A27FA7914A272330063489D /* pref-messagehistory.png */,
+ C613B10E1640C0DE006683FF /* pref-general.tiff */,
+ C613B1101640C370006683FF /* pref-profile.tiff */,
+ C613B10C1640C09A006683FF /* pref-message-alerts.tiff */,
+ C613B10A1640BFE7006683FF /* pref-address-book.tiff */,
5A27FA7A14A272330063489D /* pref-messagestyle.png */,
- 5A27FA7C14A272330063489D /* pref-windowhandling.png */,
+ C613B1081640BF91006683FF /* pref-window-handling.tiff */,
D10A3A2A122C61EF003B5A7E /* msg-source-destination.tiff */,
4BF3CBEC07D192F500A8112A /* pref-accounts.tiff */,
34D8336E07CBD807006466F2 /* pref-advanced.tiff */,
- 4BF3CB4107D1771E00A8112A /* pref-appearance.tiff */,
+ 4BF3CB4107D1771E00A8112A /* pref-icons.tiff */,
11AE5554109CC88C0074BDC2 /* pref-confirmations.tiff */,
- 345F573F0817FF80001F733C /* pref-contactList.tiff */,
+ 345F573F0817FF80001F733C /* pref-contact-list.tiff */,
1130EA98109B445500FB3454 /* pref-defaultclient.tiff */,
34D8336C07CBD807006466F2 /* pref-events.tiff */,
34D8336B07CBD807006466F2 /* pref-file-transfer.tiff */,
- 34D8336807CBD807006466F2 /* pref-general.tif */,
1130EA9B109B445D00FB3454 /* pref-mention.tiff */,
- 1130EA9C109B445D00FB3454 /* pref-messagealerts.tiff */,
34D8336707CBD807006466F2 /* pref-messages.tiff */,
4BB5B78107D2DC4900CFE06F /* pref-status.tiff */,
4BAE6C9407CF94C4007E2820 /* events-message.tiff */,
- 76889DEE12D3CA40007AEF00 /* Profile.tiff */,
34D832A507CBD62B006466F2 /* AdiumEmoticonset.icns */,
073475F00C4C9632009ACC43 /* AdiumMenuBarIcons.icns */,
34D832A607CBD62B006466F2 /* AdiumScripts.icns */,
@@ -8800,6 +8804,8 @@
F5CDCE460350758501A8010A /* Contact Info Window */ = {
isa = PBXGroup;
children = (
+ C613B0BC1640B226006683FF /* get-info-address-book.tiff */,
+ C613B0791640AABB006683FF /* get-info-profile.tiff */,
34E6C5640A791BAF0076D7F0 /* AIContactInfoWindowPlugin.h */,
34E6C5650A791BAF0076D7F0 /* AIContactInfoWindowPlugin.m */,
F570A59803704B6101A8010A /* AIContactInfoWindowController.h */,
@@ -8824,10 +8830,10 @@
343ECBED0971B18E00349098 /* ShowContactInfoPrompt.xib */,
345EE2DC0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.h */,
345EE2DD0AD057FA003F396A /* AIContactInfoImageViewWithImagePicker.m */,
- 4F1CB63B0D640DA40073A1E6 /* get-info-address-book.tiff */,
4F1CB63C0D640DA40073A1E6 /* get-info-advanced.tiff */,
4F1CB63D0D640DA40073A1E6 /* get-info-events.tiff */,
346196F10D31607500763051 /* SRSnapback.png */,
+ C63BF3BD1637605400FF162B /* SRSnapback at 2x.png */,
76889DEA12D3CA17007AEF00 /* get-info.tiff */,
);
name = "Contact Info Window";
@@ -9548,7 +9554,6 @@
346F5D3208A43E7B0055C610 /* CurrentTunes.scpt in Resources */,
349C30790867ADA3000BF883 /* AdiumApplescriptRunner in Resources */,
34E0EA0807CC53ED00A82198 /* NewMessagePrompt.xib in Resources */,
- 347E781A07CA962100350507 /* events-contact.png in Resources */,
347E783407CA967100350507 /* SortingDefaults.plist in Resources */,
347E786C07CA972100350507 /* AddGroup.xib in Resources */,
347E787807CA975900350507 /* msg-add-contact.tiff in Resources */,
@@ -9578,7 +9583,6 @@
34D8332B07CBD72A006466F2 /* ContactCountingDisplayDefaults.plist in Resources */,
34D8333207CBD741006466F2 /* ApplescriptContactAlert.xib in Resources */,
34D8333307CBD741006466F2 /* events-applescript-alert.tiff in Resources */,
- 34D8337107CBD808006466F2 /* pref-general.tif in Resources */,
34D8337407CBD808006466F2 /* pref-file-transfer.tiff in Resources */,
34D8337507CBD808006466F2 /* pref-events.tiff in Resources */,
34D8337707CBD808006466F2 /* pref-advanced.tiff in Resources */,
@@ -9607,7 +9611,6 @@
34C14D5107A8BA00003CC138 /* EmoticonPackPreview.xib in Resources */,
343EB3FE08086D2F00E27095 /* AccountProxy.xib in Resources */,
4BCAB5F307B59967006641B9 /* EditAccountSheet.xib in Resources */,
- 4BCAC4D907B59B2E006641B9 /* AddressBook.tiff in Resources */,
4BCAC4E607B59B65006641B9 /* Alias Defaults.plist in Resources */,
4BCAC4E707B59B65006641B9 /* Display Format Defaults.plist in Resources */,
4BCAC56D07B5A31A006641B9 /* Sounds in Resources */,
@@ -9619,7 +9622,7 @@
4BAE6C4C07CF941C007E2820 /* events-dock-alert.tiff in Resources */,
4BAE6C4D07CF941C007E2820 /* DockBehaviorContactAlert.xib in Resources */,
4BAE6C9507CF94C4007E2820 /* events-message.tiff in Resources */,
- 4BF3CB4207D1771E00A8112A /* pref-appearance.tiff in Resources */,
+ 4BF3CB4207D1771E00A8112A /* pref-icons.tiff in Resources */,
4BF3CBED07D192F500A8112A /* pref-accounts.tiff in Resources */,
4B08399C07D235190034A001 /* DockIconSelectionSheet.xib in Resources */,
342838EE07D2D004004F01C9 /* Shared Dock Icon Images in Resources */,
@@ -9642,7 +9645,7 @@
34F4677B080F49C5007800AB /* Safari.png in Resources */,
345ACC970811C20F008E4D22 /* AwayStatusWindow.xib in Resources */,
345F566B08178356001F733C /* AdiumServiceIcons.icns in Resources */,
- 345F57400817FF80001F733C /* pref-contactList.tiff in Resources */,
+ 345F57400817FF80001F733C /* pref-contact-list.tiff in Resources */,
345F583E08197E74001F733C /* AdiumStatusIcons.icns in Resources */,
345F58C7081990FF001F733C /* msg-log-viewer.tiff in Resources */,
0779934F08221D9700F698DC /* Service Icons in Resources */,
@@ -9686,12 +9689,9 @@
3419DE750A81042F00C3FC68 /* ContactPrefs.plist in Resources */,
3419DE760A81042F00C3FC68 /* default-icon.png in Resources */,
3419DE770A81042F00C3FC68 /* DockPrefs.plist in Resources */,
- 3419DE780A81042F00C3FC68 /* emoticon32.tiff in Resources */,
- 3419DE790A81042F00C3FC68 /* emoticon32_transparent.tiff in Resources */,
3419DE7A0A81042F00C3FC68 /* FontPanelAccessoryView.xib in Resources */,
3419DE7C0A81042F00C3FC68 /* lock-locked.tiff in Resources */,
3419DE7D0A81042F00C3FC68 /* lock-unlocked.tiff in Resources */,
- 3419DE7E0A81042F00C3FC68 /* remove.tiff in Resources */,
3419DE7F0A81042F00C3FC68 /* msg-send-file.tiff in Resources */,
3419DE820A81042F00C3FC68 /* ToolbarPrefs.plist in Resources */,
34DC13050A81417700D710F3 /* LoginSelect.xib in Resources */,
@@ -9711,12 +9711,9 @@
346196F20D31607500763051 /* SRSnapback.png in Resources */,
4F1CB6390D640D900073A1E6 /* AIEventsInspectorPane.xib in Resources */,
4F1CB63A0D640D900073A1E6 /* AIInfoInspectorPane.xib in Resources */,
- 4F1CB63F0D640DA40073A1E6 /* get-info-address-book.tiff in Resources */,
4F1CB6400D640DA40073A1E6 /* get-info-advanced.tiff in Resources */,
4F1CB6410D640DA40073A1E6 /* get-info-events.tiff in Resources */,
4F1CB64C0D640F4F0073A1E6 /* ContactInfoInspector.xib in Resources */,
- 4BB2EB220D88D76100CA7A7D /* timestamp32.tiff in Resources */,
- 4BB2EB230D88D76100CA7A7D /* timestamp32_transparent.tiff in Resources */,
34A1AEE90DFD4BFE00AC78CF /* AIAddressBookInspectorPane.xib in Resources */,
34A1AEEE0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.xib in Resources */,
317D83680E89F40500298BDB /* msg-bookmark-chat.tiff in Resources */,
@@ -9735,13 +9732,11 @@
11BE29640FCCA8DA000E6A10 /* ImageUploaderProgress.xib in Resources */,
1130EA99109B445500FB3454 /* pref-defaultclient.tiff in Resources */,
1130EA9D109B445D00FB3454 /* pref-mention.tiff in Resources */,
- 1130EA9E109B445D00FB3454 /* pref-messagealerts.tiff in Resources */,
11AE5555109CC88C0074BDC2 /* pref-confirmations.tiff in Resources */,
5A9A9F8B11F295EB00328DF9 /* events-do-nothing.tiff in Resources */,
D10A3A2B122C61EF003B5A7E /* msg-source-destination.tiff in Resources */,
34333FF3127F6E77007050E8 /* TemporaryIRCAccountWindow.xib in Resources */,
76889DEB12D3CA17007AEF00 /* get-info.tiff in Resources */,
- 76889DEF12D3CA40007AEF00 /* Profile.tiff in Resources */,
1154F50A12E1476900B8CA27 /* AILogByAccountWindow.xib in Resources */,
97AF5CF413191E9A00550C41 /* ContactListChangeUserPictureMenu.xib in Resources */,
9722ABC813257D7F00CAB486 /* ContactListWindow.xib in Resources */,
@@ -9764,9 +9759,7 @@
5A4BD56A13F86B7E00A4D3F7 /* Preferences-Icons.xib in Resources */,
5A4BD57F13F86BC500A4D3F7 /* Preferences-General.xib in Resources */,
7EC033B214590E0700CF24FB /* MessageWindow.xib in Resources */,
- 5A27FA7D14A272330063489D /* pref-messagehistory.png in Resources */,
5A27FA7E14A272330063489D /* pref-messagestyle.png in Resources */,
- 5A27FA8014A272330063489D /* pref-windowhandling.png in Resources */,
5A1E3A1214DCE60400724574 /* Preferences-Xtras.xib in Resources */,
5A8F637614DD1B21008412C8 /* Preferences-Privacy.xib in Resources */,
97F7B38014E29BC500A0F6F8 /* facebook-small.png in Resources */,
@@ -9820,6 +9813,21 @@
C6BC7F9B15DD666600C5FF52 /* events-notification.tiff in Resources */,
76AA110C1635585E00A6EC4B /* AIAccountSelectionTopBar.xib in Resources */,
765F5DC51635934400C57904 /* AIRejoinGroupChatTopBar.xib in Resources */,
+ C63BF3BE1637605400FF162B /* SRSnapback at 2x.png in Resources */,
+ C613B07B1640AABB006683FF /* get-info-profile.tiff in Resources */,
+ C613B0BD1640B226006683FF /* get-info-address-book.tiff in Resources */,
+ C613B0F01640B6DD006683FF /* emoticon-sleep.tiff in Resources */,
+ C613B0F11640B6DD006683FF /* emoticon.tiff in Resources */,
+ C613B0F41640B6F5006683FF /* transcripts-timestamp-in.tiff in Resources */,
+ C613B0F51640B6F5006683FF /* transcripts-timestamp-out.tiff in Resources */,
+ C613B0F71640B70B006683FF /* transcripts-remove.tiff in Resources */,
+ C613B1091640BF91006683FF /* pref-window-handling.tiff in Resources */,
+ C613B10B1640BFE7006683FF /* pref-address-book.tiff in Resources */,
+ C613B10D1640C09A006683FF /* pref-message-alerts.tiff in Resources */,
+ C613B10F1640C0DE006683FF /* pref-general.tiff in Resources */,
+ C613B1111640C370006683FF /* pref-profile.tiff in Resources */,
+ C613B143164112B3006683FF /* events-dock-name.tiff in Resources */,
+ C613B1451641210B006683FF /* events-contact.tiff in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff -r 5de1870f10b9 -r 40608a21c9f7 Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.m
--- a/Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.m Tue Oct 23 23:00:32 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.m Wed Oct 31 12:14:32 2012 +0100
@@ -160,7 +160,7 @@
//menuUserIconForObject
secondaryIcon = [AIUserIcons menuUserIconForObject:listObject];
} else {
- secondaryIcon = [AIServiceIcons serviceIconForObject:listObject type:AIServiceIconSmall direction:AIIconNormal];
+ secondaryIcon = [[AIServiceIcons serviceIconForObject:listObject type:AIServiceIconSmall direction:AIIconNormal] imageByScalingForMenuItem];
}
secondarySize = [secondaryIcon size];
diff -r 5de1870f10b9 -r 40608a21c9f7 Frameworks/Adium Framework/Source/AIAccountMenu.m
--- a/Frameworks/Adium Framework/Source/AIAccountMenu.m Tue Oct 23 23:00:32 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIAccountMenu.m Wed Oct 31 12:14:32 2012 +0100
@@ -21,6 +21,7 @@
#import <AIUtilities/AIMenuAdditions.h>
#import <AIUtilities/AIAttributedStringAdditions.h>
#import <AIUtilities/AIImageAdditions.h>
+#import <AIUtilities/AIImageDrawingAdditions.h>
#import <AIUtilities/AIParagraphStyleAdditions.h>
#import <Adium/AIAccount.h>
#import <Adium/AIService.h>
@@ -349,16 +350,13 @@
//Add an SSL icon if the account is encrypted.
if ([account encrypted]) {
- NSBundle *securityInterfaceFramework = [NSBundle bundleWithIdentifier:@"com.apple.securityinterface"];
- if (!securityInterfaceFramework) securityInterfaceFramework = [NSBundle bundleWithPath:@"/System/Library/Frameworks/SecurityInterface.framework"];
+ NSImage *SSLIcon = [[NSImage imageForSSL] copy];
+ NSTextAttachment *textAttachment = [[NSTextAttachment alloc] init];
+ NSMutableAttributedString *title = nil;
- NSString *path = [securityInterfaceFramework pathForImageResource:@"CertSmallStd"];
- NSFileWrapper *fileWrapper = nil;
- NSTextAttachment *textAttachment = nil;
- NSMutableAttributedString *title = nil;
-
- fileWrapper = [[NSFileWrapper alloc] initWithPath:path];
- textAttachment = [[NSTextAttachment alloc] initWithFileWrapper:fileWrapper];
+ [SSLIcon imageByScalingForMenuItem];
+ [textAttachment setAttachmentCell:[[[NSTextAttachmentCell alloc] initImageCell:SSLIcon] autorelease]];
+ [SSLIcon release];
title = [plainTitle mutableCopy];
@@ -376,7 +374,6 @@
[title release];
[textAttachment release];
- [fileWrapper release];
} else {
[menuItem setAttributedTitle:plainTitle];
}
diff -r 5de1870f10b9 -r 40608a21c9f7 Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.h
--- a/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.h Tue Oct 23 23:00:32 2012 +0200
+++ b/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.h Wed Oct 31 12:14:32 2012 +0100
@@ -47,7 +47,8 @@
{
NSDictionary *m_urlSchemes;
NSString *m_scanString;
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
+ NSMutableArray *m_openEnclosureStack;
+#if TARGET_OS_IPHONE
NSString *m_linkifiedString;
#else
NSAttributedString *m_scanAttrString;
@@ -59,7 +60,11 @@
}
@property (assign) unsigned long scanLocation;
+#if TARGET_OS_IPHONE
+ at property (readonly) NSString *linkifiedString;
+#else
@property (readonly) NSAttributedString *linkifiedString;
+#endif
/*!
* @brief Allocs and inits a new lax AHHyperlinkScanner with the given NSString
diff -r 5de1870f10b9 -r 40608a21c9f7 Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m
--- a/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m Tue Oct 23 23:00:32 2012 +0200
+++ b/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m Wed Oct 31 12:14:32 2012 +0100
@@ -34,6 +34,8 @@
#define ENC_INDEX_KEY @"encIndex"
#define ENC_CHAR_KEY @"encChar"
+#define MIN_LINK_LENGTH 4
+
@interface AHHyperlinkScanner (PRIVATE)
- (AHMarkedHyperlink *)nextURIFromLocation:(unsigned long *)_scanLocation;
#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
@@ -122,13 +124,14 @@
#if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
m_scanAttrString = nil;
#endif
+ m_openEnclosureStack = [[NSMutableArray alloc] init];
}
return self;
}
- (id)initWithString:(NSString *)inString usingStrictChecking:(BOOL)flag
{
- if((self = [super init])){
+ if((self = [self init])){
m_scanString = [inString retain];
m_urlSchemes = [[NSDictionary alloc] initWithObjectsAndKeys:
@"ftp://", @"ftp",
@@ -142,7 +145,7 @@
#if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
- (id)initWithAttributedString:(NSAttributedString *)inString usingStrictChecking:(BOOL)flag
{
- if((self = [super init])){
+ if((self = [self init])){
m_scanString = [[inString string] retain];
m_scanAttrString = [inString retain];
m_urlSchemes = [[NSDictionary alloc] initWithObjectsAndKeys:
@@ -161,6 +164,7 @@
[m_linkifiedString release];
[m_scanString release];
[m_urlSchemes release];
+ [m_openEnclosureStack release];
#if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
if(m_scanAttrString) [m_scanAttrString release];
#endif
@@ -253,96 +257,106 @@
// main scanning loop
while([self _scanString:m_scanString upToCharactersFromSet:skipSet intoRange:&scannedRange fromIndex:&scannedLocation]) {
-
- // Check for and filter enclosures. We can't add (, [, etc. to the skipSet as they may be in a URI
- if([enclosureSet characterIsMember:[m_scanString characterAtIndex:scannedRange.location]]){
- unsigned long encIdx = [enclosureStartArray indexOfObject:[m_scanString substringWithRange:NSMakeRange(scannedRange.location, 1)]];
- NSRange encRange;
- if(NSNotFound != encIdx) {
- encRange = [m_scanString rangeOfString:[enclosureStopArray objectAtIndex:encIdx] options:NSBackwardsSearch range:scannedRange];
- if(NSNotFound != encRange.location){
- scannedRange.location++; scannedRange.length -= 2;
- }
- }
- }
- if(!scannedRange.length) break;
-
- // Find balanced enclosure chars
- NSRange longestEnclosure = [self _longestBalancedEnclosureInRange:scannedRange];
- while (scannedRange.length > 2 && [endSet characterIsMember:[m_scanString characterAtIndex:(scannedRange.location + scannedRange.length - 1)]]) {
- if((longestEnclosure.location + longestEnclosure.length) < scannedRange.length){
- scannedRange.length--;
- }else break;
- }
-
- // if we have a valid URL then save the scanned string, and make a SHMarkedHyperlink out of it.
- // this way, we can preserve things like the matched string (to be converted to a NSURL),
- // parent string, its validation status (valid, file, degenerate, etc), and its range in the parent string
- AH_URI_VERIFICATION_STATUS validStatus;
- NSString *_scanString = nil;
- unsigned long schemeLength = 0;
- if(4 < scannedRange.length) _scanString = [m_scanString substringWithRange:scannedRange];
- if((4 < scannedRange.length) && [[self class] isStringValidURI:_scanString usingStrict:m_strictChecking fromIndex:&m_scanLocation withStatus:&validStatus schemeLength:&schemeLength]){
- AHMarkedHyperlink *markedLink;
- BOOL makeLink = TRUE;
- //insert typical specifiers if the URL is degenerate
- switch(validStatus){
- case AH_URL_DEGENERATE:
- {
- NSString *scheme = DEFAULT_URL_SCHEME;
- unsigned long i = 0;
-
- NSRange firstComponent;
- [self _scanString:_scanString
- upToCharactersFromSet:hostnameComponentSeparatorSet
- intoRange:&firstComponent
- fromIndex:&i];
-
- if(NSNotFound != firstComponent.location) {
- NSString *hostnameScheme = [m_urlSchemes objectForKey:[_scanString substringWithRange:firstComponent]];
- if(hostnameScheme) scheme = hostnameScheme;
+ if (MIN_LINK_LENGTH < scannedRange.length) {
+ // Check for and filter enclosures. We can't add (, [, etc. to the skipSet as they may be in a URI
+ NSString *topEncChar = [m_openEnclosureStack lastObject];
+ if(topEncChar || [enclosureSet characterIsMember:[m_scanString characterAtIndex:scannedRange.location]]){
+ unsigned long encIdx = [enclosureStartArray indexOfObject:topEncChar? topEncChar : [m_scanString substringWithRange:NSMakeRange(scannedRange.location, 1)]];
+ NSRange encRange;
+ if(NSNotFound != encIdx) {
+ encRange = [m_scanString rangeOfString:[enclosureStopArray objectAtIndex:encIdx] options:NSBackwardsSearch range:scannedRange];
+ if(NSNotFound != encRange.location){
+ scannedRange.length--;
+ if (topEncChar) {
+ [m_openEnclosureStack removeLastObject];
+ } else {
+ scannedRange.location++;
+ scannedRange.length--;
+ }
+ } else {
+ [m_openEnclosureStack addObject:[enclosureStartArray objectAtIndex:encIdx]];
}
-
- _scanString = [scheme stringByAppendingString:_scanString];
-
- break;
}
-
- case AH_MAILTO_DEGENERATE:
- _scanString = [@"mailto:" stringByAppendingString:_scanString];
- break;
- case AH_URL_TENTATIVE:
- {
- NSString *scheme = [_scanString substringToIndex:schemeLength];
- NSArray *apps = (NSArray *)LSCopyAllHandlersForURLScheme((CFStringRef)scheme);
-
- if(!apps.count)
- makeLink = FALSE;
- [apps release];
- break;
- }
- default:
- break;
+ }
+ if(!scannedRange.length) break;
+
+ // Find balanced enclosure chars
+ NSRange longestEnclosure = [self _longestBalancedEnclosureInRange:scannedRange];
+ while (scannedRange.length > 2 && [endSet characterIsMember:[m_scanString characterAtIndex:(scannedRange.location + scannedRange.length - 1)]]) {
+ if((longestEnclosure.location + longestEnclosure.length) < scannedRange.length){
+ scannedRange.length--;
+ }else break;
}
- if(makeLink){
- //make a marked link
- markedLink = [[AHMarkedHyperlink alloc] initWithString:_scanString
- withValidationStatus:validStatus
- parentString:m_scanString
- andRange:scannedRange];
- return [markedLink autorelease];
- }
+ // if we have a valid URL then save the scanned string, and make a SHMarkedHyperlink out of it.
+ // this way, we can preserve things like the matched string (to be converted to a NSURL),
+ // parent string, its validation status (valid, file, degenerate, etc), and its range in the parent string
+ AH_URI_VERIFICATION_STATUS validStatus;
+ NSString *_scanString = nil;
+ unsigned long schemeLength = 0;
+ if(MIN_LINK_LENGTH < scannedRange.length) _scanString = [m_scanString substringWithRange:scannedRange];
+ if((MIN_LINK_LENGTH < scannedRange.length) && [[self class] isStringValidURI:_scanString usingStrict:m_strictChecking fromIndex:&m_scanLocation withStatus:&validStatus schemeLength:&schemeLength]){
+ AHMarkedHyperlink *markedLink;
+ BOOL makeLink = TRUE;
+ //insert typical specifiers if the URL is degenerate
+ switch(validStatus){
+ case AH_URL_DEGENERATE:
+ {
+ NSString *scheme = DEFAULT_URL_SCHEME;
+ unsigned long i = 0;
+
+ NSRange firstComponent;
+ [self _scanString:_scanString
+ upToCharactersFromSet:hostnameComponentSeparatorSet
+ intoRange:&firstComponent
+ fromIndex:&i];
+
+ if(NSNotFound != firstComponent.location) {
+ NSString *hostnameScheme = [m_urlSchemes objectForKey:[_scanString substringWithRange:firstComponent]];
+ if(hostnameScheme) scheme = hostnameScheme;
+ }
+
+ _scanString = [scheme stringByAppendingString:_scanString];
+
+ break;
+ }
+
+ case AH_MAILTO_DEGENERATE:
+ _scanString = [@"mailto:" stringByAppendingString:_scanString];
+ break;
+ case AH_URL_TENTATIVE:
+ {
+ NSString *scheme = [_scanString substringToIndex:schemeLength];
+ NSArray *apps = (NSArray *)LSCopyAllHandlersForURLScheme((CFStringRef)scheme);
+
+ if(!apps.count)
+ makeLink = FALSE;
+ [apps release];
+ break;
+ }
+ default:
+ break;
+ }
+
+ if(makeLink){
+ //make a marked link
+ markedLink = [[AHMarkedHyperlink alloc] initWithString:_scanString
+ withValidationStatus:validStatus
+ parentString:m_scanString
+ andRange:scannedRange];
+ return [markedLink autorelease];
+ }
+ }
+
+ //step location after scanning a string
+ NSRange startRange = [m_scanString rangeOfCharacterFromSet:puncSet options:NSLiteralSearch range:scannedRange];
+ if (startRange.location != NSNotFound)
+ m_scanLocation = startRange.location + startRange.length;
+ else
+ m_scanLocation += scannedRange.length;
+
+ scannedLocation = m_scanLocation;
}
-
- //step location after scanning a string
- NSRange startRange = [m_scanString rangeOfCharacterFromSet:puncSet options:NSLiteralSearch range:scannedRange];
- if (startRange.location != NSNotFound)
- m_scanLocation = startRange.location + startRange.length;
- else
- m_scanLocation += scannedRange.length;
-
- scannedLocation = m_scanLocation;
}
// if we're here, then NSScanner hit the end of the string
diff -r 5de1870f10b9 -r 40608a21c9f7 Frameworks/AutoHyperlinks Framework/Source/AHLinkLexer.l
--- a/Frameworks/AutoHyperlinks Framework/Source/AHLinkLexer.l Tue Oct 23 23:00:32 2012 +0200
+++ b/Frameworks/AutoHyperlinks Framework/Source/AHLinkLexer.l Wed Oct 31 12:14:32 2012 +0100
@@ -54,7 +54,7 @@
%{
/*The Unicode standard, version 4.1, table 3-6, says that the highest byte that will occur in a valid UTF-8 sequence is 0xF4.*/
%}
-userAndPass [^:@]+(:[^:@]+)?
+userAndPass [^:@[:space:]]+(:[^:@[:space:]]+)?
singleDomain [_[:alnum:]\x80-\xf4-]+
urlPath \/[^[:space:]]*
@@ -74,7 +74,7 @@
userAtDomain [^:@\/[:space:]]+\@{singleDomain}(\.{singleDomain})*
mailSpec {userAtDomain}\.{TLDs}
-%option noyywrap nounput noinput 8bit caseless never-interactive reentrant warn prefix="AH"
+%option noyywrap nounput noinput 8bit caseless align never-interactive reentrant warn prefix="AH"
%x CANONICAL TENTATIVE
%%
diff -r 5de1870f10b9 -r 40608a21c9f7 Frameworks/AutoHyperlinks Framework/UnitTests/HyperlinkContextTest.m
--- a/Frameworks/AutoHyperlinks Framework/UnitTests/HyperlinkContextTest.m Tue Oct 23 23:00:32 2012 +0200
+++ b/Frameworks/AutoHyperlinks Framework/UnitTests/HyperlinkContextTest.m Wed Oct 31 12:14:32 2012 +0100
@@ -13,7 +13,7 @@
AHHyperlinkScanner *scanner = [AHHyperlinkScanner hyperlinkScannerWithString:testString];
AHMarkedHyperlink *ahLink = [scanner nextURI];
- STAssertNotNil(ahLink.URL, @"-[SHHyperlinkScanner nextURL] found no URI in \"%@\"", testString);
+ STAssertNotNil(ahLink, @"-[SHHyperlinkScanner nextURL] found no URI in \"%@\"", testString);
STAssertEqualObjects([[ahLink parentString] substringWithRange:[ahLink range]], URIString, @"in context: '%@'", testString);
}
@@ -218,6 +218,8 @@
[self testLaxContext:@"foo (bar) %@" withURI:@"http://example.com/path/to/url.html"];
[self testLaxContext:@"%@ doesn't link." withURI:@"http://developer.apple.com/library/iOS/#documentation/Cocoa/Conceptual/CocoaFundamentals/CocoaObjects/CocoaObjects.html#//apple_ref/doc/uid/TP40002974-CH4-SW3"];
+ [self testLaxContext:@"foo (bar: %@)" withURI:@"http://example.com/path/to/url_(other)"];
+ [self testLaxContext:@"foo [bar: %@]" withURI:@"http://example.com/path/to/url_(other)"];
}
- (void)testCompositeContext {
diff -r 5de1870f10b9 -r 40608a21c9f7 Plugins/Dock Icon Badging/AIDockNameOverlay.m
--- a/Plugins/Dock Icon Badging/AIDockNameOverlay.m Tue Oct 23 23:00:32 2012 +0200
+++ b/Plugins/Dock Icon Badging/AIDockNameOverlay.m Wed Oct 31 12:14:32 2012 +0100
@@ -92,7 +92,7 @@
*/
- (NSImage *)imageForActionID:(NSString *)actionID
{
- return [NSImage imageNamed:@"events-dock-alert" forClass:[self class]];
+ return [NSImage imageNamed:@"events-dock-name" forClass:[self class]];
}
/*!
diff -r 5de1870f10b9 -r 40608a21c9f7 Plugins/Dual Window Interface/AIAccountSelectionTopBar.xib
--- a/Plugins/Dual Window Interface/AIAccountSelectionTopBar.xib Tue Oct 23 23:00:32 2012 +0200
+++ b/Plugins/Dual Window Interface/AIAccountSelectionTopBar.xib Wed Oct 31 12:14:32 2012 +0100
@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">12C60</string>
+ <string key="IBDocument.SystemVersion">12C54</string>
<string key="IBDocument.InterfaceBuilderVersion">2843</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
@@ -47,8 +47,8 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="NSPopUpButton" id="762366467">
<reference key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">270</int>
- <string key="NSFrame">{{50, 1}, {212, 26}}</string>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{52, 1}, {377, 25}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
@@ -127,8 +127,8 @@
</object>
<object class="NSPopUpButton" id="70819358">
<reference key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">270</int>
- <string key="NSFrame">{{50, 29}, {212, 26}}</string>
+ <int key="NSvFlags">266</int>
+ <string key="NSFrame">{{52, 29.5}, {377, 25}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="251755580"/>
@@ -198,7 +198,7 @@
<object class="NSTextField" id="251755580">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{7, 6}, {41, 17}}</string>
+ <string key="NSFrame">{{9, 7.5}, {41, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="762366467"/>
@@ -235,7 +235,7 @@
<object class="NSTextField" id="476591228">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{23, 34}, {25, 17}}</string>
+ <string key="NSFrame">{{26, 35.5}, {25, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="70819358"/>
@@ -374,10 +374,10 @@
<int key="objectID">1</int>
<reference key="object" ref="1005"/>
<array class="NSMutableArray" key="children">
+ <reference ref="70819358"/>
+ <reference ref="476591228"/>
<reference ref="251755580"/>
- <reference ref="476591228"/>
<reference ref="762366467"/>
- <reference ref="70819358"/>
</array>
<reference key="parent" ref="323709103"/>
</object>
diff -r 5de1870f10b9 -r 40608a21c9f7 Plugins/Dual Window Interface/AIWindowHandlingPreferences.m
--- a/Plugins/Dual Window Interface/AIWindowHandlingPreferences.m Tue Oct 23 23:00:32 2012 +0200
+++ b/Plugins/Dual Window Interface/AIWindowHandlingPreferences.m Wed Oct 31 12:14:32 2012 +0100
@@ -42,7 +42,7 @@
return @"Preferences-WindowHandling";
}
- (NSImage *)paneIcon{
- return [NSImage imageNamed:@"pref-windowhandling" forClass:[self class]];
+ return [NSImage imageNamed:@"pref-window-handling" forClass:[self class]];
}
- (void)viewDidLoad
diff -r 5de1870f10b9 -r 40608a21c9f7 Plugins/Error Message Handler/events-error-alert.tiff
Binary file Plugins/Error Message Handler/events-error-alert.tiff has changed
diff -r 5de1870f10b9 -r 40608a21c9f7 Plugins/Open Message Window Contact Alert/events-window-alert.tiff
Binary file Plugins/Open Message Window Contact Alert/events-window-alert.tiff has changed
diff -r 5de1870f10b9 -r 40608a21c9f7 Plugins/Secure Messaging/lock-locked.tiff
Binary file Plugins/Secure Messaging/lock-locked.tiff has changed
diff -r 5de1870f10b9 -r 40608a21c9f7 Plugins/Secure Messaging/lock-unlocked.tiff
Binary file Plugins/Secure Messaging/lock-unlocked.tiff has changed
diff -r 5de1870f10b9 -r 40608a21c9f7 Resources/AddressBook.tiff
Binary file Resources/AddressBook.tiff has changed
diff -r 5de1870f10b9 -r 40608a21c9f7 Resources/LogViewer.xib
--- a/Resources/LogViewer.xib Tue Oct 23 23:00:32 2012 +0200
+++ b/Resources/LogViewer.xib Wed Oct 31 12:14:32 2012 +0100
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">12A269</string>
- <string key="IBDocument.InterfaceBuilderVersion">2549</string>
- <string key="IBDocument.AppKitVersion">1187</string>
- <string key="IBDocument.HIToolboxVersion">624.00</string>
+ <string key="IBDocument.SystemVersion">12C60</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2843</string>
+ <string key="IBDocument.AppKitVersion">1187.34</string>
+ <string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2549</string>
+ <string key="NS.object.0">2843</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSBox</string>
@@ -88,7 +88,7 @@
<string key="NSFrameSize">{177, 535}</string>
<reference key="NSSuperview" ref="981661881"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="268459162"/>
+ <reference key="NSNextKeyView" ref="55917509"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -220,7 +220,7 @@
<string key="NSFrame">{{0, -1}, {177, 535}}</string>
<reference key="NSSuperview" ref="28735003"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="981661881"/>
+ <reference key="NSNextKeyView" ref="268459162"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="666117040"/>
<reference key="NSHScroller" ref="268459162"/>
@@ -263,7 +263,7 @@
<string key="NSFrameSize">{595, 126}</string>
<reference key="NSSuperview" ref="452103105"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="529274724"/>
+ <reference key="NSNextKeyView" ref="608471247"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -273,10 +273,10 @@
<string key="NSFrameSize">{595, 17}</string>
<reference key="NSSuperview" ref="529274724"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="426295635"/>
+ <reference key="NSNextKeyView" ref="452103105"/>
<reference key="NSTableView" ref="294998714"/>
</object>
More information about the commits
mailing list