Compare commits

...

4 Commits

Author SHA1 Message Date
Cheng Zhao
5696d9a130 Bump v0.34.5 2015-11-26 14:12:28 +08:00
Cheng Zhao
3ac6b3c9e2 mac: Clears the delegate when window is going to be closed
Since EL Capitan it is possible that the methods of delegate would get
called after the window has been closed.

Refs atom/atom#9584.
2015-11-26 14:11:17 +08:00
Cheng Zhao
cb5273731f Bump v0.34.4 2015-11-24 18:19:10 +08:00
Cheng Zhao
aa40c6c260 Update libchromiumcontent
Backport https://codereview.chromium.org/1324513002.
2015-11-24 18:14:02 +08:00
6 changed files with 14 additions and 9 deletions

View File

@@ -4,7 +4,7 @@
'product_name%': 'Electron',
'company_name%': 'GitHub, Inc',
'company_abbr%': 'github',
'version%': '0.34.3',
'version%': '0.34.5',
},
'includes': [
'filenames.gypi',

View File

@@ -192,6 +192,11 @@ bool ScopedDisableResize::disable_resize_ = false;
- (void)windowWillClose:(NSNotification*)notification {
shell_->NotifyWindowClosed();
// Clears the delegate when window is going to be closed, since EL Capitan it
// is possible that the methods of delegate would get called after the window
// has been closed.
[shell_->GetNativeWindow() setDelegate:nil];
}
- (BOOL)windowShouldClose:(id)window {

View File

@@ -17,9 +17,9 @@
<key>CFBundleIconFile</key>
<string>atom.icns</string>
<key>CFBundleVersion</key>
<string>0.34.3</string>
<string>0.34.5</string>
<key>CFBundleShortVersionString</key>
<string>0.34.3</string>
<string>0.34.5</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.developer-tools</string>
<key>LSMinimumSystemVersion</key>

View File

@@ -56,8 +56,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,34,3,0
PRODUCTVERSION 0,34,3,0
FILEVERSION 0,34,5,0
PRODUCTVERSION 0,34,5,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -74,12 +74,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "GitHub, Inc."
VALUE "FileDescription", "Electron"
VALUE "FileVersion", "0.34.3"
VALUE "FileVersion", "0.34.5"
VALUE "InternalName", "electron.exe"
VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
VALUE "OriginalFilename", "electron.exe"
VALUE "ProductName", "Electron"
VALUE "ProductVersion", "0.34.3"
VALUE "ProductVersion", "0.34.5"
VALUE "SquirrelAwareVersion", "1"
END
END

View File

@@ -7,7 +7,7 @@
#define ATOM_MAJOR_VERSION 0
#define ATOM_MINOR_VERSION 34
#define ATOM_PATCH_VERSION 3
#define ATOM_PATCH_VERSION 5
#define ATOM_VERSION_IS_RELEASE 1

View File

@@ -8,7 +8,7 @@ import sys
BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
'http://gh-contractor-zcbenz.s3.amazonaws.com/libchromiumcontent'
LIBCHROMIUMCONTENT_COMMIT = '464aff2398f619b1d4d91b9187de69803919dca2'
LIBCHROMIUMCONTENT_COMMIT = '17a4337f7948a45b5ea4b8f391df152ba8db5979'
PLATFORM = {
'cygwin': 'win32',