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

Fix brightray::GetApplicationName(), ..Version() on Linux (#11980)

Browse source 
* add brightray API to override app version

* in atom browser, use brightray app version API

* on Linux, have GetApplicationVersion() use brightray version API

* on Linux, implement brightray::GetApplicationName()

* fix typo in brightray API

* make browser.GetName() logic follow GetVersion() logic

* improve variable name in OverrideApplicationVersion declaration

* fix typo in brightray impl
This commit is contained in:
Charles Kerr 2018-02-20 10:16:51 -06:00 • committed by GitHub
parent dc62e51ba4
commit 8d086a43cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 84 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

60
atom/common/linux/application_info.cc
View file

@ -2,18 +2,74 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include "brightray/common/application_info.h"
#include <gio/gdesktopappinfo.h>
#include <gio/gio.h>
#include <memory>
#include <string>
#include "atom/common/atom_version.h"
#include "base/environment.h"
#include "base/logging.h"
#include "chrome/browser/ui/libgtkui/gtk_util.h"
namespace {
GDesktopAppInfo* get_desktop_app_info() {
std::unique_ptr<base::Environment> env(base::Environment::Create());
const std::string desktop_id = libgtkui::GetDesktopName(env.get());
return desktop_id.empty() ? nullptr
: g_desktop_app_info_new(desktop_id.c_str());
}
} // namespace
namespace brightray {
std::string GetApplicationName() {
return ATOM_PRODUCT_NAME;
// attempt #1: the string set in app.setName()
std::string ret = GetOverriddenApplicationName();
// attempt #2: the 'Name' entry from .desktop file's [Desktop] section
if (ret.empty()) {
GDesktopAppInfo* info = get_desktop_app_info();
if (info != nullptr) {
char* str = g_desktop_app_info_get_string(info, "Name");
g_clear_object(&info);
if (str != nullptr)
ret = str;
g_clear_pointer(&str, g_free);
}
}
// attempt #3: Electron's name
if (ret.empty()) {
ret = ATOM_PRODUCT_NAME;
}
return ret;
}
std::string GetApplicationVersion() {
return ATOM_VERSION_STRING;
std::string ret;
// ensure ATOM_PRODUCT_NAME and ATOM_PRODUCT_STRING match up
if (GetApplicationName() == ATOM_PRODUCT_NAME)
ret = ATOM_VERSION_STRING;
// try to use the string set in app.setVersion()
if (ret.empty())
ret = GetOverriddenApplicationVersion();
// no known version number; return some safe fallback
if (ret.empty()) {
LOG(WARNING) << "No version found. Was app.setVersion() called?";
ret = "0.0";
}
return ret;
}
} // namespace brightray