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

Merge pull request #147 from atom/gnotify

Browse source 
Rewrite Ubuntu check to look for libunity .so files
This commit is contained in:
Cheng Zhao 2015-10-01 17:15:19 +08:00
commit 1f2d934d9d
1 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
brightray/browser/linux/notification_presenter_linux.cc
View file

@ -7,14 +7,18 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/files/file_enumerator.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h" #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h"
#include "content/public/browser/desktop_notification_delegate.h" #include "content/public/browser/desktop_notification_delegate.h"
#include "content/public/common/platform_notification_data.h" #include "content/public/common/platform_notification_data.h"
#include "common/application_info.h" #include "common/application_info.h"
#include "dbus/dbus.h" #include <stdlib.h>
#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkBitmap.h"
using namespace base;
using namespace std;
namespace brightray { namespace brightray {
namespace { namespace {
@ -23,34 +27,34 @@ static bool unity_has_result = false;
static bool unity_result = false; static bool unity_result = false;
static bool UnityIsRunning() { static bool UnityIsRunning() {
FileEnumerator* enumerator = NULL;
if (unity_has_result) { if (unity_has_result) {
return unity_result; return unity_result;
} }
struct DBusError err; if (getenv("ELECTRON_USE_UBUNTU_NOTIFIER")) {
struct DBusConnection* bus = NULL; unity_result = true;
dbus_error_init(&err);
bus = dbus_bus_get(DBUS_BUS_SESSION, &err);
if (dbus_error_is_set(&err)) {
g_debug("Failed to get Session Bus reference");
unity_result = false;
dbus_error_free(&err);
goto out; goto out;
} }
unity_result = dbus_bus_name_has_owner(bus, "com.canonical.indicator.session", &err); // Look for the presence of libunity as our hint that we're under Ubuntu
FilePath haystack;
string needle("/usr/lib/libunity-");
if (dbus_error_is_set(&err)) { enumerator = new FileEnumerator(FilePath("/usr/lib"), false, FileEnumerator::FILES);
unity_result = false;
dbus_error_free(&err); while (!((haystack = enumerator->Next()).empty())) {
if (haystack.value().compare(0, needle.length(), needle) == 0) {
unity_result = true;
goto out;
}
} }
out: unity_result = false;
if (bus) dbus_connection_unref(bus);
out:
if (enumerator) delete enumerator;
unity_has_result = true; unity_has_result = true;
return unity_result; return unity_result;
} }