From 3bc2ab7a6ab54cbfd9cdc930b01255c805cc042e Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sat, 24 Aug 2024 14:00:38 +0200 Subject: [PATCH] x11/shadow-factory: Remove unused APIs As it is a private type now, clean up unused bits Part-of: --- src/compositor/meta-window-actor-x11.c | 9 ---- src/x11/meta-shadow-factory.c | 62 +------------------------- src/x11/meta-shadow-factory.h | 7 --- 3 files changed, 1 insertion(+), 77 deletions(-) diff --git a/src/compositor/meta-window-actor-x11.c b/src/compositor/meta-window-actor-x11.c index 74725e1a0..4816946c5 100644 --- a/src/compositor/meta-window-actor-x11.c +++ b/src/compositor/meta-window-actor-x11.c @@ -86,7 +86,6 @@ struct _MetaWindowActorX11 char *shadow_class; MetaShadowFactory *shadow_factory; - gulong shadow_factory_changed_handler_id; MetaShadowMode shadow_mode; @@ -1570,9 +1569,6 @@ meta_window_actor_x11_dispose (GObject *object) MetaWindowActorX11 *actor_x11 = META_WINDOW_ACTOR_X11 (object); MetaSurfaceActor *surface_actor; - g_clear_signal_handler (&actor_x11->shadow_factory_changed_handler_id, - actor_x11->shadow_factory); - if (actor_x11->send_frame_messages_timer != 0) remove_frame_messages_timer (actor_x11); @@ -1655,9 +1651,4 @@ meta_window_actor_x11_init (MetaWindowActorX11 *self) G_CALLBACK (handle_stage_views_changed), NULL); self->shadow_factory = meta_shadow_factory_get_default (); - self->shadow_factory_changed_handler_id = - g_signal_connect_swapped (self->shadow_factory, - "changed", - G_CALLBACK (invalidate_shadow), - self); } diff --git a/src/x11/meta-shadow-factory.c b/src/x11/meta-shadow-factory.c index b061006e3..8c7fe9a6c 100644 --- a/src/x11/meta-shadow-factory.c +++ b/src/x11/meta-shadow-factory.c @@ -100,15 +100,6 @@ struct _MetaShadowFactory GHashTable *shadow_classes; }; -enum -{ - CHANGED, - - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL] = { 0 }; - /* The first element in this array also defines the default parameters * for newly created classes */ MetaShadowClassInfo default_shadow_classes[] = { @@ -439,20 +430,6 @@ meta_shadow_factory_class_init (MetaShadowFactoryClass *klass) GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = meta_shadow_factory_finalize; - - signals[CHANGED] = - g_signal_new ("changed", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, NULL, - G_TYPE_NONE, 0); -} - -MetaShadowFactory * -meta_shadow_factory_new (void) -{ - return g_object_new (META_TYPE_SHADOW_FACTORY, NULL); } /** @@ -466,7 +443,7 @@ meta_shadow_factory_get_default (void) static MetaShadowFactory *factory; if (factory == NULL) - factory = meta_shadow_factory_new (); + factory = g_object_new (META_TYPE_SHADOW_FACTORY, NULL); return factory; } @@ -1127,43 +1104,6 @@ meta_shadow_factory_get_shadow (MetaShadowFactory *factory, return shadow; } -/** - * meta_shadow_factory_set_params: - * @factory: a #MetaShadowFactory - * @class_name: name of the class of shadow to set the params for. - * the default shadow classes are the names of the different - * theme frame types (normal, dialog, modal_dialog, utility, - * border, menu, attached) and in addition, popup-menu - * and dropdown-menu. - * @focused: whether the shadow is for a focused window - * @params: new parameter values - * - * Updates the shadow parameters for a particular class of shadows - * for either the focused or unfocused state. If the class name - * does not name an existing class, a new class will be created - * (the other focus state for that class will have default values - * assigned to it.) - */ -void -meta_shadow_factory_set_params (MetaShadowFactory *factory, - const char *class_name, - gboolean focused, - MetaShadowParams *params) -{ - MetaShadowParams *stored_params; - - g_return_if_fail (META_IS_SHADOW_FACTORY (factory)); - g_return_if_fail (class_name != NULL); - g_return_if_fail (params != NULL); - g_return_if_fail (params->radius >= 0); - - stored_params = get_shadow_params (factory, class_name, focused, TRUE); - - *stored_params = *params; - - g_signal_emit (factory, signals[CHANGED], 0); -} - /** * meta_shadow_factory_get_params: * @factory: a #MetaShadowFactory diff --git a/src/x11/meta-shadow-factory.h b/src/x11/meta-shadow-factory.h index 203b9395d..c29c20abc 100644 --- a/src/x11/meta-shadow-factory.h +++ b/src/x11/meta-shadow-factory.h @@ -70,11 +70,6 @@ G_DECLARE_FINAL_TYPE (MetaShadowFactory, */ MetaShadowFactory *meta_shadow_factory_get_default (void); -void meta_shadow_factory_set_params (MetaShadowFactory *factory, - const char *class_name, - gboolean focused, - MetaShadowParams *params); - void meta_shadow_factory_get_params (MetaShadowFactory *factory, const char *class_name, gboolean focused, @@ -112,8 +107,6 @@ void meta_shadow_get_bounds (MetaShadow *shadow, int window_height, MtkRectangle *bounds); -MetaShadowFactory *meta_shadow_factory_new (void); - MetaShadow *meta_shadow_factory_get_shadow (MetaShadowFactory *factory, MetaWindowShape *shape, int width,