[mutter] cally: Remove CallyTexture
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cally: Remove CallyTexture
- Date: Wed, 13 Nov 2019 14:14:52 +0000 (UTC)
commit ec1c94d4a7f7f3d21f1a23641557a6c82aa9889a
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Tue Nov 12 19:36:35 2019 +0100
cally: Remove CallyTexture
CallyTexture is an accessibility object associated with ClutterTexture.
ClutterTexture is going away, so prepare by first removing the
accessibility object that would be constructed for it.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/932
clutter/clutter/cally/cally-texture.c | 98 -----------------------------------
clutter/clutter/cally/cally-texture.h | 84 ------------------------------
clutter/clutter/cally/cally.c | 3 --
clutter/clutter/cally/cally.h | 1 -
clutter/clutter/meson.build | 2 -
5 files changed, 188 deletions(-)
---
diff --git a/clutter/clutter/cally/cally.c b/clutter/clutter/cally/cally.c
index 4e1b79ada..8b92682db 100644
--- a/clutter/clutter/cally/cally.c
+++ b/clutter/clutter/cally/cally.c
@@ -39,7 +39,6 @@
#include "cally-group.h"
#include "cally-stage.h"
#include "cally-text.h"
-#include "cally-texture.h"
#include "cally-rectangle.h"
#include "cally-clone.h"
@@ -56,7 +55,6 @@ CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_ACTOR, cally_actor, cally_actor_new)
CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_GROUP, cally_group, cally_group_new)
CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_STAGE, cally_stage, cally_stage_new)
CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_TEXT, cally_text, cally_text_new)
-CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_TEXTURE, cally_texture, cally_texture_new)
CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_RECTANGLE, cally_rectangle, cally_rectangle_new)
CALLY_ACCESSIBLE_FACTORY (CALLY_TYPE_CLONE, cally_clone, cally_clone_new)
@@ -78,7 +76,6 @@ cally_accessibility_init (void)
CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_GROUP, cally_group);
CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_STAGE, cally_stage);
CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_TEXT, cally_text);
- CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_TEXTURE, cally_texture);
CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_RECTANGLE, cally_rectangle);
CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_CLONE, cally_clone);
diff --git a/clutter/clutter/cally/cally.h b/clutter/clutter/cally/cally.h
index 11fa9fc6c..440c30be3 100644
--- a/clutter/clutter/cally/cally.h
+++ b/clutter/clutter/cally/cally.h
@@ -32,7 +32,6 @@
#include "cally-root.h"
#include "cally-stage.h"
#include "cally-text.h"
-#include "cally-texture.h"
#include "cally-util.h"
#undef __CALLY_H_INSIDE__
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index a2d2b1f88..ba43724cb 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -307,7 +307,6 @@ cally_headers = [
'cally/cally-root.h',
'cally/cally-stage.h',
'cally/cally-text.h',
- 'cally/cally-texture.h',
'cally/cally-util.h',
]
@@ -320,7 +319,6 @@ cally_sources = [
'cally/cally-root.c',
'cally/cally-stage.c',
'cally/cally-text.c',
- 'cally/cally-texture.c',
'cally/cally-util.c',
]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]