From ff4ff66498ec374fce5b22b8bc01b523d1304e0b Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Wed, 27 Oct 2021 19:21:08 +0200 Subject: [PATCH] Revert "st: Only use clutter_actor_invalidate_paint_volume() if the API exists" Since we are past the 40 API change hurdle, it is safe to revert this commit. This reverts commit 1cefd589da2edca84d19b285d553e2a68cda3e37. Part-of: --- meson.build | 1 - src/st/meson.build | 2 +- src/st/st-viewport.c | 16 +--------------- src/st/st-widget.c | 14 +------------- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/meson.build b/meson.build index f396bb5bf..d4583ecf2 100644 --- a/meson.build +++ b/meson.build @@ -80,7 +80,6 @@ gi_dep = dependency('gobject-introspection-1.0', version: gi_req) gio_dep = dependency('gio-2.0', version: gio_req) gio_unix_dep = dependency('gio-unix-2.0', version: gio_req) gjs_dep = dependency('gjs-1.0', version: gjs_req) -gmodule_dep = dependency('gmodule-2.0') gtk_dep = dependency('gtk+-3.0', version: gtk_req) libxml_dep = dependency('libxml-2.0') clutter_dep = dependency(clutter_pc, version: mutter_req) diff --git a/src/st/meson.build b/src/st/meson.build index 8004dfdbc..084fb2ee4 100644 --- a/src/st/meson.build +++ b/src/st/meson.build @@ -180,7 +180,7 @@ st_cflags = [ libst = shared_library('st-1.0', sources: st_gir_sources + st_nogir_sources + croco_sources, c_args: st_cflags, - dependencies: [clutter_dep, gmodule_dep, gtk_dep, mutter_dep, libxml_dep, m_dep], + dependencies: [clutter_dep, gtk_dep, mutter_dep, libxml_dep, m_dep], build_rpath: mutter_typelibdir, install_rpath: mutter_typelibdir, install_dir: pkglibdir, diff --git a/src/st/st-viewport.c b/src/st/st-viewport.c index 8aaaad54a..96b703b14 100644 --- a/src/st/st-viewport.c +++ b/src/st/st-viewport.c @@ -80,22 +80,8 @@ adjustment_value_notify_cb (StAdjustment *adjustment, GParamSpec *pspec, StViewport *viewport) { - static gboolean invalidate_paint_volume_valid = FALSE; - static void (* invalidate_paint_volume) (ClutterActor *) = NULL; - clutter_actor_invalidate_transform (CLUTTER_ACTOR (viewport)); - - if (!invalidate_paint_volume_valid) - { - g_module_symbol (g_module_open (NULL, G_MODULE_BIND_LAZY), - "clutter_actor_invalidate_paint_volume", - (gpointer *)&invalidate_paint_volume); - invalidate_paint_volume_valid = TRUE; - } - - if (invalidate_paint_volume) - invalidate_paint_volume (CLUTTER_ACTOR (viewport)); - + clutter_actor_invalidate_paint_volume (CLUTTER_ACTOR (viewport)); clutter_actor_queue_relayout (CLUTTER_ACTOR (viewport)); } diff --git a/src/st/st-widget.c b/src/st/st-widget.c index 644b8e25a..e2814e52e 100644 --- a/src/st/st-widget.c +++ b/src/st/st-widget.c @@ -1732,19 +1732,7 @@ st_widget_recompute_style (StWidget *widget, if (!paint_equal) { - static gboolean invalidate_paint_volume_valid = FALSE; - static void (* invalidate_paint_volume) (ClutterActor *) = NULL; - - if (!invalidate_paint_volume_valid) - { - g_module_symbol (g_module_open (NULL, G_MODULE_BIND_LAZY), - "clutter_actor_invalidate_paint_volume", - (gpointer *)&invalidate_paint_volume); - invalidate_paint_volume_valid = TRUE; - } - - if (invalidate_paint_volume) - invalidate_paint_volume (CLUTTER_ACTOR (widget)); + clutter_actor_invalidate_paint_volume (CLUTTER_ACTOR (widget)); next_paint_state (widget);