[gnome-shell] tests: Don't initialize Clutter
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] tests: Don't initialize Clutter
- Date: Tue, 27 Aug 2019 17:36:50 +0000 (UTC)
commit 8ac5be95d3587855f791543ba6f04c318b95e345
Author: Florian Müllner <fmuellner gnome org>
Date: Sun Aug 25 10:39:04 2019 +0300
tests: Don't initialize Clutter
Clutter's backend code depends on MetaBackend now, which makes it
impossible to initialize without resorting to private mutter API.
Luckily we only need Clutter for interactive tests which are broken
anyway, as Clutter.main() and friends were removed a while ago.
So for now, get at least unit tests working again by simply the
unnecessary Clutter initialization.
https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/691
src/run-js-test.c | 14 --------------
1 file changed, 14 deletions(-)
---
diff --git a/src/run-js-test.c b/src/run-js-test.c
index 172ec179f2..ba5e875e87 100644
--- a/src/run-js-test.c
+++ b/src/run-js-test.c
@@ -30,11 +30,8 @@
#include <stdlib.h>
#include <string.h>
-#include <clutter/x11/clutter-x11.h>
-#include <gdk/gdkx.h>
#include <girepository.h>
#include <gjs/gjs.h>
-#include <gtk/gtk.h>
#include "shell-global.h"
#include "shell-global-private.h"
@@ -59,17 +56,6 @@ main(int argc, char **argv)
gsize len;
int code;
- gdk_set_allowed_backends("x11");
-
- gtk_init (&argc, &argv);
-
- clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-
- if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
- return 1;
-
- gdk_x11_display_set_window_scale (gdk_display_get_default (), 1);
-
context = g_option_context_new (NULL);
/* pass unknown through to the JS script */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]