adium 5177:ea2b8d8d9705: Merged adium-1.6 into default.
commits at adium.im
commits at adium.im
Mon Oct 22 19:24:48 UTC 2012
details: http://hg.adium.im/adium/rev/ea2b8d8d9705
revision: 5177:ea2b8d8d9705
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Mon Oct 22 21:23:49 2012 +0200
Merged adium-1.6 into default.
Worst. Merge. Ever.
diffs (truncated from 146209 to 1000 lines):
diff -r 9e7898a83fbd -r ea2b8d8d9705 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Wed Oct 17 22:15:57 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj Mon Oct 22 21:23:49 2012 +0200
@@ -606,7 +606,7 @@
34C91BBB0CA8909700740974 /* AIContentNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C91BB90CA8909700740974 /* AIContentNotification.h */; settings = {ATTRIBUTES = (Public, ); }; };
34C91BBC0CA8909700740974 /* AIContentNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C91BBA0CA8909700740974 /* AIContentNotification.m */; };
34CA15530CAFDFB2009AA5E3 /* sidebarActionWidget.png in Resources */ = {isa = PBXBuildFile; fileRef = 34CA15520CAFDFB2009AA5E3 /* sidebarActionWidget.png */; };
- 34CA22300A671BEF00B11032 /* PersonalPreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34CA222F0A671BEF00B11032 /* PersonalPreferences.xib */; };
+ 34CA22300A671BEF00B11032 /* ProfilePreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34CA222F0A671BEF00B11032 /* ProfilePreferences.xib */; };
34CAA3FB0BD3998E00AE92DC /* ESPurpleAIMAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 343EB41C08086D9100E27095 /* ESPurpleAIMAccountView.xib */; };
34CF9DF5085B8B7900D87E37 /* ESiTunesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34CF9DF3085B8B7900D87E37 /* ESiTunesPlugin.m */; };
34D073CA0B1E1A4400D63DF2 /* ESPurpleDotMacAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B387EB807199FE5004DE713 /* ESPurpleDotMacAccountViewController.m */; };
@@ -622,11 +622,9 @@
34D073D60B1E1A5000D63DF2 /* PurpleDefaultsMac.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B76472E07A07A340021CCD7 /* PurpleDefaultsMac.plist */; };
34D073D70B1E1A5000D63DF2 /* PurpleDefaultsAIM.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4B7635A507A0581D0021CCD7 /* PurpleDefaultsAIM.plist */; };
34D0F9CB0954E70100DCB678 /* AIContactListImagePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0F9C90954E70100DCB678 /* AIContactListImagePicker.m */; };
- 34D0FDD20956186200DCB678 /* ESPersonalPreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD00956186200DCB678 /* ESPersonalPreferencesPlugin.m */; };
- 34D0FDD80956187700DCB678 /* ESPersonalPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD60956187700DCB678 /* ESPersonalPreferences.m */; };
- 34D0FF8509569FE500DCB678 /* PersonalPreferencesDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D0FF8409569FE500DCB678 /* PersonalPreferencesDefaults.plist */; };
- 34D7F1EA15F85DD300F32F9B /* ChatCyclingDefaults-Old.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */; };
- 34D7F1EB15F85DD300F32F9B /* ChatCyclingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */; };
+ 34D0FDD20956186200DCB678 /* ESProfilePreferencesPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD00956186200DCB678 /* ESProfilePreferencesPlugin.m */; };
+ 34D0FDD80956187700DCB678 /* ESProfilePreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D0FDD60956187700DCB678 /* ESProfilePreferences.m */; };
+ 34D0FF8509569FE500DCB678 /* ProfilePreferencesDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D0FF8409569FE500DCB678 /* ProfilePreferencesDefaults.plist */; };
34D8153A13B663650022C8C4 /* AIFacebookXMPPAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153013B663650022C8C4 /* AIFacebookXMPPAccount.h */; };
34D8153B13B663650022C8C4 /* AIFacebookXMPPAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D8153113B663650022C8C4 /* AIFacebookXMPPAccount.m */; };
34D8153D13B663650022C8C4 /* AIFacebookXMPPAccountViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D8153313B663650022C8C4 /* AIFacebookXMPPAccountViewController.h */; };
@@ -1017,7 +1015,7 @@
4BD6753606001E0F0049CAF7 /* AIMessageTabViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BACB70203C8CB5E00A8010A /* AIMessageTabViewItem.m */; };
4BD6753806001E100049CAF7 /* AIMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F570A5CE03704D3D01A8010A /* AIMessageViewController.m */; };
4BD6753A06001E110049CAF7 /* AIMessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5793982033E756E01A8010A /* AIMessageWindowController.m */; };
- 4BD6753E06001E140049CAF7 /* AIAccountSelectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B25494703F6A32700A8010A /* AIAccountSelectionView.m */; };
+ 4BD6753E06001E140049CAF7 /* AITopBarGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B25494703F6A32700A8010A /* AITopBarGradientView.m */; };
4BD6755406001E1E0049CAF7 /* DualWindowDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D43504051ADC10003B2F21 /* DualWindowDefaults.plist */; };
4BD6756B06001E320049CAF7 /* EventSoundDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BA5325D050FC5E800A8010A /* EventSoundDefaults.plist */; };
4BD6758206001E430049CAF7 /* ErrorMessageHandlerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 40AC0EEC03B5BF1000A80202 /* ErrorMessageHandlerPlugin.m */; };
@@ -1355,6 +1353,7 @@
6EC1684D06C170A000F9FAD3 /* DCInviteToChatPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684806C170A000F9FAD3 /* DCInviteToChatPlugin.m */; };
6EC1684F06C170A000F9FAD3 /* DCInviteToChatWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EC1684A06C170A000F9FAD3 /* DCInviteToChatWindowController.m */; };
6EC1685006C170A000F9FAD3 /* InviteToChatWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6EC1684B06C170A000F9FAD3 /* InviteToChatWindow.xib */; };
+ 765F5DC51635934400C57904 /* AIRejoinGroupChatTopBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */; };
7664EAA5162E086A008CF995 /* libffi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 7664EAA4162E086A008CF995 /* libffi.framework */; };
766ABAB61306D1020049FFB7 /* AIUnreadMessagesTooltip.m in Sources */ = {isa = PBXBuildFile; fileRef = 766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */; };
@@ -1362,8 +1361,14 @@
76731DE315F90538007728C3 /* libgpgerror.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE115F90538007728C3 /* libgpgerror.framework */; };
76731DE415F9057F007728C3 /* libgcrypt.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 76731DE015F90538007728C3 /* libgcrypt.framework */; };
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 /* Personal.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 76889DEE12D3CA40007AEF00 /* Personal.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 */; };
+ 76AA110D1635585E00A6EC4B /* AIAccountSelectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76AA110B1635585E00A6EC4B /* AIAccountSelectionViewController.m */; };
+ 76AA1110163558B200A6EC4B /* AIRejoinGroupChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 76AA110F163558B200A6EC4B /* AIRejoinGroupChatViewController.m */; };
76B73B2114BE287D00A58BAB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76B73B2014BE287D00A58BAB /* Foundation.framework */; };
76B73B3014BE29AB00A58BAB /* im.adium.AIApplescriptRunner.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = 76B73B1E14BE287D00A58BAB /* im.adium.AIApplescriptRunner.xpc */; };
76B73B3414BE3B9400A58BAB /* AIApplescriptRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 76B73B3314BE3B9400A58BAB /* AIApplescriptRunner.m */; };
@@ -2173,7 +2178,7 @@
341EC8BE0D3C2BA9007216A2 /* sl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sl; path = "Frameworks/Adium Framework/Resources/sl.lproj/Localizable.strings"; sourceTree = "<group>"; };
341EC8BF0D3C2BA9007216A2 /* sl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sl; path = Resources/sl.lproj/Localizable.strings; sourceTree = "<group>"; };
341EC8C20D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sl; path = Resources/sl.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
- 341EC8C30D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sl; path = Resources/sl.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 341EC8C30D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sl; path = Resources/sl.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
341EC8C40D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sl; path = Resources/sl.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
341EC8C50D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; lastKnownFileType = folder; name = sl; path = "Resources/sl.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
341EC8C60D3C2BAA007216A2 /* sl */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sl; path = Resources/sl.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -2206,7 +2211,7 @@
34208D160D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr_CA; path = "Frameworks/Adium Framework/Resources/fr_CA.lproj/Localizable.strings"; sourceTree = "<group>"; };
34208D180D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr_CA; path = Resources/fr_CA.lproj/Localizable.strings; sourceTree = "<group>"; };
34208D1B0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fr_CA; path = Resources/fr_CA.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
- 34208D1C0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fr_CA; path = Resources/fr_CA.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 34208D1C0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr_CA; path = Resources/fr_CA.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
34208D1D0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fr_CA; path = Resources/fr_CA.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
34208D1E0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fr_CA; path = "Resources/fr_CA.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
34208D1F0D502D40003138D1 /* fr_CA */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr_CA; path = Resources/fr_CA.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -2331,7 +2336,7 @@
342F9E550B552628000D5FC2 /* fi */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fi; path = Resources/fi.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
342F9E560B552628000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fi; path = "Resources/fi.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
342F9E580B552628000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fi; path = Resources/fi.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
- 342F9E590B552628000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fi; path = Resources/fi.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 342F9E590B552628000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fi; path = Resources/fi.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
342F9E5A0B552629000D5FC2 /* fi */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fi; path = Resources/fi.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
342F9E5E0B55262A000D5FC2 /* fi */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fi; path = Resources/fi.lproj/Localizable.strings; sourceTree = "<group>"; };
342F9E600B55262B000D5FC2 /* fi */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fi; path = "Plugins/Purple Service/Resources/fi.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -2517,7 +2522,7 @@
345076AF0E106F5E00BF0883 /* en_GB */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en_GB; path = "Plugins/Purple Service/Resources/en_GB.lproj/Localizable.strings"; sourceTree = "<group>"; };
345076B00E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en_GB; path = Resources/en_GB.lproj/Localizable.strings; sourceTree = "<group>"; };
345076B30E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en_GB; path = Resources/en_GB.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
- 345076B40E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en_GB; path = Resources/en_GB.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 345076B40E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en_GB; path = Resources/en_GB.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
345076B50E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en_GB; path = Resources/en_GB.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
345076B60E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; lastKnownFileType = folder; name = en_GB; path = "Resources/en_GB.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
345076B70E106F5F00BF0883 /* en_GB */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en_GB; path = Resources/en_GB.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -2549,7 +2554,7 @@
345076ED0E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_PT; path = "Plugins/Purple Service/Resources/pt_PT.lproj/Localizable.strings"; sourceTree = "<group>"; };
345076EE0E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_PT; path = Resources/pt_PT.lproj/Localizable.strings; sourceTree = "<group>"; };
345076F10E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pt_PT; path = Resources/pt_PT.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
- 345076F20E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pt_PT; path = Resources/pt_PT.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 345076F20E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt_PT; path = Resources/pt_PT.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
345076F30E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pt_PT; path = Resources/pt_PT.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
345076F40E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; lastKnownFileType = folder; name = pt_PT; path = "Resources/pt_PT.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
345076F50E106FD600BF0883 /* pt_PT */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = pt_PT; path = Resources/pt_PT.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -2714,7 +2719,7 @@
3461621206FB482C009181D8 /* ESChatUserListController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESChatUserListController.m; path = "Plugins/Dual Window Interface/ESChatUserListController.m"; sourceTree = "<group>"; };
3461621306FB482D009181D8 /* UserList Layout.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; name = "UserList Layout.plist"; path = "Plugins/Dual Window Interface/UserList Layout.plist"; sourceTree = "<group>"; };
346196F10D31607500763051 /* SRSnapback.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SRSnapback.png; path = Resources/SRSnapback.png; sourceTree = "<group>"; };
- 34636E4C0BC9A90600AD57AD /* pt */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pt; path = Resources/pt.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 34636E4C0BC9A90600AD57AD /* pt */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pt; path = Resources/pt.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
346371050BCA0A5400AD57AD /* AIMessageTabSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMessageTabSplitView.h; path = Source/AIMessageTabSplitView.h; sourceTree = "<group>"; };
346371060BCA0A5400AD57AD /* AIMessageTabSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMessageTabSplitView.m; path = Source/AIMessageTabSplitView.m; sourceTree = "<group>"; };
3465228E08371921009565FE /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = zh_CN; path = "Plugins/Purple Service/Resources/zh_CN.lproj/ESPurpleAIMAccountView.xib"; sourceTree = "<group>"; };
@@ -2804,9 +2809,9 @@
346545CA0C8F73000046ED68 /* AMPurpleJabberAdHocPing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AMPurpleJabberAdHocPing.m; path = "Plugins/Purple Service/AMPurpleJabberAdHocPing.m"; sourceTree = "<group>"; };
346935D30BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIFileTransferProgressOutlineView.h; path = Source/AIFileTransferProgressOutlineView.h; sourceTree = "<group>"; };
346935D40BA6C89D00E1CF7E /* AIFileTransferProgressOutlineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIFileTransferProgressOutlineView.m; path = Source/AIFileTransferProgressOutlineView.m; sourceTree = "<group>"; };
- 34695FA20A89BA2B00E3B0D0 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = zh_TW; path = Resources/zh_TW.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34695FA30A89BA3600E3B0D0 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = zh_CN; path = Resources/zh_CN.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34695FA40A89BA5800E3B0D0 /* tr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = tr; path = Resources/tr.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 34695FA20A89BA2B00E3B0D0 /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_TW; path = Resources/zh_TW.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34695FA30A89BA3600E3B0D0 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = Resources/zh_CN.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34695FA40A89BA5800E3B0D0 /* tr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = tr; path = Resources/tr.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
346BA33C0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESGlobalEventsPreferencesPlugin.h; path = Source/ESGlobalEventsPreferencesPlugin.h; sourceTree = "<group>"; };
346BA33D0774C27400628F06 /* ESGlobalEventsPreferencesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESGlobalEventsPreferencesPlugin.m; path = Source/ESGlobalEventsPreferencesPlugin.m; sourceTree = "<group>"; };
346BA3420774C2D200628F06 /* ESGlobalEventsPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESGlobalEventsPreferences.h; path = Source/ESGlobalEventsPreferences.h; sourceTree = "<group>"; };
@@ -2842,7 +2847,7 @@
346C9C130E70E1F7002314EE /* hu */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = hu; path = Resources/hu.lproj/Localizable.strings; sourceTree = "<group>"; };
346C9C150E70E1F7002314EE /* hu */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = hu; path = "Plugins/Purple Service/Resources/hu.lproj/Localizable.strings"; sourceTree = "<group>"; };
346C9C180E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = hu; path = Resources/hu.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
- 346C9C190E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = hu; path = Resources/hu.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 346C9C190E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hu; path = Resources/hu.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
346C9C1A0E70E1F7002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = hu; path = Resources/hu.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
346C9C1B0E70E1F8002314EE /* hu */ = {isa = PBXFileReference; lastKnownFileType = folder; name = hu; path = "Resources/hu.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
346C9C1C0E70E1F8002314EE /* hu */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = hu; path = Resources/hu.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -3203,7 +3208,7 @@
34B1FCDE0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = el_GR; path = "Plugins/Purple Service/Resources/el_GR.lproj/Localizable.strings"; sourceTree = "<group>"; };
34B1FCDF0F112BF600C7E952 /* el_GR */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = el_GR; path = Resources/el_GR.lproj/Localizable.strings; sourceTree = "<group>"; };
34B1FCE20F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = el_GR; path = Resources/el_GR.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
- 34B1FCE30F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = el_GR; path = Resources/el_GR.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 34B1FCE30F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = el_GR; path = Resources/el_GR.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
34B1FCE40F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = el_GR; path = Resources/el_GR.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
34B1FCE50F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = folder; name = el_GR; path = "Resources/el_GR.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
34B1FCE60F112BF700C7E952 /* el_GR */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = el_GR; path = Resources/el_GR.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -3358,19 +3363,19 @@
34C91BBA0CA8909700740974 /* AIContentNotification.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIContentNotification.m; path = "Frameworks/Adium Framework/Source/AIContentNotification.m"; sourceTree = "<group>"; };
34C9EC40099FA2A8007ECAB3 /* DefaultBlockedStatusIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DefaultBlockedStatusIcon.png; path = "Frameworks/Adium Framework/DefaultBlockedStatusIcon.png"; sourceTree = "<group>"; };
34CA15520CAFDFB2009AA5E3 /* sidebarActionWidget.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = sidebarActionWidget.png; path = Resources/sidebarActionWidget.png; sourceTree = "<group>"; };
- 34CA23990A671E0E00B11032 /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ca; path = Resources/ca.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34CA239A0A671E1500B11032 /* cs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = cs; path = Resources/cs.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34CA239B0A671E2100B11032 /* da */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = da; path = Resources/da.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34CA239C0A671E2F00B11032 /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = nl; path = Resources/nl.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34CA239D0A671E3C00B11032 /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fr; path = Resources/fr.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34CA239E0A671E4500B11032 /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = de; path = Resources/de.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34CA239F0A671E5000B11032 /* is */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = is; path = Resources/is.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34CA23A00A671E6400B11032 /* it */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = it; path = Resources/it.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34CA23A10A671E7200B11032 /* ja */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ja; path = Resources/ja.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34CA23A20A671E8500B11032 /* nb */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = nb; path = Resources/nb.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34CA23A30A671E9000B11032 /* ru */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ru; path = Resources/ru.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34CA23A40A671E9B00B11032 /* sv */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sv; path = Resources/sv.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34CA23A50A6723A200B11032 /* pl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = pl; path = Resources/pl.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 34CA23990A671E0E00B11032 /* ca */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ca; path = Resources/ca.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34CA239A0A671E1500B11032 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = Resources/cs.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34CA239B0A671E2100B11032 /* da */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = da; path = Resources/da.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34CA239C0A671E2F00B11032 /* nl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nl; path = Resources/nl.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34CA239D0A671E3C00B11032 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = Resources/fr.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34CA239E0A671E4500B11032 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = Resources/de.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34CA239F0A671E5000B11032 /* is */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = is; path = Resources/is.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34CA23A00A671E6400B11032 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = Resources/it.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34CA23A10A671E7200B11032 /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = Resources/ja.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34CA23A20A671E8500B11032 /* nb */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nb; path = Resources/nb.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34CA23A30A671E9000B11032 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = Resources/ru.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34CA23A40A671E9B00B11032 /* sv */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sv; path = Resources/sv.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34CA23A50A6723A200B11032 /* pl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = pl; path = Resources/pl.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
34CAA4B00BD3A75B00AE92DC /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = fr; path = "Plugins/Purple Service/Resources/fr.lproj/ESPurpleSimpleAccountView.xib"; sourceTree = "<group>"; };
34CAA4B40BD3A76C00AE92DC /* ca */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = ca; path = "Plugins/Purple Service/Resources/ca.lproj/ESPurpleSimpleAccountView.xib"; sourceTree = "<group>"; };
34CAA4B50BD3A76E00AE92DC /* cs */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = cs; path = "Plugins/Purple Service/Resources/cs.lproj/ESPurpleSimpleAccountView.xib"; sourceTree = "<group>"; };
@@ -3393,12 +3398,12 @@
34CF9DF3085B8B7900D87E37 /* ESiTunesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESiTunesPlugin.m; path = Source/ESiTunesPlugin.m; sourceTree = "<group>"; };
34D0F9C80954E70100DCB678 /* AIContactListImagePicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIContactListImagePicker.h; path = Source/AIContactListImagePicker.h; sourceTree = "<group>"; };
34D0F9C90954E70100DCB678 /* AIContactListImagePicker.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIContactListImagePicker.m; path = Source/AIContactListImagePicker.m; sourceTree = "<group>"; };
- 34D0FDCF0956186200DCB678 /* ESPersonalPreferencesPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESPersonalPreferencesPlugin.h; path = Source/ESPersonalPreferencesPlugin.h; sourceTree = "<group>"; };
- 34D0FDD00956186200DCB678 /* ESPersonalPreferencesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESPersonalPreferencesPlugin.m; path = Source/ESPersonalPreferencesPlugin.m; sourceTree = "<group>"; };
- 34D0FDD50956187700DCB678 /* ESPersonalPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESPersonalPreferences.h; path = Source/ESPersonalPreferences.h; sourceTree = "<group>"; };
- 34D0FDD60956187700DCB678 /* ESPersonalPreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESPersonalPreferences.m; path = Source/ESPersonalPreferences.m; sourceTree = "<group>"; };
- 34D0FE3C09561E3800DCB678 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en; path = Resources/en.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
- 34D0FF8409569FE500DCB678 /* PersonalPreferencesDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = PersonalPreferencesDefaults.plist; path = Resources/PersonalPreferencesDefaults.plist; sourceTree = "<group>"; };
+ 34D0FDCF0956186200DCB678 /* ESProfilePreferencesPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESProfilePreferencesPlugin.h; path = Source/ESProfilePreferencesPlugin.h; sourceTree = "<group>"; };
+ 34D0FDD00956186200DCB678 /* ESProfilePreferencesPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESProfilePreferencesPlugin.m; path = Source/ESProfilePreferencesPlugin.m; sourceTree = "<group>"; };
+ 34D0FDD50956187700DCB678 /* ESProfilePreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESProfilePreferences.h; path = Source/ESProfilePreferences.h; sourceTree = "<group>"; };
+ 34D0FDD60956187700DCB678 /* ESProfilePreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESProfilePreferences.m; path = Source/ESProfilePreferences.m; sourceTree = "<group>"; };
+ 34D0FE3C09561E3800DCB678 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = Resources/en.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
+ 34D0FF8409569FE500DCB678 /* ProfilePreferencesDefaults.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = ProfilePreferencesDefaults.plist; path = Resources/ProfilePreferencesDefaults.plist; sourceTree = "<group>"; };
34D188DB0760F0F50075A380 /* AILocalizationControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AILocalizationControl.m; path = "Frameworks/Adium Framework/Source/AILocalizationControl.m"; sourceTree = "<group>"; };
34D1897D076114C00075A380 /* AILocalizationButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AILocalizationButton.h; path = "Frameworks/Adium Framework/Source/AILocalizationButton.h"; sourceTree = "<group>"; };
34D1897E076114C00075A380 /* AILocalizationButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AILocalizationButton.m; path = "Frameworks/Adium Framework/Source/AILocalizationButton.m"; sourceTree = "<group>"; };
@@ -3689,8 +3694,8 @@
4B191D890611C10800E8A4E7 /* ReadMe.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = ReadMe.rtf; sourceTree = "<group>"; };
4B22E15C085CAE2E001864DE /* AIAbstractListObjectMenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIAbstractListObjectMenu.h; path = "Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.h"; sourceTree = "<group>"; };
4B22E15D085CAE2F001864DE /* AIAbstractListObjectMenu.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIAbstractListObjectMenu.m; path = "Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.m"; sourceTree = "<group>"; };
- 4B25494603F6A32700A8010A /* AIAccountSelectionView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIAccountSelectionView.h; path = "Plugins/Dual Window Interface/AIAccountSelectionView.h"; sourceTree = "<group>"; };
- 4B25494703F6A32700A8010A /* AIAccountSelectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAccountSelectionView.m; path = "Plugins/Dual Window Interface/AIAccountSelectionView.m"; sourceTree = "<group>"; };
+ 4B25494603F6A32700A8010A /* AITopBarGradientView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AITopBarGradientView.h; path = "Plugins/Dual Window Interface/AITopBarGradientView.h"; sourceTree = "<group>"; };
+ 4B25494703F6A32700A8010A /* AITopBarGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITopBarGradientView.m; path = "Plugins/Dual Window Interface/AITopBarGradientView.m"; sourceTree = "<group>"; };
4B28DDAB0599FED200343093 /* AIAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIAccountViewController.h; path = "Frameworks/Adium Framework/Source/AIAccountViewController.h"; sourceTree = "<group>"; };
4B28DDAC0599FED200343093 /* AIAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIAccountViewController.m; path = "Frameworks/Adium Framework/Source/AIAccountViewController.m"; sourceTree = "<group>"; };
4B292D3007A9C8E100C5F882 /* AIStatusController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIStatusController.h; path = Source/AIStatusController.h; sourceTree = "<group>"; };
@@ -3944,7 +3949,7 @@
5A7642C411E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = "Frameworks/Adium Framework/Resources/sk_SK.lproj/Localizable.strings"; sourceTree = "<group>"; };
5A7642C511E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = "Plugins/Purple Service/Resources/sk_SK.lproj/Localizable.strings"; sourceTree = "<group>"; };
5A7642C811E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sk_SK; path = Resources/sk_SK.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
- 5A7642C911E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sk_SK; path = Resources/sk_SK.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 5A7642C911E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sk_SK; path = Resources/sk_SK.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
5A7642CA11E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = sk_SK; path = Resources/sk_SK.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
5A7642CB11E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; lastKnownFileType = folder; name = sk_SK; path = "Resources/sk_SK.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
5A7642CC11E044BA00E5E0AF /* sk_SK */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = sk_SK; path = Resources/sk_SK.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -3985,7 +3990,7 @@
5A80CCA2121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = "Plugins/Purple Service/Resources/uk.lproj/Localizable.strings"; sourceTree = "<group>"; };
5A80CCA3121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
5A80CCA6121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = uk; path = Resources/uk.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
- 5A80CCA7121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = uk; path = Resources/uk.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 5A80CCA7121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = Resources/uk.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
5A80CCA8121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = uk; path = Resources/uk.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
5A80CCA9121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; lastKnownFileType = folder; name = uk; path = "Resources/uk.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
5A80CCAA121F5A7B00D0670A /* uk */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = uk; path = Resources/uk.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -4339,7 +4344,7 @@
63EA6407094BB9A9009C8453 /* AIStatusIconPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIStatusIconPreviewController.m; path = Source/AIStatusIconPreviewController.m; sourceTree = "<group>"; };
661561630D84AEEC004B7946 /* AIContactHidingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIContactHidingController.h; path = "Frameworks/Adium Framework/Source/AIContactHidingController.h"; sourceTree = "<group>"; };
661561640D84AEEC004B7946 /* AIContactHidingController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIContactHidingController.m; path = "Frameworks/Adium Framework/Source/AIContactHidingController.m"; sourceTree = "<group>"; };
- 6CE795BD0A6F9CEE00FF3217 /* es */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = es; path = Resources/es.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ 6CE795BD0A6F9CEE00FF3217 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = Resources/es.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
6CF42677057763E100F27FAA /* ESContactAlertsController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESContactAlertsController.h; path = Source/ESContactAlertsController.h; sourceTree = "<group>"; };
6CF42678057763E200F27FAA /* ESContactAlertsController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESContactAlertsController.m; path = Source/ESContactAlertsController.m; sourceTree = "<group>"; };
6E4D960606B73979005235E9 /* DCJoinChatViewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DCJoinChatViewController.h; path = "Frameworks/Adium Framework/Source/DCJoinChatViewController.h"; sourceTree = "<group>"; };
@@ -4390,13 +4395,23 @@
6FB330A20C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvIncomingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvIncomingFileTransfer.m; sourceTree = SOURCE_ROOT; };
6FB330A30C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = EKEzvOutgoingFileTransfer.h; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.h; sourceTree = SOURCE_ROOT; };
6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = EKEzvOutgoingFileTransfer.m; path = Plugins/Bonjour/libezv/Classes/EKEzvOutgoingFileTransfer.m; sourceTree = SOURCE_ROOT; };
+ 765F5DC61635934400C57904 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/AIRejoinGroupChatTopBar.xib; sourceTree = "<group>"; };
7664EAA4162E086A008CF995 /* libffi.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libffi.framework; path = Frameworks/libffi.framework; sourceTree = "<group>"; };
766ABAB41306D1020049FFB7 /* AIUnreadMessagesTooltip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIUnreadMessagesTooltip.h; path = Source/AIUnreadMessagesTooltip.h; sourceTree = "<group>"; };
766ABAB51306D1020049FFB7 /* AIUnreadMessagesTooltip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIUnreadMessagesTooltip.m; path = Source/AIUnreadMessagesTooltip.m; sourceTree = "<group>"; };
76731DE015F90538007728C3 /* libgcrypt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgcrypt.framework; path = Frameworks/libgcrypt.framework; sourceTree = "<group>"; };
76731DE115F90538007728C3 /* libgpgerror.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libgpgerror.framework; path = Frameworks/libgpgerror.framework; sourceTree = "<group>"; };
+ 767870E21634045C00BD0E4D /* AIMessageViewTopBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIMessageViewTopBarController.h; path = Source/AIMessageViewTopBarController.h; sourceTree = "<group>"; };
+ 767870E31634045C00BD0E4D /* AIMessageViewTopBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIMessageViewTopBarController.m; path = Source/AIMessageViewTopBarController.m; sourceTree = "<group>"; };
76889DEA12D3CA17007AEF00 /* get-info.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "get-info.tiff"; path = "Resources/get-info.tiff"; sourceTree = "<group>"; };
- 76889DEE12D3CA40007AEF00 /* Personal.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Personal.tiff; path = Resources/Personal.tiff; sourceTree = "<group>"; };
+ 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>"; };
+ 76AA110A1635585E00A6EC4B /* AIAccountSelectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAccountSelectionViewController.h; path = "Plugins/Dual Window Interface/AIAccountSelectionViewController.h"; sourceTree = "<group>"; };
+ 76AA110B1635585E00A6EC4B /* AIAccountSelectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAccountSelectionViewController.m; path = "Plugins/Dual Window Interface/AIAccountSelectionViewController.m"; sourceTree = "<group>"; };
+ 76AA110E163558B200A6EC4B /* AIRejoinGroupChatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIRejoinGroupChatViewController.h; path = "Plugins/Dual Window Interface/AIRejoinGroupChatViewController.h"; sourceTree = "<group>"; };
+ 76AA110F163558B200A6EC4B /* AIRejoinGroupChatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIRejoinGroupChatViewController.m; path = "Plugins/Dual Window Interface/AIRejoinGroupChatViewController.m"; sourceTree = "<group>"; };
76B73B1E14BE287D00A58BAB /* im.adium.AIApplescriptRunner.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = im.adium.AIApplescriptRunner.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
76B73B2014BE287D00A58BAB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
76B73B3314BE3B9400A58BAB /* AIApplescriptRunner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIApplescriptRunner.m; path = Source/AIApplescriptRunner.m; sourceTree = SOURCE_ROOT; };
@@ -4599,7 +4614,7 @@
D1C1FA4414995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_AU; path = Resources/en_AU.lproj/Localizable.strings; sourceTree = "<group>"; };
D1C1FA4514995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_AU; path = "Frameworks/Adium Framework/Resources/en_AU.lproj/Localizable.strings"; sourceTree = "<group>"; };
D1C1FA4714995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en_AU; path = Resources/en_AU.lproj/PasswordPrompt.xib; sourceTree = "<group>"; };
- D1C1FA4814995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en_AU; path = Resources/en_AU.lproj/PersonalPreferences.xib; sourceTree = "<group>"; };
+ D1C1FA4814995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en_AU; path = Resources/en_AU.lproj/ProfilePreferences.xib; sourceTree = "<group>"; };
D1C1FA4914995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xib; name = en_AU; path = Resources/en_AU.lproj/ProxyPasswordPrompt.xib; sourceTree = "<group>"; };
D1C1FA4A14995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = folder; name = en_AU; path = "Resources/en_AU.lproj/Shared Dock Icon Images"; sourceTree = "<group>"; };
D1C1FA4B14995D98008C94EB /* en_AU */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en_AU; path = Resources/en_AU.lproj/ShortcutRecorder.strings; sourceTree = "<group>"; };
@@ -6191,17 +6206,17 @@
name = "iTunes Now Playing";
sourceTree = "<group>";
};
- 34D0FDCB095612F800DCB678 /* Personal Preferences */ = {
- isa = PBXGroup;
- children = (
- 34D0FDCF0956186200DCB678 /* ESPersonalPreferencesPlugin.h */,
- 34D0FDD00956186200DCB678 /* ESPersonalPreferencesPlugin.m */,
- 34D0FDD50956187700DCB678 /* ESPersonalPreferences.h */,
- 34D0FDD60956187700DCB678 /* ESPersonalPreferences.m */,
- 34D0FF8409569FE500DCB678 /* PersonalPreferencesDefaults.plist */,
- 34CA222F0A671BEF00B11032 /* PersonalPreferences.xib */,
- );
- name = "Personal Preferences";
+ 34D0FDCB095612F800DCB678 /* Profile Preferences */ = {
+ isa = PBXGroup;
+ children = (
+ 34D0FDCF0956186200DCB678 /* ESProfilePreferencesPlugin.h */,
+ 34D0FDD00956186200DCB678 /* ESProfilePreferencesPlugin.m */,
+ 34D0FDD50956187700DCB678 /* ESProfilePreferences.h */,
+ 34D0FDD60956187700DCB678 /* ESProfilePreferences.m */,
+ 34D0FF8409569FE500DCB678 /* ProfilePreferencesDefaults.plist */,
+ 34CA222F0A671BEF00B11032 /* ProfilePreferences.xib */,
+ );
+ name = "Profile Preferences";
sourceTree = "<group>";
};
34D18983076114D20075A380 /* Localization Assistance */ = {
@@ -6363,7 +6378,7 @@
F510B76D03339ED501A8010A /* Account Menu */,
34C188A006CAB36400FF5FF9 /* Account Network Connectivity */,
4B1332140459B9A000A8010A /* Dock Account Status */,
- 34D0FDCB095612F800DCB678 /* Personal Preferences */,
+ 34D0FDCB095612F800DCB678 /* Profile Preferences */,
);
name = Accounts;
sourceTree = "<group>";
@@ -7062,8 +7077,14 @@
4BCFEC5803F5718700A8010A /* Other */ = {
isa = PBXGroup;
children = (
- 4B25494603F6A32700A8010A /* AIAccountSelectionView.h */,
- 4B25494703F6A32700A8010A /* AIAccountSelectionView.m */,
+ 4B25494603F6A32700A8010A /* AITopBarGradientView.h */,
+ 4B25494703F6A32700A8010A /* AITopBarGradientView.m */,
+ 76AA11091635585E00A6EC4B /* AIAccountSelectionTopBar.xib */,
+ 76AA110A1635585E00A6EC4B /* AIAccountSelectionViewController.h */,
+ 76AA110B1635585E00A6EC4B /* AIAccountSelectionViewController.m */,
+ 76AA110E163558B200A6EC4B /* AIRejoinGroupChatViewController.h */,
+ 76AA110F163558B200A6EC4B /* AIRejoinGroupChatViewController.m */,
+ 765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */,
);
name = Other;
sourceTree = "<group>";
@@ -8234,7 +8255,7 @@
34D8336707CBD807006466F2 /* pref-messages.tiff */,
4BB5B78107D2DC4900CFE06F /* pref-status.tiff */,
4BAE6C9407CF94C4007E2820 /* events-message.tiff */,
- 76889DEE12D3CA40007AEF00 /* Personal.tiff */,
+ 76889DEE12D3CA40007AEF00 /* Profile.tiff */,
34D832A507CBD62B006466F2 /* AdiumEmoticonset.icns */,
073475F00C4C9632009ACC43 /* AdiumMenuBarIcons.icns */,
34D832A607CBD62B006466F2 /* AdiumScripts.icns */,
@@ -8562,6 +8583,8 @@
63B0EC9A0F8FBB660062476B /* AIProxyListObject.m */,
34111A5D06BE1B370005AF5C /* ESObjectWithProperties.h */,
34111A5E06BE1B370005AF5C /* ESObjectWithProperties.m */,
+ 76A79E0916349477007A0497 /* AIGroupChat.h */,
+ 76A79E0A16349477007A0497 /* AIGroupChat.m */,
);
name = "Contacts & Chats";
sourceTree = "<group>";
@@ -8668,6 +8691,8 @@
348C47150D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.h */,
348C47160D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m */,
5A1FEA601334549300C14951 /* MessageView.xib */,
+ 767870E21634045C00BD0E4D /* AIMessageViewTopBarController.h */,
+ 767870E31634045C00BD0E4D /* AIMessageViewTopBarController.m */,
);
name = Messages;
sourceTree = "<group>";
@@ -9055,6 +9080,7 @@
112B47670F82E0FC00690E84 /* AIXtraInfo.h in Headers */,
34F17FCE0F8EAC34009C5A39 /* AIListOutlineView+Drawing.h in Headers */,
63B0EC9D0F8FBB660062476B /* AIProxyListObject.h in Headers */,
+ 76A79E0B16349477007A0497 /* AIGroupChat.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9314,7 +9340,9 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
- LastUpgradeCheck = 0440;
+ CLASSPREFIX = AI;
+ LastUpgradeCheck = 0450;
+ ORGANIZATIONNAME = "The Adium Team";
};
buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
compatibilityVersion = "Xcode 3.2";
@@ -9618,8 +9646,8 @@
07632BF30949E10B00FFABD8 /* ListThemeSheet.xib in Resources */,
63336E15094AB81300970871 /* XtraInfoView.xib in Resources */,
63EA63DD094BB79A009C8453 /* StatusIconPreviewView.xib in Resources */,
- 34CA22300A671BEF00B11032 /* PersonalPreferences.xib in Resources */,
- 34D0FF8509569FE500DCB678 /* PersonalPreferencesDefaults.plist in Resources */,
+ 34CA22300A671BEF00B11032 /* ProfilePreferences.xib in Resources */,
+ 34D0FF8509569FE500DCB678 /* ProfilePreferencesDefaults.plist in Resources */,
341BD5700965EC3500CF83F5 /* OTRFingerprintDetailsWindow.xib in Resources */,
341BD5710965EC3500CF83F5 /* OTRPrivateKeyGenerationWindow.xib in Resources */,
349710DD096C4C7700699948 /* Buttons.strings in Resources */,
@@ -9700,7 +9728,7 @@
D10A3A2B122C61EF003B5A7E /* msg-source-destination.tiff in Resources */,
34333FF3127F6E77007050E8 /* TemporaryIRCAccountWindow.xib in Resources */,
76889DEB12D3CA17007AEF00 /* get-info.tiff in Resources */,
- 76889DEF12D3CA40007AEF00 /* Personal.tiff in Resources */,
+ 76889DEF12D3CA40007AEF00 /* Profile.tiff in Resources */,
1154F50A12E1476900B8CA27 /* AILogByAccountWindow.xib in Resources */,
97AF5CF413191E9A00550C41 /* ContactListChangeUserPictureMenu.xib in Resources */,
9722ABC813257D7F00CAB486 /* ContactListWindow.xib in Resources */,
@@ -9776,9 +9804,9 @@
C6B545A815D338EE0005F1F8 /* SoundFileIcon at 2x.png in Resources */,
C6B545AA15D3390F0005F1F8 /* ABSearch at 2x.png in Resources */,
C61AFA9A15DD43C80001EDEF /* AboutDialog_bg at 2x.png in Resources */,
- 34D7F1EA15F85DD300F32F9B /* ChatCyclingDefaults-Old.plist in Resources */,
- 34D7F1EB15F85DD300F32F9B /* ChatCyclingDefaults.plist in Resources */,
C6BC7F9B15DD666600C5FF52 /* events-notification.tiff in Resources */,
+ 76AA110C1635585E00A6EC4B /* AIAccountSelectionTopBar.xib in Resources */,
+ 765F5DC51635934400C57904 /* AIRejoinGroupChatTopBar.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -10141,7 +10169,7 @@
4BD6753606001E0F0049CAF7 /* AIMessageTabViewItem.m in Sources */,
4BD6753806001E100049CAF7 /* AIMessageViewController.m in Sources */,
4BD6753A06001E110049CAF7 /* AIMessageWindowController.m in Sources */,
- 4BD6753E06001E140049CAF7 /* AIAccountSelectionView.m in Sources */,
+ 4BD6753E06001E140049CAF7 /* AITopBarGradientView.m in Sources */,
4BD6758206001E430049CAF7 /* ErrorMessageHandlerPlugin.m in Sources */,
4BD6758406001E440049CAF7 /* ErrorMessageWindowController.m in Sources */,
4BAA1B550632EF0000D8B92C /* ESPanelAlertDetailPane.m in Sources */,
@@ -10251,8 +10279,8 @@
63EA62F0094B8705009C8453 /* AIXtraInfoController.m in Sources */,
63EA6409094BB9A9009C8453 /* AIStatusIconPreviewController.m in Sources */,
34D0F9CB0954E70100DCB678 /* AIContactListImagePicker.m in Sources */,
- 34D0FDD20956186200DCB678 /* ESPersonalPreferencesPlugin.m in Sources */,
- 34D0FDD80956187700DCB678 /* ESPersonalPreferences.m in Sources */,
+ 34D0FDD20956186200DCB678 /* ESProfilePreferencesPlugin.m in Sources */,
+ 34D0FDD80956187700DCB678 /* ESProfilePreferences.m in Sources */,
341BCF850961354D00CF83F5 /* AIMessageWindow.m in Sources */,
341BCF870961354D00CF83F5 /* AIClickThroughThemeDocumentButton.m in Sources */,
341BD55D0965E97F00CF83F5 /* ESOTRPreferences.m in Sources */,
@@ -10426,6 +10454,9 @@
5A4BD52513F8653D00A4D3F7 /* ESContactListAdvancedPreferences.m in Sources */,
5A4BD55413F86A6200A4D3F7 /* AIMessagePreferences.m in Sources */,
5A5EC831154649140043FFAA /* AIPreferenceCollectionItem.m in Sources */,
+ 767870E41634045D00BD0E4D /* AIMessageViewTopBarController.m in Sources */,
+ 76AA110D1635585E00A6EC4B /* AIAccountSelectionViewController.m in Sources */,
+ 76AA1110163558B200A6EC4B /* AIRejoinGroupChatViewController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -10534,6 +10565,7 @@
63B0EC9C0F8FBB660062476B /* AIProxyListObject.m in Sources */,
76FF926814B62AB80043E23B /* AIConsoleController.m in Sources */,
5AEE60011602BAE200304672 /* AIBoolToControlTextColorTransformer.m in Sources */,
+ 76A79E0C16349477007A0497 /* AIGroupChat.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -11975,7 +12007,7 @@
name = AIAdvancedInspectorPane.xib;
sourceTree = "<group>";
};
- 34CA222F0A671BEF00B11032 /* PersonalPreferences.xib */ = {
+ 34CA222F0A671BEF00B11032 /* ProfilePreferences.xib */ = {
isa = PBXVariantGroup;
children = (
34D0FE3C09561E3800DCB678 /* en */,
@@ -12008,7 +12040,7 @@
5A80CCA7121F5A7B00D0670A /* uk */,
D1C1FA4814995D98008C94EB /* en_AU */,
);
- name = PersonalPreferences.xib;
+ name = ProfilePreferences.xib;
sourceTree = "<group>";
};
34F144420BA8FF3B000473DE /* EmoticonNames.strings */ = {
@@ -12184,6 +12216,15 @@
name = Localizable.strings;
sourceTree = "<group>";
};
+ 765F5DC71635934400C57904 /* AIRejoinGroupChatTopBar.xib */ = {
+ isa = PBXVariantGroup;
+ children = (
+ 765F5DC61635934400C57904 /* en */,
+ );
+ name = AIRejoinGroupChatTopBar.xib;
+ path = "Plugins/Dual Window Interface";
+ sourceTree = "<group>";
+ };
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
@@ -12191,6 +12232,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2050FAFAA4700B310AC /* Unit tests.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12198,6 +12240,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2050FAFAA4700B310AC /* Unit tests.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12205,6 +12248,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2050FAFAA4700B310AC /* Unit tests.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12212,6 +12256,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12223,6 +12268,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12234,6 +12280,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12245,6 +12292,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1150FAFA35E00B310AC /* Touch Framework Bundles to Executable Date.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12252,6 +12300,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1150FAFA35E00B310AC /* Touch Framework Bundles to Executable Date.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12259,6 +12308,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1150FAFA35E00B310AC /* Touch Framework Bundles to Executable Date.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12266,6 +12316,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2030FAFAA4700B310AC /* AIUtilities.framework.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12273,6 +12324,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2030FAFAA4700B310AC /* AIUtilities.framework.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12280,6 +12332,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2030FAFAA4700B310AC /* AIUtilities.framework.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12287,6 +12340,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2080FAFAA4700B310AC /* Spotlight Importer.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12294,6 +12348,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2080FAFAA4700B310AC /* Spotlight Importer.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12301,6 +12356,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2080FAFAA4700B310AC /* Spotlight Importer.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12390,6 +12446,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2070FAFAA4700B310AC /* Adium.framework.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12397,6 +12454,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2070FAFAA4700B310AC /* Adium.framework.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12404,6 +12462,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2070FAFAA4700B310AC /* Adium.framework.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
@@ -12411,6 +12470,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2040FAFAA4700B310AC /* Adium.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12423,6 +12483,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2040FAFAA4700B310AC /* Adium.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12436,6 +12497,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2040FAFAA4700B310AC /* Adium.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/Frameworks\"",
@@ -12473,6 +12535,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1170FAFA35E00B310AC /* Setup Build Directory.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "Setup Build Directory";
};
name = Debug;
@@ -12481,6 +12544,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1170FAFA35E00B310AC /* Setup Build Directory.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "Setup Build Directory";
};
name = Release;
@@ -12489,6 +12553,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1170FAFA35E00B310AC /* Setup Build Directory.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = "Setup Build Directory";
};
name = "Release-Debug";
@@ -12497,6 +12562,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1160FAFA35E00B310AC /* Plist Macros.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Debug;
};
@@ -12504,6 +12570,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1160FAFA35E00B310AC /* Plist Macros.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = Release;
};
@@ -12511,6 +12578,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E1160FAFA35E00B310AC /* Plist Macros.xcconfig */;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
};
name = "Release-Debug";
};
diff -r 9e7898a83fbd -r ea2b8d8d9705 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Wed Oct 17 22:15:57 2012 +0200
+++ b/ChangeLogs/Changes.txt Mon Oct 22 21:23:49 2012 +0200
@@ -1,6 +1,36 @@
Adium Version History
-----------------------
-Version 1.5.4 (XX/XX/XXXX)
+Version 1.6 (X/X/X)
+ Major changes
+ * New preferences layout
+ * Added high-resolution resources for "Retina Display" support
+ * Updated to libpurple x.y.z.
+ * Added SASL authentication support. (#14478)
+
+ Plugins
+ * Added support for adding image upload services. (#15865) (Félix Cloutier)
+
+ Preferences
+ * Changed preferences layout to resemble OS X's System Preferences.
+ * Moved a bunch of preferences around for more consistency dissolving the "Advanced" preference pane and its sub-sections.
+ * Made Privacy Settings a preference pane.
+ * Made the Xtras Manager a preference pane.
+ * Renamed "Personal" preference pane to "Profile". (#16105) (Paul Wilde)
+ * Contact list: Added a preference for maximum contact list height. (#4815)
+ * General: Removed "Send Messages with:" option. (#15369)
+ * Accounts: Added a signup or about button to each account setup pane. (#3792) (Ariel Chinn)
+
+ Transcript Viewer
+ * Added full screen support. (##16120) (Paul Wilde)
+
+ * Changed the behaviour of the contact list menu item in the dock to always bring it to the front instead of toggling its visibility. (#4848) (Aaron Dodson)
+
+ * Changed hotkey behaviour to hide Adium when pressed while Adium is active. (#4859) (Rafael Glauber)
+
+(#13824) (#14081) (#15161) (#13330) (#14079)
+
+
+Version 1.5.4 (XX/XX/2012)
* Updated the included Growl SDK to 2.0, adding support for Notification Center on 10.8 if Growl is not installed. (#15867)
* Updated libotr to 3.2.1, fixing a security vulnerability. (#16122)
* Changed the default tab switching shortcuts for new users to Control-Tab/Control-Shift-Tab, to match Safari. (#16102)
@@ -9,6 +39,8 @@
* Fixed a problem where accepting a group chat invite on HipChat's XMPP server would crash Adium. (#16007)
* Fix a problem preventing Adium from executing Applescripts when Gatekeeper is enabled.
* Added routines to make Secure Transport (on 10.8 and above) work around buggy TLS implementations in certain older XMPP servers. (#16081)
+ * Added routines to make Secure Transport (on 10.8 and above) work around buggy TLS implementations in certain older XMPP servers. (#16081)
+ * Updated translations: British English, Dutch, Czech, Slovakian (#16194).
Version 1.5.3 (8/12/2012)
diff -r 9e7898a83fbd -r ea2b8d8d9705 Copyright.txt
--- a/Copyright.txt Wed Oct 17 22:15:57 2012 +0200
+++ b/Copyright.txt Mon Oct 22 21:23:49 2012 +0200
@@ -17,6 +17,7 @@
Wesley Campaigne
Ariel Chinn
David Clark
+Félix Cloutier
Stuart Connolly
Felipe Contreras
Jacobo Tarragón Cros
diff -r 9e7898a83fbd -r ea2b8d8d9705 Frameworks/Adium Framework/Source/AIAbstractAccount.m
--- a/Frameworks/Adium Framework/Source/AIAbstractAccount.m Wed Oct 17 22:15:57 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIAbstractAccount.m Mon Oct 22 21:23:49 2012 +0200
@@ -24,6 +24,7 @@
#import <Adium/AIInterfaceControllerProtocol.h>
#import <Adium/AIStatusControllerProtocol.h>
#import <Adium/AIChat.h>
+#import <Adium/AIGroupChat.h>
#import <Adium/AIContentEvent.h>
#import <Adium/AIListContact.h>
#import <Adium/AIService.h>
@@ -1354,7 +1355,7 @@
[adium.contentController receiveContentObject:newStatusMessage];
if (chat.isGroupChat)
- [chat removeAllParticipatingContactsSilently];
+ [(AIGroupChat *)chat removeAllParticipatingContactsSilently];
}
}
diff -r 9e7898a83fbd -r ea2b8d8d9705 Frameworks/Adium Framework/Source/AIChat.h
--- a/Frameworks/Adium Framework/Source/AIChat.h Wed Oct 17 22:15:57 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIChat.h Mon Oct 22 21:23:49 2012 +0200
@@ -97,22 +97,14 @@
AIChatInvalidNumberOfArguments
} AIChatErrorType;
- at interface AIChat : ESObjectWithProperties <AIContainingObject> {
+ at interface AIChat : ESObjectWithProperties {
AIAccount *account;
NSDate *dateOpened;
BOOL isOpen;
- BOOL isGroupChat;
BOOL hasSentOrReceivedContent;
NSMutableArray *pendingOutgoingContentObjects;
- BOOL hideUserIconAndStatus;
- BOOL showJoinLeave;
-
- NSMutableDictionary *participatingContactsFlags;
- NSMutableDictionary *participatingContactsAliases;
- NSMutableArray *participatingContacts;
-
AIListContact *__weak preferredContact;
NSString *name;
NSString *uniqueChatID;
@@ -120,21 +112,16 @@
NSMutableSet *ignoredListContacts;
- BOOL expanded;
-
BOOL enableTypingNotifications;
+ BOOL hideUserIconAndStatus;
NSMutableSet *customEmoticons;
- NSDate *lastMessageDate;
-
// Former properties
NSImage *tabStateIcon;
NSDictionary *chatCreationInfo;
- BOOL accountJoined;
-
NSInteger unviewedMention;
NSInteger unviewedContent;
@@ -143,14 +130,12 @@
NSInteger ourTypingState;
NSDictionary *securityDetails;
-
- BOOL secureMessagingLastEncryptedState;
-
- NSString *topic;
- AIListContact *topicSetter;
+
+ AIListContact *_listObject;
}
+ (id)chatForAccount:(AIAccount *)inAccount;
+- (id)initForAccount:(AIAccount *)inAccount;
@property (readwrite, nonatomic, strong) AIAccount *account;
@@ -171,30 +156,14 @@
- (void)setDisplayName:(NSString *)inDisplayName;
-// Group chat participants.
-- (NSString *)displayNameForContact:(AIListObject *)contact;
-- (AIGroupChatFlags)flagsForContact:(AIListObject *)contact;
-- (NSString *)aliasForContact:(AIListObject *)contact;
-- (void)setFlags:(AIGroupChatFlags)flags forContact:(AIListObject *)contact;
-- (void)setAlias:(NSString *)alias forContact:(AIListObject *)contact;
-- (void)removeSavedValuesForContactUID:(NSString *)contactUID;
-
-- (void)resortParticipants;
-
-- (void)addParticipatingListObject:(AIListContact *)inObject notify:(BOOL)notify;
-- (void)addParticipatingListObjects:(NSArray *)inObjects notify:(BOOL)notify;
-- (void)removeAllParticipatingContactsSilently;
-- (void)removeObject:(AIListObject *)inObject;
-
//
@property (readwrite, nonatomic, strong) AIListContact *listObject;
@property (readwrite, nonatomic, weak) AIListContact *preferredListObject;
-- (BOOL)inviteListContact:(AIListContact *)inObject withMessage:(NSString *)inviteMessage;
- (BOOL)shouldBeginSendingContentObject:(AIContentObject *)inObject;
- (void)finishedSendingContentObject:(AIContentObject *)inObject;
- at property (readwrite, nonatomic, strong) NSString *name;
+ at property (readwrite, nonatomic, strong) NSString *name;
@property (readwrite, nonatomic, strong) id identifier;
@property (weak, readonly, nonatomic) NSString *uniqueChatID;
@@ -213,26 +182,21 @@
- (BOOL)isListContactIgnored:(AIListObject *)inContact;
- (void)setListContact:(AIListContact *)inContact isIgnored:(BOOL)isIgnored;
- at property (readwrite, nonatomic) BOOL isGroupChat;
- at property (readwrite, nonatomic) BOOL showJoinLeave;
-
- at property (readwrite, nonatomic) BOOL hideUserIconAndStatus;
- at property (readonly, nonatomic) BOOL supportsTopic;
-
-- (void)updateTopic:(NSString *)inTopic withSource:(AIListContact *)contact;
-- (void)setTopic:(NSString *)inTopic;
-
- (void)addCustomEmoticon:(AIEmoticon *)inEmoticon;
@property (readonly, nonatomic) NSMutableSet *customEmoticons;
- (void)receivedError:(NSNumber *)type;
- at property (unsafe_unretained, readonly, nonatomic) id <AIChatContainer> chatContainer;
+ at property (readonly, nonatomic) id <AIChatContainer> chatContainer;
- at property (weak, readonly, nonatomic) NSMenu *actionMenu;
+ at property (readonly, nonatomic) NSMenu *actionMenu;
@property (readonly, nonatomic) BOOL shouldLog;
- at property (readwrite, copy, nonatomic) NSDate *lastMessageDate;
+ at property (readwrite, nonatomic) BOOL hideUserIconAndStatus;
+
+// Compatibility. I don't like this here.
+- (NSArray *)containedObjects;
+- (BOOL)isGroupChat;
@end
diff -r 9e7898a83fbd -r ea2b8d8d9705 Frameworks/Adium Framework/Source/AIChat.m
--- a/Frameworks/Adium Framework/Source/AIChat.m Wed Oct 17 22:15:57 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIChat.m Mon Oct 22 21:23:49 2012 +0200
@@ -43,18 +43,19 @@
@interface AIChat ()
- (id)initForAccount:(AIAccount *)inAccount;
-- (void)contentObjectAdded:(NSNotification *)notification;
- (void)clearUniqueChatID;
- (void)clearListObjectStatuses;
-- (AIListContact *)visibleObjectAtIndex:(NSUInteger)idx;
@end
@implementation AIChat
static int nextChatNumber = 0;
+ at synthesize listObject = _listObject;
+ at synthesize hideUserIconAndStatus;
+
+ (id)chatForAccount:(AIAccount *)inAccount
{
return [[self alloc] initForAccount:inAccount];
@@ -65,59 +66,27 @@
if ((self = [super init])) {
name = nil;
account = inAccount;
- participatingContacts = [[NSMutableArray alloc] init];
- participatingContactsFlags = [[NSMutableDictionary alloc] init];
- participatingContactsAliases = [[NSMutableDictionary alloc] init];
dateOpened = [NSDate date];
uniqueChatID = nil;
ignoredListContacts = nil;
isOpen = NO;
- isGroupChat = NO;
- expanded = YES;
customEmoticons = nil;
hasSentOrReceivedContent = NO;
- showJoinLeave = YES;
pendingOutgoingContentObjects = [[NSMutableArray alloc] init];
AILog(@"[AIChat: %p initForAccount]",self);
-
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(contentObjectAdded:)
- name:Content_ContentObjectAdded
- object:self];
}
return self;
}
-- (void)contentObjectAdded:(NSNotification *)notification
-{
- AIContentMessage *content = [[notification userInfo] objectForKey:@"AIContentObject"];
-
- self.lastMessageDate = [content date];
-}
-
-/*!
- * @brief Deallocate
- */
-- (void)dealloc
-{
- AILog(@"[%@ dealloc]",self);
-
- [self removeAllParticipatingContactsSilently];
-}
-
//Big image
- (NSImage *)chatImage
{
AIListContact *listObject = nil;
NSImage *image = nil;
- if (self.isGroupChat) {
- listObject = (AIListContact *)[adium.contactController existingBookmarkForChat:self];
- } else {
- listObject = self.listObject;
- }
+ listObject = self.listObject;
if (listObject) {
image = listObject.parentContact.userIcon;
@@ -135,11 +104,7 @@
AIListObject *listObject = nil;
NSImage *chatMenuImage = nil;
- if (self.isGroupChat) {
- listObject = (AIListContact *)[adium.contactController existingBookmarkForChat:self];
- } else {
- listObject = self.listObject;
- }
More information about the commits
mailing list