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

Use DBus to detect indicator, not testing for files like an animal

Browse source
This commit is contained in:
Paul Betts 2015-04-20 15:31:24 -07:00
parent 7c52838ece
commit 5d82bab10d
1 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,13 +12,44 @@
#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 <sys/stat.h>
namespace brightray { namespace brightray {
namespace { namespace {
static bool unity_has_result = false;
static bool unity_result = false;
static bool UnityIsRunning() {
if (unity_has_result) {
return unity_result;
}
struct DBusError err;
struct DBusConnection* bus;
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;
goto out;
}
unity_result = dbus_bus_name_has_owner(bus, "com.canonical.indicator.session", &err);
if (dbus_error_is_set(&err)) {
unity_result = false;
}
out:
unity_has_result = true;
return unity_result;
}
void log_and_clear_error(GError* error, const char* context) { void log_and_clear_error(GError* error, const char* context) {
LOG(ERROR) << context LOG(ERROR) << context
<< ": domain=" << error->domain << ": domain=" << error->domain
@ -69,10 +100,9 @@ void NotificationPresenterLinux::ShowNotification(
// NB: On Unity, adding a notification action will cause the notification // NB: On Unity, adding a notification action will cause the notification
// to display as a modal dialog box. Testing for distros that have "Unity // to display as a modal dialog box. Testing for distros that have "Unity
// Zen Nature" is difficult, we will test for the presence of libindicate, // Zen Nature" is difficult, we will test for the presence of the indicate
// an Unity-only library. // dbus service
struct stat dontcare; if (!UnityIsRunning()) {
if (stat("/usr/lib/libindicate.so", &dontcare)) {
notify_notification_add_action(notification, "default", "View", OnNotificationViewThunk, this, nullptr); notify_notification_add_action(notification, "default", "View", OnNotificationViewThunk, this, nullptr);
} }