adium 5486:7b917a06a267: Add an IBOutlet to the view rather than...
commits at adium.im
commits at adium.im
Sun May 12 17:47:41 UTC 2013
details: http://hg.adium.im/adium/rev/7b917a06a267
revision: 5486:7b917a06a267
branch: EmoticonsMenu
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:08:32 2013 -0400
Add an IBOutlet to the view rather than travelling the superview chain.
Subject: adium 5487:3dfd71b85204: Remove some unused, commented out code.
details: http://hg.adium.im/adium/rev/3dfd71b85204
revision: 5487:3dfd71b85204
branch: EmoticonsMenu
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:10:17 2013 -0400
Remove some unused, commented out code.
Subject: adium 5488:efc7eb9ba10f: Add a retina icon for the emoticon menu.
details: http://hg.adium.im/adium/rev/efc7eb9ba10f
revision: 5488:efc7eb9ba10f
branch: EmoticonsMenu
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:14:31 2013 -0400
Add a retina icon for the emoticon menu.
Subject: adium 5489:fa1a98917a05: merge EmoticonsMenu into adium-1.6. Fixes #484
details: http://hg.adium.im/adium/rev/fa1a98917a05
revision: 5489:fa1a98917a05
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:22:09 2013 -0400
merge EmoticonsMenu into adium-1.6. Fixes #484
Subject: adium 5490:8744f46df6d0: Close EmoticonsMenu
details: http://hg.adium.im/adium/rev/8744f46df6d0
revision: 5490:8744f46df6d0
branch: EmoticonsMenu
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:24:49 2013 -0400
Close EmoticonsMenu
Subject: adium 5491:75043f6ddb81: Close adium-1.5.2
details: http://hg.adium.im/adium/rev/75043f6ddb81
revision: 5491:75043f6ddb81
branch: adium-1.5.2
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:26:45 2013 -0400
Close adium-1.5.2
Subject: adium 5492:c150856deb98: Close adium-1.5.3
details: http://hg.adium.im/adium/rev/c150856deb98
revision: 5492:c150856deb98
branch: adium-1.5.3
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:27:05 2013 -0400
Close adium-1.5.3
Subject: adium 5493:501ac9d61e49: Close adium-1.5.4
details: http://hg.adium.im/adium/rev/501ac9d61e49
revision: 5493:501ac9d61e49
branch: adium-1.5.4
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:31:13 2013 -0400
Close adium-1.5.4
Subject: adium 5494:bff364f5a528: Close adium-1.5.5
details: http://hg.adium.im/adium/rev/bff364f5a528
revision: 5494:bff364f5a528
branch: adium-1.5.5
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:31:36 2013 -0400
Close adium-1.5.5
Subject: adium 5495:fe26e514da90: Close adium-1.5.6
details: http://hg.adium.im/adium/rev/fe26e514da90
revision: 5495:fe26e514da90
branch: adium-1.5.6
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:31:45 2013 -0400
Close adium-1.5.6
Subject: adium 5496:eb2888c8718c: Close IRCServerConsole
details: http://hg.adium.im/adium/rev/eb2888c8718c
revision: 5496:eb2888c8718c
branch: IRCServerConsole
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:37:08 2013 -0400
Close IRCServerConsole
Subject: adium 5497:7bb00914a205: Close AdiumApplescriptRunnerUsingXPC
details: http://hg.adium.im/adium/rev/7bb00914a205
revision: 5497:7bb00914a205
branch: AdiumApplescriptRunnerUsingXPC
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:37:53 2013 -0400
Close AdiumApplescriptRunnerUsingXPC
Subject: adium 5498:df791ff02594: Close MSN-XMPP
details: http://hg.adium.im/adium/rev/df791ff02594
revision: 5498:df791ff02594
branch: MSN-XMPP
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:40:40 2013 -0400
Close MSN-XMPP
Subject: adium 5499:3b89c1bd9394: Close TorProxyType
details: http://hg.adium.im/adium/rev/3b89c1bd9394
revision: 5499:3b89c1bd9394
branch: TorProxyType
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:41:38 2013 -0400
Close TorProxyType
Subject: adium 5500:ba73efba0353: Store the URL of Twitter avatars to prevent requesting ones that we already have.
details: http://hg.adium.im/adium/rev/ba73efba0353
revision: 5500:ba73efba0353
branch: adium-1.6
author: Frank Dowsett <wixardy at adium.im>
date: Sun May 12 13:43:38 2013 -0400
Store the URL of Twitter avatars to prevent requesting ones that we already have.
diffs (truncated from 2744 to 1000 lines):
diff -r 2ceee6b6e433 -r ba73efba0353 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Wed May 08 16:42:46 2013 -0400
+++ b/Adium.xcodeproj/project.pbxproj Sun May 12 13:43:38 2013 -0400
@@ -1020,6 +1020,7 @@
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 */; };
+ 5A0BBC4317400544002A7BE0 /* emoticons_menu at 2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5A0BBC4217400544002A7BE0 /* emoticons_menu at 2x.png */; };
5A0D236A16F4C7BC005DF211 /* STTwitterAppOnly.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A0D236816F4C7BC005DF211 /* STTwitterAppOnly.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
5A1781860EC1215D00BA1E04 /* AIAutoScrollTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A1781850EC1215D00BA1E04 /* AIAutoScrollTextView.m */; };
5A17D65D130F76B4002C852F /* AIGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A17D65C130F76B4002C852F /* AIGradientView.m */; };
@@ -1354,6 +1355,8 @@
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 */; };
+ 76980AC1173E6C8800FBDA15 /* libidn.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 76980AC0173E6C8800FBDA15 /* libidn.framework */; };
+ 76980AC5173E6CA700FBDA15 /* libidn.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 76980AC0173E6C8800FBDA15 /* libidn.framework */; };
769D634B17393CBE008B97BC /* AMPurpleJabberDiscoveryBrowser.xib in Resources */ = {isa = PBXBuildFile; fileRef = 769D634A17393CBE008B97BC /* AMPurpleJabberDiscoveryBrowser.xib */; };
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 */; };
@@ -1680,6 +1683,7 @@
11EE1CCF0CDD01120097F246 /* libglib.framework in Copy Frameworks */,
11EE1CD00CDD01120097F246 /* libgmodule.framework in Copy Frameworks */,
11EE1CD10CDD01120097F246 /* libgobject.framework in Copy Frameworks */,
+ 76980AC5173E6CA700FBDA15 /* libidn.framework in Copy Frameworks */,
11EE1CD20CDD01120097F246 /* libgthread.framework in Copy Frameworks */,
7664EAA6162E0874008CF995 /* libffi.framework in Copy Frameworks */,
11EE1CD30CDD01120097F246 /* libintl.framework in Copy Frameworks */,
@@ -3872,6 +3876,7 @@
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>"; };
+ 5A0BBC4217400544002A7BE0 /* emoticons_menu at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "emoticons_menu at 2x.png"; path = "Resources/emoticons_menu at 2x.png"; sourceTree = "<group>"; };
5A0D236816F4C7BC005DF211 /* STTwitterAppOnly.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = STTwitterAppOnly.m; path = "Plugins/Twitter Plugin/STTwitter/STTwitterAppOnly.m"; sourceTree = "<group>"; };
5A0D236916F4C7BC005DF211 /* STTwitterAppOnly.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = STTwitterAppOnly.h; path = "Plugins/Twitter Plugin/STTwitter/STTwitterAppOnly.h"; sourceTree = "<group>"; };
5A1781840EC1215D00BA1E04 /* AIAutoScrollTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIAutoScrollTextView.h; path = Source/AIAutoScrollTextView.h; sourceTree = "<group>"; };
@@ -4417,6 +4422,7 @@
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>"; };
+ 76980AC0173E6C8800FBDA15 /* libidn.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libidn.framework; path = Frameworks/libidn.framework; sourceTree = "<group>"; };
769D634A17393CBE008B97BC /* AMPurpleJabberDiscoveryBrowser.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = AMPurpleJabberDiscoveryBrowser.xib; path = "Plugins/Purple Service/AMPurpleJabberDiscoveryBrowser.xib"; sourceTree = "<group>"; };
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>"; };
@@ -4792,6 +4798,7 @@
811035180CDE783800EC6038 /* SecurityInterface.framework in Frameworks */,
633405990F9C2C00003C77A9 /* AIUtilities.framework in Frameworks */,
3485D8EB09EB446900232CC4 /* Adium.framework in Frameworks */,
+ 76980AC1173E6C8800FBDA15 /* libidn.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -5017,6 +5024,7 @@
974C753414857BF4000686BA /* AIMessageViewEmoticonsController.m */,
974C752C148578F6000686BA /* MessageViewEmoticonsMenu.xib */,
974C7524148570E2000686BA /* emoticons_menu.png */,
+ 5A0BBC4217400544002A7BE0 /* emoticons_menu at 2x.png */,
C4243C920638E4EA007AD2D9 /* BGEmoticonMenuPlugin.h */,
C4243C930638E4EA007AD2D9 /* BGEmoticonMenuPlugin.m */,
);
@@ -8292,6 +8300,7 @@
979AA6A914D59EF3008730DF /* Others */ = {
isa = PBXGroup;
children = (
+ 76980AC0173E6C8800FBDA15 /* libidn.framework */,
7664EAA4162E086A008CF995 /* libffi.framework */,
76731DE015F90538007728C3 /* libgcrypt.framework */,
76731DE115F90538007728C3 /* libgpgerror.framework */,
@@ -9939,6 +9948,7 @@
C613B1111640C370006683FF /* pref-profile.tiff in Resources */,
C613B143164112B3006683FF /* events-dock-name.tiff in Resources */,
C613B1451641210B006683FF /* events-contact.tiff in Resources */,
+ 5A0BBC4317400544002A7BE0 /* emoticons_menu at 2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -12398,6 +12408,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/Frameworks\"",
+ );
};
name = Debug;
};
@@ -12405,6 +12419,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/Frameworks\"",
+ );
};
name = Release;
};
@@ -12412,6 +12430,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E2060FAFAA4700B310AC /* AdiumLibpurple.xcconfig */;
buildSettings = {
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/Frameworks\"",
+ );
};
name = "Release-Debug";
};
diff -r 2ceee6b6e433 -r ba73efba0353 AdiumHelp/gfx/Adium-Extra.png
Binary file AdiumHelp/gfx/Adium-Extra.png has changed
diff -r 2ceee6b6e433 -r ba73efba0353 AdiumHelp/gfx/Adium-Xtras.png
Binary file AdiumHelp/gfx/Adium-Xtras.png has changed
diff -r 2ceee6b6e433 -r ba73efba0353 AdiumHelp/gfx/Chat window-Encryption.png
Binary file AdiumHelp/gfx/Chat window-Encryption.png has changed
diff -r 2ceee6b6e433 -r ba73efba0353 AdiumHelp/gfx/pref-sm.png
Binary file AdiumHelp/gfx/pref-sm.png has changed
diff -r 2ceee6b6e433 -r ba73efba0353 AdiumHelp/pgs/AdiumDocumentation.html
--- a/AdiumHelp/pgs/AdiumDocumentation.html Wed May 08 16:42:46 2013 -0400
+++ b/AdiumHelp/pgs/AdiumDocumentation.html Sun May 12 13:43:38 2013 -0400
@@ -37,7 +37,7 @@
<li><a href="Accounts-CreatingAccounts.html">Creating accounts ▸</a></li>
<li><a href="Accounts-ContactIcons.html">Contact icons ▸</a></li>
<li><a href="Accounts-SettingYourStatus.html">Setting your status ▸</a></li>
- <li>Specific account use
+ <li>Service-specific information
<ul>
<li><a href="ServiceInformation-IRCSupport.html">IRC ▸</a></li>
<li><a href="ServiceInformation-TwitterSupport.html">Twitter ▸</a></li>
@@ -109,11 +109,15 @@
<td><ul>
<li><a href="AdvancedFeatures-AdiumXtras.html">Adium Xtras ▸</a></li>
<li><a href="AdvancedFeatures-GrowlSupport.html">Growl support ▸</a></li>
+ <li><a href="AdvancedFeatures-FileTransfer.html">File transfer ▸</a></li>
<li><a href="AdvancedFeatures-AddressBookIntegration.html">Address Book integration ▸</a></li>
- <li><a href="AdvancedFeatures-FileTransfer.html">File transfer ▸</a></li>
- <li><a href="AdvancedFeatures-DirectConnect.html">AIM: Direct Connect ▸</a></li>
- <li><a href="AdvancedFeatures-SearchForBuddyBy Email.html">AIM: Search for buddy by email address ▸</a></li>
- <li><a href="AdvancedFeatures-NudgeBuzz.html">MSN: Nudge / Yahoo: Buzz ▸</a></li>
+ <li><a href="AdvancedFeatures-OTREncryption.html">OTR encryption ▸</a></li>
+ <li>Service-specific information</li>
+ <ul>
+ <li><a href="AdvancedFeatures-DirectConnect.html">AIM: Direct Connect ▸</a></li>
+ <li><a href="AdvancedFeatures-SearchForBuddyBy Email.html">AIM: Search for buddy by email address ▸</a></li>
+ <li><a href="AdvancedFeatures-NudgeBuzz.html">MSN: Nudge / Yahoo: Buzz ▸</a></li>
+ </ul>
</ul></td>
</tr>
</table>
@@ -144,7 +148,7 @@
</div>
<div class="taskboxline">
<div class="taskboxheader">
- <h3>Information about the services supported</h3>
+ <h3>Services supported</h3>
</div>
<div class="taskboxtable">
<table width="100%" border="0" cellspacing="0" cellpadding="0" summary="One column table with heading">
diff -r 2ceee6b6e433 -r ba73efba0353 AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html
--- a/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html Wed May 08 16:42:46 2013 -0400
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html Sun May 12 13:43:38 2013 -0400
@@ -23,7 +23,7 @@
<h3>Installing Adium Xtras</h3>
</div>
<div class="taskboxtext">
- <p>To install an Xtra from the <a class="ext_link" href="http://xtras.adium.im/">AdiumXtras website</a>, click the install link on the Xtra's webpage. To install an extra that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put the Xtra into the correct place for you.</p>
+ <p>To install an Xtra from the <a class="ext_link" href="http://xtras.adium.im/">AdiumXtras website</a>, click the install link on the Xtra's webpage. To install an Xtra that you have already downloaded, simply doubleclick it. In either case, Adium will launch and put the Xtra into the correct place for you.</p>
</div>
</div>
<div class="taskboxline">
@@ -32,7 +32,7 @@
</div>
<div class="taskboxtext">
<p>Xtras are stored in subfolders of this folder: (Your Home Folder)/Library/Application Support/Adium 2.0. Each folder contains a different type of Xtra.</p>
- <p align="center"> <img src="../gfx/Adium-Extra.png" alt="" width="400" height="112" /></p>
+ <p align="center"> <img src="../gfx/Adium-Xtras.png" alt="" width="400" height="112" /></p>
<ul>
<li>Contact List - Contact list layouts and themes (<a href="AdvancedFeatures-AdiumXtras-ListLayouts.html">.ListLayout</a>, <a href="AdvancedFeatures-AdiumXtras-ListTheme.html">.ListTheme</a>)</li>
<li>Dock Icons - Dock-icon packs (<a href="AdvancedFeatures-AdiumXtras-DockIcons.html">.AdiumIcon</a>)</li>
diff -r 2ceee6b6e433 -r ba73efba0353 AdiumHelp/pgs/AdvancedFeatures-OTREncryption.html
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/AdiumHelp/pgs/AdvancedFeatures-OTREncryption.html Sun May 12 13:43:38 2013 -0400
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta name="keywords" content="otr, encryption, off-the-record" />
+<meta name="description" content="otr encryption" />
+<title>OTR encryption</title>
+<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
+</head>
+<body>
+<div id="banner"> <a name="tabs" id="tabs"></a>
+ <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
+</div>
+<div id="mainbox">
+ <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
+ <div id="pagetitle">
+ <h1>OTR encryption</h1>
+ </div>
+ <p><a href="http://www.cypherpunks.ca/otr/">Off-the-Record (OTR) Messaging</a> enables you to have private conversations over instant messaging. According to the OTR Development Team, it aims to provide the following:</p>
+ <ul>
+ <li>"Encryption: No one else can read your instant messages."</li>
+ <li>"Authentication: You are assured the correspondent is who you think it is."</li>
+ <li>"Deniability: The messages you send do not have digital signatures that are checkable by a third party. Anyone can forge messages after a conversation to make them look like they came from you. However, during a conversation, your correspondent is assured the messages he sees are authentic and unmodified."</li>
+ <li>"Perfect forward secrecy: If you lose control of your private keys, no previous conversation is compromised."</li>
+ </ul>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Setup</h3>
+ </div>
+ <div class="taskboxtext">
+ <ul>
+ <li>Generate an OTR fingerprint:</li>
+ <ol>
+ <li>Open the preferences, accessible via the <strong>Adium</strong> menu in the menu bar, and select the <strong>Encryption</strong> pane.</li>
+ <li>Click the <strong>Generate</strong> button. This fingerprint is unique for the account selected in the dropdown.</li>
+ </ol>
+ <li>Make sure you have the "Encryption" (lock) item in the chat window's toolbar. If not, click "Customise Toolbar..." from the <strong>View</strong> menu and add it.</li>
+ </ul>
+ <p align="center"> <img src="../gfx/Chat window-Encryption.png" alt="" width="" height="" /></p>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Initiating an OTR-encrypted chat</h3>
+ </div>
+ <div class="taskboxtext">
+ <p></p>
+ <ol>
+ <li>Open a chat with the contact with whom you want to have a private conversation.</li>
+ <li>Notice the "Encryption" item in the toolbar appears unlocked. It signifies the chat currently is not encrypted. Click the icon and select "Initiate Encrypted OTR Chat".</li>
+ <li>You will be prompted to verify the fingerprint. If you are certain of its trustworthy origin click "Accept".</li>
+ <li>Notice the previously unlocked icon is now locked and the message "Encrypted OTR chat initiated" is displayed in the message view.</li>
+ </ol>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Encryption settings</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>There are four different settings which can be adjusted on a per-account and on a per-contact basis: "Disable chat encryption", "Encrypt chats as requested", "Encrypt chats automatically" and "Force encryption and refuse plaintext".</p>
+ <p><strong>Per-account</strong></p>
+ <ul>
+ <li>Open preferences, select the <strong>Accounts</strong> pane and double-click the account.</li>
+ <li>Click the "Privacy" tab and choose your option for this account from the dropdown.</li>
+ </ul>
+ <p><strong>Per-contact</strong></p>
+ <ul>
+ <li>In the chat window/tab you have open with the contact in question, click the lock in the toolbar and choose your option via "Encryption Settings".</li>
+ </ul>
+ </div>
+ </div>
+ <div class="taskboxline">
+ <div class="taskboxheader">
+ <h3>Disabling chat logging on your computer</h3>
+ </div>
+ <div class="taskboxtext">
+ <p>By default, Adium stores all of your chats locally. You might want to disable logging of chats on your computer entirely or just for OTR-encrypted chats or specific accounts.</p>
+ <ul>
+ <li>Open preferences, select the <strong>Messages</strong> pane.</li>
+ <li>Tick the appropriate checkboxes.</li>
+ </ul>
+ </div>
+ </div>
+</div>
+<script type="text/javascript" src="../js/help.js"></script>
+</body>
+</html>
diff -r 2ceee6b6e433 -r ba73efba0353 Frameworks/libidn.framework/Headers
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libidn.framework/Headers Sun May 12 13:43:38 2013 -0400
@@ -0,0 +1,1 @@
+Versions/1.26/Headers
\ No newline at end of file
diff -r 2ceee6b6e433 -r ba73efba0353 Frameworks/libidn.framework/Resources
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libidn.framework/Resources Sun May 12 13:43:38 2013 -0400
@@ -0,0 +1,1 @@
+Versions/1.26/Resources
\ No newline at end of file
diff -r 2ceee6b6e433 -r ba73efba0353 Frameworks/libidn.framework/Versions/1.26/Headers/idn-free.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libidn.framework/Versions/1.26/Headers/idn-free.h Sun May 12 13:43:38 2013 -0400
@@ -0,0 +1,74 @@
+/* idn-free.h --- Invoke the free function to release memory
+ Copyright (C) 2004-2012 Simon Josefsson
+
+ This file is part of GNU Libidn.
+
+ GNU Libidn is free software: you can redistribute it and/or
+ modify it under the terms of either:
+
+ * the GNU Lesser General Public License as published by the Free
+ Software Foundation; either version 3 of the License, or (at
+ your option) any later version.
+
+ or
+
+ * the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at
+ your option) any later version.
+
+ or both in parallel, as here.
+
+ GNU Libidn is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received copies of the GNU General Public License and
+ the GNU Lesser General Public License along with this program. If
+ not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef IDN_FREE_H
+# define IDN_FREE_H
+
+# ifndef IDNAPI
+# if defined LIBIDN_BUILDING && defined HAVE_VISIBILITY && HAVE_VISIBILITY
+# define IDNAPI __attribute__((__visibility__("default")))
+# elif defined LIBIDN_BUILDING && defined _MSC_VER && ! defined LIBIDN_STATIC
+# define IDNAPI __declspec(dllexport)
+# elif defined _MSC_VER && ! defined LIBIDN_STATIC
+# define IDNAPI __declspec(dllimport)
+# else
+# define IDNAPI
+# endif
+# endif
+
+# ifdef __cplusplus
+extern "C"
+{
+# endif
+
+/* I don't recommend using this interface in general. Use `free'.
+ *
+ * I'm told Microsoft Windows may use one set of `malloc' and `free'
+ * in a library, and another incompatible set in a statically compiled
+ * application that link to the library, thus creating problems if the
+ * application would invoke `free' on a pointer pointing to memory
+ * allocated by the library. This motivated adding this function.
+ *
+ * The theory of isolating all memory allocations and de-allocations
+ * within a code package (library) sounds good, to simplify hunting
+ * down memory allocation related problems, but I'm not sure if it is
+ * worth enough to motivate recommending this interface over calling
+ * `free' directly, though.
+ *
+ * See the manual section 'Memory handling under Windows' for more
+ * information.
+ */
+
+extern void IDNAPI idn_free (void *ptr);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif /* IDN_FREE_H */
diff -r 2ceee6b6e433 -r ba73efba0353 Frameworks/libidn.framework/Versions/1.26/Headers/idn-int.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Frameworks/libidn.framework/Versions/1.26/Headers/idn-int.h Sun May 12 13:43:38 2013 -0400
@@ -0,0 +1,638 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Copyright (C) 2001-2002, 2004-2012 Free Software Foundation, Inc.
+ Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
+ This file is part of gnulib.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
+
+/*
+ * ISO C 99 <stdint.h> for platforms that lack it.
+ * <http://www.opengroup.org/susv3xbd/stdint.h.html>
+ */
+
+#ifndef _GL_LGL_STDINT_H
+
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+
+/* When including a system file that in turn includes <inttypes.h>,
+ use the system <inttypes.h>, not our substitute. This avoids
+ problems with (for example) VMS, whose <sys/bitypes.h> includes
+ <inttypes.h>. */
+#define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+
+/* On Android (Bionic libc), <sys/types.h> includes this file before
+ having defined 'time_t'. Therefore in this case avoid including
+ other system header files; just include the system's <stdint.h>.
+ Ideally we should test __BIONIC__ here, but it is only defined after
+ <sys/cdefs.h> has been included; hence test __ANDROID__ instead. */
+#if defined __ANDROID__ \
+ && defined _SYS_TYPES_H_ && !defined _SSIZE_T_DEFINED_
+# include <stdint.h>
+#else
+
+/* Get those types that are already defined in other system include
+ files, so that we can "#define int8_t signed char" below without
+ worrying about a later system include file containing a "typedef
+ signed char int8_t;" that will get messed up by our macro. Our
+ macros should all be consistent with the system versions, except
+ for the "fast" types and macros, which we recommend against using
+ in public interfaces due to compiler differences. */
+
+#if 1
+# if defined __sgi && ! defined __c99
+ /* Bypass IRIX's <stdint.h> if in C89 mode, since it merely annoys users
+ with "This header file is to be used only for c99 mode compilations"
+ diagnostics. */
+# define __STDINT_H__
+# endif
+
+ /* Some pre-C++11 <stdint.h> implementations need this. */
+# ifdef __cplusplus
+# ifndef __STDC_CONSTANT_MACROS
+# define __STDC_CONSTANT_MACROS 1
+# endif
+# ifndef __STDC_LIMIT_MACROS
+# define __STDC_LIMIT_MACROS 1
+# endif
+# endif
+
+ /* Other systems may have an incomplete or buggy <stdint.h>.
+ Include it before <inttypes.h>, since any "#include <stdint.h>"
+ in <inttypes.h> would reinclude us, skipping our contents because
+ _GL_LGL_STDINT_H is defined.
+ The include requires a split double-inclusion guard. */
+# include <stdint.h>
+#endif
+
+#if ! defined _GL_LGL_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
+#define _GL_LGL_STDINT_H
+
+/* <sys/types.h> defines some of the stdint.h types as well, on glibc,
+ IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
+ AIX 5.2 <sys/types.h> isn't needed and causes troubles.
+ Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
+ relies on the system <stdint.h> definitions, so include
+ <sys/types.h> after <stdint.h>. */
+#if 1 && ! defined _AIX
+# include <sys/types.h>
+#endif
+
+/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
+ LONG_MIN, LONG_MAX, ULONG_MAX. */
+#include <limits.h>
+
+#if 1
+ /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines
+ int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
+ <inttypes.h> also defines intptr_t and uintptr_t. */
+# include <inttypes.h>
+#elif 0
+ /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
+ the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX. */
+# include <sys/inttypes.h>
+#endif
+
+#if 0 && ! defined __BIT_TYPES_DEFINED__
+ /* Linux libc4 >= 4.6.7 and libc5 have a <sys/bitypes.h> that defines
+ int{8,16,32,64}_t and __BIT_TYPES_DEFINED__. In libc5 >= 5.2.2 it is
+ included by <sys/types.h>. */
+# include <sys/bitypes.h>
+#endif
+
+#undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
+
+/* Minimum and maximum values for an integer type under the usual assumption.
+ Return an unspecified value if BITS == 0, adding a check to pacify
+ picky compilers. */
+
+#define _STDINT_MIN(signed, bits, zero) \
+ ((signed) ? (- ((zero) + 1) << ((bits) ? (bits) - 1 : 0)) : (zero))
+
+#define _STDINT_MAX(signed, bits, zero) \
+ ((signed) \
+ ? ~ _STDINT_MIN (signed, bits, zero) \
+ : /* The expression for the unsigned case. The subtraction of (signed) \
+ is a nop in the unsigned case and avoids "signed integer overflow" \
+ warnings in the signed case. */ \
+ ((((zero) + 1) << ((bits) ? (bits) - 1 - (signed) : 0)) - 1) * 2 + 1)
+
+#if !GNULIB_defined_stdint_types
+
+/* 7.18.1.1. Exact-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+ types have 8, 16, 32, optionally 64 bits. */
+
+#undef int8_t
+#undef uint8_t
+typedef signed char gl_int8_t;
+typedef unsigned char gl_uint8_t;
+#define int8_t gl_int8_t
+#define uint8_t gl_uint8_t
+
+#undef int16_t
+#undef uint16_t
+typedef short int gl_int16_t;
+typedef unsigned short int gl_uint16_t;
+#define int16_t gl_int16_t
+#define uint16_t gl_uint16_t
+
+#undef int32_t
+#undef uint32_t
+typedef int gl_int32_t;
+typedef unsigned int gl_uint32_t;
+#define int32_t gl_int32_t
+#define uint32_t gl_uint32_t
+
+/* If the system defines INT64_MAX, assume int64_t works. That way,
+ if the underlying platform defines int64_t to be a 64-bit long long
+ int, the code below won't mistakenly define it to be a 64-bit long
+ int, which would mess up C++ name mangling. We must use #ifdef
+ rather than #if, to avoid an error with HP-UX 10.20 cc. */
+
+#ifdef INT64_MAX
+# define GL_INT64_T
+#else
+/* Do not undefine int64_t if gnulib is not being used with 64-bit
+ types, since otherwise it breaks platforms like Tandem/NSK. */
+# if LONG_MAX >> 31 >> 31 == 1
+# undef int64_t
+typedef long int gl_int64_t;
+# define int64_t gl_int64_t
+# define GL_INT64_T
+# elif defined _MSC_VER
+# undef int64_t
+typedef __int64 gl_int64_t;
+# define int64_t gl_int64_t
+# define GL_INT64_T
+# elif 1
+# undef int64_t
+typedef long long int gl_int64_t;
+# define int64_t gl_int64_t
+# define GL_INT64_T
+# endif
+#endif
+
+#ifdef UINT64_MAX
+# define GL_UINT64_T
+#else
+# if ULONG_MAX >> 31 >> 31 >> 1 == 1
+# undef uint64_t
+typedef unsigned long int gl_uint64_t;
+# define uint64_t gl_uint64_t
+# define GL_UINT64_T
+# elif defined _MSC_VER
+# undef uint64_t
+typedef unsigned __int64 gl_uint64_t;
+# define uint64_t gl_uint64_t
+# define GL_UINT64_T
+# elif 1
+# undef uint64_t
+typedef unsigned long long int gl_uint64_t;
+# define uint64_t gl_uint64_t
+# define GL_UINT64_T
+# endif
+#endif
+
+/* Avoid collision with Solaris 2.5.1 <pthread.h> etc. */
+#define _UINT8_T
+#define _UINT32_T
+#define _UINT64_T
+
+
+/* 7.18.1.2. Minimum-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+ types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
+ are the same as the corresponding N_t types. */
+
+#undef int_least8_t
+#undef uint_least8_t
+#undef int_least16_t
+#undef uint_least16_t
+#undef int_least32_t
+#undef uint_least32_t
+#undef int_least64_t
+#undef uint_least64_t
+#define int_least8_t int8_t
+#define uint_least8_t uint8_t
+#define int_least16_t int16_t
+#define uint_least16_t uint16_t
+#define int_least32_t int32_t
+#define uint_least32_t uint32_t
+#ifdef GL_INT64_T
+# define int_least64_t int64_t
+#endif
+#ifdef GL_UINT64_T
+# define uint_least64_t uint64_t
+#endif
+
+/* 7.18.1.3. Fastest minimum-width integer types */
+
+/* Note: Other <stdint.h> substitutes may define these types differently.
+ It is not recommended to use these types in public header files. */
+
+/* Here we assume a standard architecture where the hardware integer
+ types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
+ are taken from the same list of types. The following code normally
+ uses types consistent with glibc, as that lessens the chance of
+ incompatibility with older GNU hosts. */
+
+#undef int_fast8_t
+#undef uint_fast8_t
+#undef int_fast16_t
+#undef uint_fast16_t
+#undef int_fast32_t
+#undef uint_fast32_t
+#undef int_fast64_t
+#undef uint_fast64_t
+typedef signed char gl_int_fast8_t;
+typedef unsigned char gl_uint_fast8_t;
+
+#ifdef __sun
+/* Define types compatible with SunOS 5.10, so that code compiled under
+ earlier SunOS versions works with code compiled under SunOS 5.10. */
+typedef int gl_int_fast32_t;
+typedef unsigned int gl_uint_fast32_t;
+#else
+typedef long int gl_int_fast32_t;
+typedef unsigned long int gl_uint_fast32_t;
+#endif
+typedef gl_int_fast32_t gl_int_fast16_t;
+typedef gl_uint_fast32_t gl_uint_fast16_t;
+
+#define int_fast8_t gl_int_fast8_t
+#define uint_fast8_t gl_uint_fast8_t
+#define int_fast16_t gl_int_fast16_t
+#define uint_fast16_t gl_uint_fast16_t
+#define int_fast32_t gl_int_fast32_t
+#define uint_fast32_t gl_uint_fast32_t
+#ifdef GL_INT64_T
+# define int_fast64_t int64_t
+#endif
+#ifdef GL_UINT64_T
+# define uint_fast64_t uint64_t
+#endif
+
+/* 7.18.1.4. Integer types capable of holding object pointers */
+
+#undef intptr_t
+#undef uintptr_t
+typedef long int gl_intptr_t;
+typedef unsigned long int gl_uintptr_t;
+#define intptr_t gl_intptr_t
+#define uintptr_t gl_uintptr_t
+
+/* 7.18.1.5. Greatest-width integer types */
+
+/* Note: These types are compiler dependent. It may be unwise to use them in
+ public header files. */
+
+/* If the system defines INTMAX_MAX, assume that intmax_t works, and
+ similarly for UINTMAX_MAX and uintmax_t. This avoids problems with
+ assuming one type where another is used by the system. */
+
+#ifndef INTMAX_MAX
+# undef INTMAX_C
+# undef intmax_t
+# if 1 && LONG_MAX >> 30 == 1
+typedef long long int gl_intmax_t;
+# define intmax_t gl_intmax_t
+# elif defined GL_INT64_T
+# define intmax_t int64_t
+# else
+typedef long int gl_intmax_t;
+# define intmax_t gl_intmax_t
+# endif
+#endif
+
+#ifndef UINTMAX_MAX
+# undef UINTMAX_C
+# undef uintmax_t
+# if 1 && ULONG_MAX >> 31 == 1
+typedef unsigned long long int gl_uintmax_t;
+# define uintmax_t gl_uintmax_t
+# elif defined GL_UINT64_T
+# define uintmax_t uint64_t
+# else
+typedef unsigned long int gl_uintmax_t;
+# define uintmax_t gl_uintmax_t
+# endif
+#endif
+
+/* Verify that intmax_t and uintmax_t have the same size. Too much code
+ breaks if this is not the case. If this check fails, the reason is likely
+ to be found in the autoconf macros. */
+typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
+ ? 1 : -1];
+
+#define GNULIB_defined_stdint_types 1
+#endif /* !GNULIB_defined_stdint_types */
+
+/* 7.18.2. Limits of specified-width integer types */
+
+/* 7.18.2.1. Limits of exact-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+ types have 8, 16, 32, optionally 64 bits. */
+
+#undef INT8_MIN
+#undef INT8_MAX
+#undef UINT8_MAX
+#define INT8_MIN (~ INT8_MAX)
+#define INT8_MAX 127
+#define UINT8_MAX 255
+
+#undef INT16_MIN
+#undef INT16_MAX
+#undef UINT16_MAX
+#define INT16_MIN (~ INT16_MAX)
+#define INT16_MAX 32767
+#define UINT16_MAX 65535
+
+#undef INT32_MIN
+#undef INT32_MAX
+#undef UINT32_MAX
+#define INT32_MIN (~ INT32_MAX)
+#define INT32_MAX 2147483647
+#define UINT32_MAX 4294967295U
+
+#if defined GL_INT64_T && ! defined INT64_MAX
+/* Prefer (- INTMAX_C (1) << 63) over (~ INT64_MAX) because SunPRO C 5.0
+ evaluates the latter incorrectly in preprocessor expressions. */
+# define INT64_MIN (- INTMAX_C (1) << 63)
+# define INT64_MAX INTMAX_C (9223372036854775807)
+#endif
+
+#if defined GL_UINT64_T && ! defined UINT64_MAX
+# define UINT64_MAX UINTMAX_C (18446744073709551615)
+#endif
+
+/* 7.18.2.2. Limits of minimum-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+ types have 8, 16, 32, optionally 64 bits. Therefore the leastN_t types
+ are the same as the corresponding N_t types. */
+
+#undef INT_LEAST8_MIN
+#undef INT_LEAST8_MAX
+#undef UINT_LEAST8_MAX
+#define INT_LEAST8_MIN INT8_MIN
+#define INT_LEAST8_MAX INT8_MAX
+#define UINT_LEAST8_MAX UINT8_MAX
+
+#undef INT_LEAST16_MIN
+#undef INT_LEAST16_MAX
+#undef UINT_LEAST16_MAX
+#define INT_LEAST16_MIN INT16_MIN
+#define INT_LEAST16_MAX INT16_MAX
+#define UINT_LEAST16_MAX UINT16_MAX
+
+#undef INT_LEAST32_MIN
+#undef INT_LEAST32_MAX
+#undef UINT_LEAST32_MAX
+#define INT_LEAST32_MIN INT32_MIN
+#define INT_LEAST32_MAX INT32_MAX
+#define UINT_LEAST32_MAX UINT32_MAX
+
+#undef INT_LEAST64_MIN
+#undef INT_LEAST64_MAX
+#ifdef GL_INT64_T
+# define INT_LEAST64_MIN INT64_MIN
+# define INT_LEAST64_MAX INT64_MAX
+#endif
+
+#undef UINT_LEAST64_MAX
+#ifdef GL_UINT64_T
+# define UINT_LEAST64_MAX UINT64_MAX
+#endif
+
+/* 7.18.2.3. Limits of fastest minimum-width integer types */
+
+/* Here we assume a standard architecture where the hardware integer
+ types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
+ are taken from the same list of types. */
+
+#undef INT_FAST8_MIN
+#undef INT_FAST8_MAX
+#undef UINT_FAST8_MAX
+#define INT_FAST8_MIN SCHAR_MIN
+#define INT_FAST8_MAX SCHAR_MAX
+#define UINT_FAST8_MAX UCHAR_MAX
+
+#undef INT_FAST16_MIN
+#undef INT_FAST16_MAX
+#undef UINT_FAST16_MAX
+#define INT_FAST16_MIN INT_FAST32_MIN
+#define INT_FAST16_MAX INT_FAST32_MAX
+#define UINT_FAST16_MAX UINT_FAST32_MAX
+
+#undef INT_FAST32_MIN
+#undef INT_FAST32_MAX
+#undef UINT_FAST32_MAX
+#ifdef __sun
+# define INT_FAST32_MIN INT_MIN
+# define INT_FAST32_MAX INT_MAX
+# define UINT_FAST32_MAX UINT_MAX
+#else
+# define INT_FAST32_MIN LONG_MIN
+# define INT_FAST32_MAX LONG_MAX
+# define UINT_FAST32_MAX ULONG_MAX
+#endif
+
+#undef INT_FAST64_MIN
+#undef INT_FAST64_MAX
+#ifdef GL_INT64_T
+# define INT_FAST64_MIN INT64_MIN
+# define INT_FAST64_MAX INT64_MAX
+#endif
+
+#undef UINT_FAST64_MAX
+#ifdef GL_UINT64_T
+# define UINT_FAST64_MAX UINT64_MAX
+#endif
+
+/* 7.18.2.4. Limits of integer types capable of holding object pointers */
+
+#undef INTPTR_MIN
+#undef INTPTR_MAX
+#undef UINTPTR_MAX
+#define INTPTR_MIN LONG_MIN
+#define INTPTR_MAX LONG_MAX
+#define UINTPTR_MAX ULONG_MAX
+
+/* 7.18.2.5. Limits of greatest-width integer types */
+
+#ifndef INTMAX_MAX
+# undef INTMAX_MIN
+# ifdef INT64_MAX
+# define INTMAX_MIN INT64_MIN
+# define INTMAX_MAX INT64_MAX
+# else
+# define INTMAX_MIN INT32_MIN
+# define INTMAX_MAX INT32_MAX
+# endif
+#endif
+
+#ifndef UINTMAX_MAX
+# ifdef UINT64_MAX
+# define UINTMAX_MAX UINT64_MAX
+# else
+# define UINTMAX_MAX UINT32_MAX
+# endif
+#endif
+
+/* 7.18.3. Limits of other integer types */
+
+/* ptrdiff_t limits */
+#undef PTRDIFF_MIN
+#undef PTRDIFF_MAX
+#if 0
+# ifdef _LP64
+# define PTRDIFF_MIN _STDINT_MIN (1, 64, 0l)
+# define PTRDIFF_MAX _STDINT_MAX (1, 64, 0l)
+# else
+# define PTRDIFF_MIN _STDINT_MIN (1, 32, 0)
+# define PTRDIFF_MAX _STDINT_MAX (1, 32, 0)
+# endif
+#else
+# define PTRDIFF_MIN \
+ _STDINT_MIN (1, 64, 0l)
+# define PTRDIFF_MAX \
+ _STDINT_MAX (1, 64, 0l)
+#endif
+
+/* sig_atomic_t limits */
+#undef SIG_ATOMIC_MIN
+#undef SIG_ATOMIC_MAX
+#define SIG_ATOMIC_MIN \
+ _STDINT_MIN (1, 32, \
+ 0)
+#define SIG_ATOMIC_MAX \
+ _STDINT_MAX (1, 32, \
+ 0)
+
+
+/* size_t limit */
+#undef SIZE_MAX
+#if 0
+# ifdef _LP64
+# define SIZE_MAX _STDINT_MAX (0, 64, 0ul)
+# else
+# define SIZE_MAX _STDINT_MAX (0, 32, 0ul)
+# endif
+#else
+# define SIZE_MAX _STDINT_MAX (0, 64, 0ul)
+#endif
+
+/* wchar_t limits */
+/* Get WCHAR_MIN, WCHAR_MAX.
+ This include is not on the top, above, because on OSF/1 4.0 we have a
+ sequence of nested includes
+ <wchar.h> -> <stdio.h> -> <getopt.h> -> <stdlib.h>, and the latter includes
+ <stdint.h> and assumes its types are already defined. */
+#if 1 && ! (defined WCHAR_MIN && defined WCHAR_MAX)
+ /* BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
+ included before <wchar.h>. */
+# include <stddef.h>
+# include <stdio.h>
+# include <time.h>
+# define _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
+/* We don't need WCHAR_* in libidn, so to avoid problems with
+ missing wchar.h, don't include wchar.h here. */
+# undef _GL_JUST_INCLUDE_SYSTEM_WCHAR_H
+#endif
+#undef WCHAR_MIN
+#undef WCHAR_MAX
+#define WCHAR_MIN \
+ _STDINT_MIN (1, 32, 0)
+#define WCHAR_MAX \
+ _STDINT_MAX (1, 32, 0)
+
+/* wint_t limits */
+#undef WINT_MIN
+#undef WINT_MAX
+#define WINT_MIN \
+ _STDINT_MIN (1, 32, 0)
+#define WINT_MAX \
+ _STDINT_MAX (1, 32, 0)
+
+/* 7.18.4. Macros for integer constants */
+
+/* 7.18.4.1. Macros for minimum-width integer constants */
+/* According to ISO C 99 Technical Corrigendum 1 */
+
+/* Here we assume a standard architecture where the hardware integer
+ types have 8, 16, 32, optionally 64 bits, and int is 32 bits. */
+
+#undef INT8_C
+#undef UINT8_C
+#define INT8_C(x) x
+#define UINT8_C(x) x
+
+#undef INT16_C
+#undef UINT16_C
+#define INT16_C(x) x
+#define UINT16_C(x) x
+
+#undef INT32_C
+#undef UINT32_C
+#define INT32_C(x) x
+#define UINT32_C(x) x ## U
+
+#undef INT64_C
+#undef UINT64_C
+#if LONG_MAX >> 31 >> 31 == 1
+# define INT64_C(x) x##L
+#elif defined _MSC_VER
+# define INT64_C(x) x##i64
+#elif 1
+# define INT64_C(x) x##LL
+#endif
+#if ULONG_MAX >> 31 >> 31 >> 1 == 1
+# define UINT64_C(x) x##UL
+#elif defined _MSC_VER
+# define UINT64_C(x) x##ui64
+#elif 1
+# define UINT64_C(x) x##ULL
+#endif
+
+/* 7.18.4.2. Macros for greatest-width integer constants */
+
+#ifndef INTMAX_C
+# if 1 && LONG_MAX >> 30 == 1
+# define INTMAX_C(x) x##LL
+# elif defined GL_INT64_T
+# define INTMAX_C(x) INT64_C(x)
+# else
+# define INTMAX_C(x) x##L
+# endif
+#endif
+
+#ifndef UINTMAX_C
+# if 1 && ULONG_MAX >> 31 == 1
+# define UINTMAX_C(x) x##ULL
+# elif defined GL_UINT64_T
+# define UINTMAX_C(x) UINT64_C(x)
+# else
+# define UINTMAX_C(x) x##UL
+# endif
+#endif
More information about the commits
mailing list