From ced7ac7f11d3a44e8292c1d5a6033f47783e1240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
Date: Fri, 20 Dec 2024 19:08:49 +0100
Subject: [PATCH] Revert "Exit early in non-X11 environments"
This reverts commit 752432505d6c1ee9a341266d890425e735038b7e.
Real fix coming in next commits.
---
savers/floaters.c | 6 ------
savers/popsquares.c | 6 ------
savers/slideshow.c | 6 ------
src/xfce4-screensaver-dialog.c | 5 -----
src/xfce4-screensaver-gl-helper.c | 5 -----
src/xfce4-screensaver-preferences.c | 5 -----
src/xfce4-screensaver.c | 6 ------
7 files changed, 39 deletions(-)
diff --git a/savers/floaters.c b/savers/floaters.c
index f9ffd2b..7efb492 100644
--- a/savers/floaters.c
+++ b/savers/floaters.c
@@ -35,7 +35,6 @@
#include <glib.h>
#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <libxfce4util/libxfce4util.h>
@@ -1142,11 +1141,6 @@ main (int argc,
return EX_SOFTWARE;
}
- if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ())) {
- g_warning ("Unsupported windowing environment");
- return EX_SOFTWARE;
- }
-
if ((filenames == NULL) || (filenames[0] == NULL) ||
(filenames[1] != NULL)) {
g_printerr (_("You must specify one image. See --help for usage "
diff --git a/savers/popsquares.c b/savers/popsquares.c
index d447fdb..64f9ea3 100644
--- a/savers/popsquares.c
+++ b/savers/popsquares.c
@@ -25,7 +25,6 @@
#include <string.h>
#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
#include <libxfce4util/libxfce4util.h>
@@ -51,11 +50,6 @@ main (int argc,
return EXIT_FAILURE;
}
- if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ())) {
- g_warning ("Unsupported windowing environment");
- return EXIT_FAILURE;
- }
-
window = gs_theme_window_new ();
g_signal_connect (G_OBJECT (window), "destroy",
G_CALLBACK (gtk_main_quit), NULL);
diff --git a/savers/slideshow.c b/savers/slideshow.c
index 8770a8a..623b868 100644
--- a/savers/slideshow.c
+++ b/savers/slideshow.c
@@ -29,7 +29,6 @@
#include <glib.h>
#include <glib/gstdio.h>
#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
#include <libxfce4util/libxfce4util.h>
@@ -88,11 +87,6 @@ main (int argc, char **argv) {
return EXIT_FAILURE;
}
- if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ())) {
- g_warning ("Unsupported windowing environment");
- return EXIT_FAILURE;
- }
-
g_chdir (g_get_home_dir ());
g_set_prgname ("slideshow");
diff --git a/src/xfce4-screensaver-dialog.c b/src/xfce4-screensaver-dialog.c
index 3a6330d..880e781 100644
--- a/src/xfce4-screensaver-dialog.c
+++ b/src/xfce4-screensaver-dialog.c
@@ -495,11 +495,6 @@ int main(int argc,
return EXIT_SUCCESS;
}
- if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ())) {
- g_warning ("Unsupported windowing environment");
- return EXIT_FAILURE;
- }
-
if (!xfconf_init(&error)) {
g_error("Failed to connect to xfconf daemon: %s.", error->message);
g_error_free(error);
diff --git a/src/xfce4-screensaver-gl-helper.c b/src/xfce4-screensaver-gl-helper.c
index 377747b..3d950cd 100644
--- a/src/xfce4-screensaver-gl-helper.c
+++ b/src/xfce4-screensaver-gl-helper.c
@@ -51,11 +51,6 @@ main (int argc,
return EXIT_FAILURE;
}
- if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ())) {
- g_warning ("Unsupported windowing environment");
- return EXIT_FAILURE;
- }
-
display = gdk_display_get_default ();
visual = gs_visual_gl_get_best_for_display (display);
diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
index c5384c6..ad89839 100644
--- a/src/xfce4-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -2026,11 +2026,6 @@ main (int argc,
return EXIT_FAILURE;
}
- if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ())) {
- g_warning ("Unsupported windowing environment");
- return EXIT_FAILURE;
- }
-
/* hook to make sure the libxfce4ui library is linked */
if (xfce_titled_dialog_get_type() == 0)
return EXIT_FAILURE;
diff --git a/src/xfce4-screensaver.c b/src/xfce4-screensaver.c
index 22c7631..b190d2b 100644
--- a/src/xfce4-screensaver.c
+++ b/src/xfce4-screensaver.c
@@ -32,7 +32,6 @@
#include <sys/wait.h>
#include <unistd.h>
-#include <gdk/gdkx.h>
#include <gtk/gtk.h>
#include <libxfce4util/libxfce4util.h>
@@ -78,11 +77,6 @@ int main(int argc,
return EXIT_SUCCESS;
}
- if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ())) {
- g_warning ("Unsupported windowing environment");
- return EXIT_FAILURE;
- }
-
if (!xfconf_init(&error)) {
g_error("Failed to connect to xfconf daemon: %s.", error->message);
g_error_free(error);
--
GitLab