[gnome-control-center] common: Update from gnome-settings-daemon
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] common: Update from gnome-settings-daemon
- Date: Wed, 21 Jan 2015 13:26:44 +0000 (UTC)
commit 1be3811717ac3a3e8fbc4b112c4d01db3a1d150c
Author: Bastien Nocera <hadess hadess net>
Date: Wed Jan 21 13:02:26 2015 +0100
common: Update from gnome-settings-daemon
https://bugzilla.gnome.org/show_bug.cgi?id=743266
panels/common/gsd-device-manager.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/panels/common/gsd-device-manager.c b/panels/common/gsd-device-manager.c
index 9272234..aaf70bf 100644
--- a/panels/common/gsd-device-manager.c
+++ b/panels/common/gsd-device-manager.c
@@ -26,6 +26,7 @@
#include "gsd-device-manager-x11.h"
#include "gsd-device-manager-udev.h"
#include "gsd-common-enums.h"
+#include "gnome-settings-bus.h"
typedef struct _GsdDevicePrivate GsdDevicePrivate;
typedef struct _GsdDeviceManagerPrivate GsdDeviceManagerPrivate;
@@ -265,7 +266,7 @@ gsd_device_manager_get (void)
if (!manager) {
#ifdef HAVE_WAYLAND
- if (!GDK_IS_X11_SCREEN (screen))) {
+ if (gnome_settings_is_wayland ()) {
manager = g_object_new (GSD_TYPE_UDEV_DEVICE_MANAGER,
NULL);
} else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]