mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
176abdbd80
* Newer CI images (#12188) * Bump electronbuilds/electron* versions The linux-appname branch has been gathering dust for awhile. Some of the versions in `master` are higher, and some of the versions in `linux-appname` are higher to add libnotify. This commit takes the higher of the two numbers in each case. * Add libnotify to the Dockerfiles * Linux named notifications (#12192) * Set name & desktop-entry on Linux notifications * DBusMock now honors verbose mode flag * Disable DBus Notification tests on ia32 * Fix desktop-id notification edge case (#12216) * Fix desktop-id notification edge case * Extract-method platform_util::GetDesktopName() This removes duplicated code from libnotify_notifications.cc and atom/common/linux/application_info.cc. * Check for empty case in GetDesktopName(). * Move GetDesktopName() to brightray::util * Remove unnecessary changes in platform_util * Add a brightray::platform_util namespace * Bump CI
31 lines
771 B
C++
31 lines
771 B
C++
// Copyright (c) 2018 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "brightray/common/platform_util.h"
|
|
|
|
#include "base/environment.h"
|
|
#include "chrome/browser/ui/libgtkui/gtk_util.h"
|
|
|
|
namespace brightray {
|
|
|
|
namespace platform_util {
|
|
|
|
bool GetDesktopName(std::string* setme) {
|
|
bool found = false;
|
|
|
|
std::unique_ptr<base::Environment> env(base::Environment::Create());
|
|
std::string desktop_id = libgtkui::GetDesktopName(env.get());
|
|
constexpr char const* libcc_default_id = "chromium-browser.desktop";
|
|
if (!desktop_id.empty() && (desktop_id != libcc_default_id)) {
|
|
*setme = desktop_id;
|
|
found = true;
|
|
}
|
|
|
|
return found;
|
|
}
|
|
|
|
} // namespace platform_util
|
|
|
|
} // namespace brightray
|