[mutter] clutter/main: Remove checking windowing system
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] clutter/main: Remove checking windowing system
- Date: Thu, 13 Aug 2020 16:00:31 +0000 (UTC)
commit 3566fa7bb0535c6c5a43134093e3c27cdc546b1d
Author: Jonas Ådahl <jadahl gmail com>
Date: Thu Jul 9 21:37:27 2020 +0200
clutter/main: Remove checking windowing system
Last user in gnome-shell removed with
https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1358.
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1364
clutter/clutter/clutter-main.c | 59 ------------------------------------------
clutter/clutter/clutter-main.h | 3 ---
2 files changed, 62 deletions(-)
---
diff --git a/clutter/clutter/clutter-main.c b/clutter/clutter/clutter-main.c
index 2e260244d3..2436545a8c 100644
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -69,13 +69,6 @@
#include "clutter-stage-private.h"
#include "clutter-backend-private.h"
-#ifdef CLUTTER_WINDOWING_X11
-#include "x11/clutter-backend-x11.h"
-#endif
-#ifdef CLUTTER_WINDOWING_EGL
-#include "egl/clutter-backend-eglnative.h"
-#endif
-
#include <cogl/cogl.h>
#include <cogl-pango/cogl-pango.h>
@@ -2443,58 +2436,6 @@ _clutter_context_get_pick_mode (void)
return context->pick_mode;
}
-/**
- * clutter_check_windowing_backend:
- * @backend_type: the name of the backend to check
- *
- * Checks the run-time name of the Clutter windowing system backend, using
- * the symbolic macros like %CLUTTER_WINDOWING_X11.
- *
- * This function should be used in conjuction with the compile-time macros
- * inside applications and libraries that are using the platform-specific
- * windowing system API, to ensure that they are running on the correct
- * windowing system; for instance:
- *
- * |[
- * #ifdef CLUTTER_WINDOWING_X11
- * if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11))
- * {
- * // it is safe to use the clutter_x11_* API
- * }
- * else
- * #endif
- * g_error ("Unknown Clutter backend.");
- * ]|
- *
- * Return value: %TRUE if the current Clutter windowing system backend is
- * the one checked, and %FALSE otherwise
- *
- * Since: 1.10
- */
-gboolean
-clutter_check_windowing_backend (const char *backend_type)
-{
- ClutterMainContext *context = _clutter_context_get_default ();
-
- g_return_val_if_fail (backend_type != NULL, FALSE);
-
- backend_type = g_intern_string (backend_type);
-
-#ifdef CLUTTER_WINDOWING_EGL
- if (backend_type == I_(CLUTTER_WINDOWING_EGL) &&
- CLUTTER_IS_BACKEND_EGL_NATIVE (context->backend))
- return TRUE;
- else
-#endif
-#ifdef CLUTTER_WINDOWING_X11
- if (backend_type == I_(CLUTTER_WINDOWING_X11) &&
- CLUTTER_IS_BACKEND_X11 (context->backend))
- return TRUE;
- else
-#endif
- return FALSE;
-}
-
/**
* clutter_add_debug_flags: (skip)
*
diff --git a/clutter/clutter/clutter-main.h b/clutter/clutter/clutter-main.h
index 32653f61a8..2523f73daf 100644
--- a/clutter/clutter/clutter-main.h
+++ b/clutter/clutter/clutter-main.h
@@ -194,9 +194,6 @@ ClutterTextDirection clutter_get_default_text_direction (void);
CLUTTER_EXPORT
guint clutter_get_default_frame_rate (void);
-CLUTTER_EXPORT
-gboolean clutter_check_windowing_backend (const char *backend_type);
-
CLUTTER_EXPORT
void clutter_add_debug_flags (ClutterDebugFlag debug_flags,
ClutterDrawDebugFlag draw_flags,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]