<pre style='margin:0'>
Mark Anderson (markemer) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/22a786199c868842f0108f31f2955c17f8bab21c">https://github.com/macports/macports-ports/commit/22a786199c868842f0108f31f2955c17f8bab21c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 22a786199c8 iTerm2: disable automatic update functionality (#9042)
</span>22a786199c8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 22a786199c868842f0108f31f2955c17f8bab21c
</span>Author: Tatsh <Tatsh@users.noreply.github.com>
AuthorDate: Tue Nov 10 20:07:36 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> iTerm2: disable automatic update functionality (#9042)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * iTerm2: disable automatic update functionality
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56840
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * iTerm2: guard against undefined NS_WARN_UNUSED_RESULT
</span>---
aqua/iTerm2/Portfile | 7 +-
aqua/iTerm2/files/patch-nsur.diff | 24 ++++
aqua/iTerm2/files/patch-remove-sparkle.diff | 210 ++++++++++++++++++++++++++++
3 files changed, 239 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/iTerm2/Portfile b/aqua/iTerm2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8681ff5bdd2..f150a1ae635 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/iTerm2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/iTerm2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,14 +11,17 @@ if {${os.major} > 16} {
</span> checksums rmd160 37d4204f97ac42431c5774a943ca0ab8f9a4c669 \
sha256 6eeeb3215d6725aa789d39108a8ebedbe1aa9f6d058dd33056d72471ecd02e14 \
size 20602868
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-Makefile-XC10.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-Makefile-XC10.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-remove-sparkle.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-nsur.diff
</span> } else {
version 3.2.0
revision 0
checksums rmd160 07915ff5db0545c0c059f47e7f71761e023a26e1 \
sha256 017aff348352369abcc994caaca0f6112e1f17c4d65041acdb9f19830b2b96bd \
size 11969144
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-Makefile.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-nsur.diff
</span> }
github.setup gnachman iTerm2 ${version} v
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/iTerm2/files/patch-nsur.diff b/aqua/iTerm2/files/patch-nsur.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..869a4b014ee
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/iTerm2/files/patch-nsur.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a793c88dcfdcd17c42909d8f3ed461bc44aaa53e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Andrew Udvare <audvare@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 7 Nov 2020 01:32:23 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Guard against NS_WARN_UNUSED_RESULT not defined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources/iTerm2.pch | 4 +++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git sources/iTerm2.pch sources/iTerm2.pch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3108a3a09..028db831c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sources/iTerm2.pch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sources/iTerm2.pch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,4 +5,6 @@ _Pragma("clang diagnostic ignored \"-Wpartial-availability\"")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ITERM_IGNORE_PARTIAL_END \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _Pragma("clang diagnostic pop")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef NS_WARN_UNUSED_RESULT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define NS_WARN_UNUSED_RESULT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.29.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/iTerm2/files/patch-remove-sparkle.diff b/aqua/iTerm2/files/patch-remove-sparkle.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..34944b339fe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/iTerm2/files/patch-remove-sparkle.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,210 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 12ed6ad18ed8e7390b9fa6681487c75a0eb9c979 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Andrew Udvare <audvare@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 6 Nov 2020 16:40:20 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Remove update stuff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Interfaces/MainMenu.xib | 10 ---------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Interfaces/PreferencePanel.xib | 26 ----------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources/GeneralPreferencesViewController.m | 16 -------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources/iTermApplicationDelegate.m | 8 -------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources/iTermController.m | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources/iTermLaunchExperienceController.m | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources/iTermPreferences.m | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 7 files changed, 3 insertions(+), 63 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Interfaces/MainMenu.xib Interfaces/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 093a4958c..76521fa89 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Interfaces/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Interfaces/MainMenu.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,14 +28,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <action selector="showTipOfTheDay:" target="201" id="mc2-ec-uGY"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </menuItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <menuItem isSeparatorItem="YES" id="Dxk-DH-qzi">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </menuItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <menuItem title="Check For Updates…" identifier="Check For Updates…" id="880">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <action selector="checkForUpdatesFromMenu:" target="201" id="vmh-LD-TwW"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </menuItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <menuItem isSeparatorItem="YES" id="Dpc-y9-dq3">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </menuItem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1336,7 +1328,6 @@ DQ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="maximizePane" destination="1233" id="1237"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="selectTab" destination="847" id="863"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="showFullScreenTabs" destination="1257" id="1260"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <outlet property="suUpdater" destination="879" id="FRj-mW-Vma"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="toolbeltMenu" destination="1296" id="1299"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="useTransparency" destination="1228" id="1230"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="windowArrangementsAsTabs_" destination="z6V-EJ-Ntf" id="wse-Wc-WVw"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1344,7 +1335,6 @@ DQ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </customObject>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <customObject id="266" userLabel="Font Manager" customClass="NSFontManager"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <customObject id="879" userLabel="SUUpdater" customClass="SUUpdater"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <menuItem isSeparatorItem="YES" id="TYx-JS-5H0"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <menuItem title="Mouse Reporting" id="y5H-9R-t1f">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <modifierMask key="keyEquivalentModifierMask"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Interfaces/PreferencePanel.xib Interfaces/PreferencePanel.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e0df82e16..e9716d6fb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Interfaces/PreferencePanel.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Interfaces/PreferencePanel.xib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1225,8 +1225,6 @@ DQ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="_autoHideTmuxClientSession" destination="6366" id="V9B-um-JRL"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="_autoSaveOnQuit" destination="tYA-B3-SU5" id="9Yr-NX-xsX"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="_browseCustomFolder" destination="5618" id="0Ty-gp-K5Q"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <outlet property="_checkTestRelease" destination="5049" id="mCk-NA-PO2"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <outlet property="_checkUpdate" destination="5048" id="Oi0-3Y-fu1"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="_confirmClosingMultipleSessions" destination="1996" id="1wi-R8-LGb"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="_copyLastNewline" destination="5747" id="y4f-IT-rUT"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <outlet property="_doubleClickPerformsSmartSelection" destination="wgv-Ah-fFr" id="OZU-W2-nQN"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4705,30 +4703,6 @@ DQ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </buttonCell>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <action selector="settingChanged:" target="9Se-ld-UJa" id="eVv-Yn-zdl"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <outlet property="nextKeyView" destination="5048" id="uHG-f2-Hoi"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </button>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5049">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <rect key="frame" x="18" y="18" width="195" height="18"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <buttonCell key="cell" type="check" title="Update to Beta test releases" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="5065">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <font key="font" metaFont="system"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </buttonCell>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <action selector="settingChanged:" target="9Se-ld-UJa" id="jqK-dm-ssy"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </button>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5048">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <rect key="frame" x="18" y="38" width="287" height="18"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <buttonCell key="cell" type="check" title="Check for updates automatically" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="5066">
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <font key="font" metaFont="system"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- </buttonCell>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <action selector="settingChanged:" target="9Se-ld-UJa" id="SDz-wA-BhL"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- <outlet property="nextKeyView" destination="5049" id="5197"/>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </connections>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </button>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ </subviews>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git sources/GeneralPreferencesViewController.m sources/GeneralPreferencesViewController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 572346fd9..0b437dd2f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sources/GeneralPreferencesViewController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sources/GeneralPreferencesViewController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,12 +64,6 @@ enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Enable bonjour
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IBOutlet NSButton *_enableBonjour;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Check for updates automatically
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IBOutlet NSButton *_checkUpdate;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // Prompt for test-release updates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IBOutlet NSButton *_checkTestRelease;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Load prefs from custom folder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IBOutlet NSButton *_loadPrefsFromCustomFolder; // Should load?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IBOutlet NSTextField *_prefsCustomFolder; // Path or URL text field
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -304,16 +298,6 @@ enum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ relatedView:nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ type:kPreferenceInfoTypeCheckbox];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [self defineControl:_checkUpdate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- key:kPreferenceKeyCheckForUpdatesAutomatically
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- relatedView:nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- type:kPreferenceInfoTypeCheckbox];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [self defineControl:_checkTestRelease
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- key:kPreferenceKeyCheckForTestReleases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- relatedView:nil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- type:kPreferenceInfoTypeCheckbox];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // ---------------------------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ info = [self defineControl:_loadPrefsFromCustomFolder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ key:kPreferenceKeyLoadPrefsFromCustomFolder
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git sources/iTermApplicationDelegate.m sources/iTermApplicationDelegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1702d1cb0..20e8949f9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sources/iTermApplicationDelegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sources/iTermApplicationDelegate.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,7 +182,6 @@ static BOOL hasBecomeActive = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IBOutlet NSMenuItem *showFullScreenTabs;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IBOutlet NSMenuItem *useTransparency;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IBOutlet NSMenuItem *maximizePane;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IBOutlet SUUpdater * suUpdater;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IBOutlet NSMenuItem *_showTipOfTheDay; // Here because we must remove it for older OS versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOL quittingBecauseLastWindowClosed_;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1190,11 +1189,6 @@ static BOOL hasBecomeActive = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [self updateBuriedSessionsMenu:_statusIconBuriedSessions];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- item = [[[NSMenuItem alloc] initWithTitle:@"Check For Updates"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- action:@selector(checkForUpdatesFromMenu:)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- keyEquivalent:@""] autorelease];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [menu addItem:item];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ item = [[[NSMenuItem alloc] initWithTitle:@"Quit iTerm2"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ action:@selector(terminate:)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ keyEquivalent:@""] autorelease];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1350,7 +1344,6 @@ static BOOL hasBecomeActive = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ silenceable:kiTermWarningTypeSilenceableForOneMonth
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ window:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (selection == kiTermWarningSelection1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [[SUUpdater sharedUpdater] checkForUpdates:nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1473,7 +1466,6 @@ static BOOL hasBecomeActive = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (IBAction)checkForUpdatesFromMenu:(id)sender {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [suUpdater checkForUpdates:(sender)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma mark - Main Menu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git sources/iTermController.m sources/iTermController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5054f89d9..a5fef1132 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sources/iTermController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sources/iTermController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1175,7 +1175,7 @@ static iTermController *gSharedInstance;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - (void)refreshSoftwareUpdateUserDefaults {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BOOL checkForTestReleases = [iTermPreferences boolForKey:kPreferenceKeyCheckForTestReleases];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOL checkForTestReleases = NO;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSString *appCast = checkForTestReleases ?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForTesting"] :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [[NSBundle mainBundle] objectForInfoDictionaryKey:@"SUFeedURLForFinal"];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git sources/iTermLaunchExperienceController.m sources/iTermLaunchExperienceController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2a31322d1..d89935b0c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sources/iTermLaunchExperienceController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sources/iTermLaunchExperienceController.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,7 +110,7 @@ typedef NS_ENUM(NSUInteger, iTermLaunchExperienceChoice) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self = [super init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (self) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const NSInteger runCount = [iTermLaunchExperienceController incrementRunCount];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (runCount == 2 && ![[SUUpdater sharedUpdater] automaticallyChecksForUpdates]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (runCount == 2) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Sparkle will do its thing this launch.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _choice = iTermLaunchExperienceChoiceNone;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if ([iTermLaunchExperienceController quelled]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git sources/iTermPreferences.m sources/iTermPreferences.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 04b1fe381..629f2377f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- sources/iTermPreferences.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ sources/iTermPreferences.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -279,7 +279,7 @@ static NSString *sPreviousVersion;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kPreferenceKeyInstantReplayMemoryMegabytes: @4,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kPreferenceKeySavePasteAndCommandHistory: @NO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kPreferenceKeyAddBonjourHostsToProfiles: @NO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- kPreferenceKeyCheckForUpdatesAutomatically: @YES,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ kPreferenceKeyCheckForUpdatesAutomatically: @NO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kPreferenceKeyCheckForTestReleases: @NO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kPreferenceKeyLoadPrefsFromCustomFolder: @NO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kPreferenceKeyNeverRemindPrefsChangesLostForFileHaveSelection: @NO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.29.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>