[gnome-settings-daemon/wip/carlosg/remove-device-mapper: 75/84] plugins: Add GDK_BACKEND #define for the GTK+ skeleton
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/wip/carlosg/remove-device-mapper: 75/84] plugins: Add GDK_BACKEND #define for the GTK+ skeleton
- Date: Thu, 6 Dec 2018 15:56:24 +0000 (UTC)
commit 562ead5820a89679891655bd77d8c43878e70821
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed Aug 1 16:16:54 2018 +0200
plugins: Add GDK_BACKEND #define for the GTK+ skeleton
Not all plugins that use GDK mandate X11. Leave the allowed GDK
backend (if any) as an individual plugin decision.
plugins/clipboard/main.c | 1 +
plugins/color/main.c | 1 +
plugins/common/daemon-skeleton-gtk.h | 4 +++-
plugins/keyboard/main.c | 1 +
plugins/media-keys/main.c | 1 +
plugins/power/main.c | 1 +
plugins/wacom/main.c | 1 +
plugins/xsettings/main.c | 1 +
8 files changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/plugins/clipboard/main.c b/plugins/clipboard/main.c
index 3c38d9bb..d1838afc 100644
--- a/plugins/clipboard/main.c
+++ b/plugins/clipboard/main.c
@@ -2,6 +2,7 @@
#define START gsd_clipboard_manager_start
#define STOP gsd_clipboard_manager_stop
#define MANAGER GsdClipboardManager
+#define GDK_BACKEND "x11"
#include "gsd-clipboard-manager.h"
#include "daemon-skeleton-gtk.h"
diff --git a/plugins/color/main.c b/plugins/color/main.c
index 5dda3e78..33bb60a3 100644
--- a/plugins/color/main.c
+++ b/plugins/color/main.c
@@ -2,6 +2,7 @@
#define START gsd_color_manager_start
#define STOP gsd_color_manager_stop
#define MANAGER GsdColorManager
+#define GDK_BACKEND "x11"
#include "gsd-color-manager.h"
#include "daemon-skeleton-gtk.h"
diff --git a/plugins/common/daemon-skeleton-gtk.h b/plugins/common/daemon-skeleton-gtk.h
index 2194b3d6..49c7ad5d 100644
--- a/plugins/common/daemon-skeleton-gtk.h
+++ b/plugins/common/daemon-skeleton-gtk.h
@@ -199,7 +199,9 @@ main (int argc, char **argv)
set_empty_gtk_theme (TRUE);
- gdk_set_allowed_backends ("x11");
+#ifdef GDK_BACKEND
+ gdk_set_allowed_backends (GDK_BACKEND);
+#endif
error = NULL;
if (! gtk_init_with_args (&argc, &argv, PLUGIN_NAME, entries, NULL, &error)) {
diff --git a/plugins/keyboard/main.c b/plugins/keyboard/main.c
index 48fce06b..9acec431 100644
--- a/plugins/keyboard/main.c
+++ b/plugins/keyboard/main.c
@@ -2,6 +2,7 @@
#define START gsd_keyboard_manager_start
#define STOP gsd_keyboard_manager_stop
#define MANAGER GsdKeyboardManager
+#define GDK_BACKEND "x11"
#include "gsd-keyboard-manager.h"
#include "daemon-skeleton-gtk.h"
diff --git a/plugins/media-keys/main.c b/plugins/media-keys/main.c
index fab28f61..c53831bb 100644
--- a/plugins/media-keys/main.c
+++ b/plugins/media-keys/main.c
@@ -2,6 +2,7 @@
#define START gsd_media_keys_manager_start
#define STOP gsd_media_keys_manager_stop
#define MANAGER GsdMediaKeysManager
+#define GDK_BACKEND "x11"
#include "gsd-media-keys-manager.h"
#include "daemon-skeleton-gtk.h"
diff --git a/plugins/power/main.c b/plugins/power/main.c
index 4b851ed7..95f46a5b 100644
--- a/plugins/power/main.c
+++ b/plugins/power/main.c
@@ -2,6 +2,7 @@
#define START gsd_power_manager_start
#define STOP gsd_power_manager_stop
#define MANAGER GsdPowerManager
+#define GDK_BACKEND "x11"
#include "gsd-power-manager.h"
#include "daemon-skeleton-gtk.h"
diff --git a/plugins/wacom/main.c b/plugins/wacom/main.c
index a19a71bb..c7ae3378 100644
--- a/plugins/wacom/main.c
+++ b/plugins/wacom/main.c
@@ -2,6 +2,7 @@
#define START gsd_wacom_manager_start
#define STOP gsd_wacom_manager_stop
#define MANAGER GsdWacomManager
+#define GDK_BACKEND "x11"
#include "gsd-wacom-manager.h"
#include "daemon-skeleton-gtk.h"
diff --git a/plugins/xsettings/main.c b/plugins/xsettings/main.c
index 67501ae1..072c5bf1 100644
--- a/plugins/xsettings/main.c
+++ b/plugins/xsettings/main.c
@@ -2,6 +2,7 @@
#define START gnome_xsettings_manager_start
#define STOP gnome_xsettings_manager_stop
#define MANAGER GnomeXSettingsManager
+#define GDK_BACKEND "x11"
#include "gsd-xsettings-manager.h"
#include "daemon-skeleton-gtk.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]