mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix API changes on Linux

Browse source
This commit is contained in:
Cheng Zhao 2015-09-02 17:30:07 +08:00
parent 262b66b93a
commit 4254eb279f
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/ui/file_dialog_gtk.cc
View file

@ -22,7 +22,7 @@ gboolean FileFilterCaseInsensitive(const GtkFileFilterInfo* file_info,
// Makes .* file extension matches all file types. // Makes .* file extension matches all file types.
if (*file_extension == ".*") if (*file_extension == ".*")
return true; return true;
return EndsWith(file_info->filename, *file_extension, false); return base::EndsWith(file_info->filename, *file_extension, false);
} }
// Deletes |data| when gtk_file_filter_add_custom() is done with it. // Deletes |data| when gtk_file_filter_add_custom() is done with it.

2
atom/browser/ui/x/x_window_utils.cc
View file

@ -41,7 +41,7 @@ void SetWindowType(::Window xwindow, const std::string& type) {
XDisplay* xdisplay = gfx::GetXDisplay(); XDisplay* xdisplay = gfx::GetXDisplay();
std::string type_prefix = "_NET_WM_WINDOW_TYPE_"; std::string type_prefix = "_NET_WM_WINDOW_TYPE_";
::Atom window_type = XInternAtom( ::Atom window_type = XInternAtom(
xdisplay, (type_prefix + StringToUpperASCII(type)).c_str(), False); xdisplay, (type_prefix + base::StringToUpperASCII(type)).c_str(), False);
XChangeProperty(xdisplay, xwindow, XChangeProperty(xdisplay, xwindow,
XInternAtom(xdisplay, "_NET_WM_WINDOW_TYPE", False), XInternAtom(xdisplay, "_NET_WM_WINDOW_TYPE", False),
XA_ATOM, XA_ATOM,