diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2012-08-23 17:36:22 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-04-05 18:47:59 +0100 |
| commit | 4da1b8b523025e7a0fe8690b98718f6db3714839 (patch) | |
| tree | 2905f612655b075b8f2c24e0da79685e48cbe534 | |
| parent | 29c42bfe8e16dfe83b9d0e63847a86751b97c9f6 (diff) | |
| download | clutter-4da1b8b523025e7a0fe8690b98718f6db3714839.tar.gz | |
2.0: Drop deprecated classes from Cally
CallyGroup, CallyTexture, and CallyRectangle are not needed any more.
| -rw-r--r-- | clutter/cally/cally-stage.c | 2 | ||||
| -rw-r--r-- | clutter/cally/cally-stage.h | 4 | ||||
| -rw-r--r-- | clutter/cally/cally.c | 9 |
3 files changed, 3 insertions, 12 deletions
diff --git a/clutter/cally/cally-stage.c b/clutter/cally/cally-stage.c index 2b1cfd179..1e5ce0fa9 100644 --- a/clutter/cally/cally-stage.c +++ b/clutter/cally/cally-stage.c @@ -55,7 +55,7 @@ static void cally_stage_deactivate_cb (ClutterStage *stage, G_DEFINE_TYPE_WITH_CODE (CallyStage, cally_stage, - CALLY_TYPE_GROUP, + CALLY_TYPE_ACTOR, G_IMPLEMENT_INTERFACE (ATK_TYPE_WINDOW, cally_stage_window_interface_init)); diff --git a/clutter/cally/cally-stage.h b/clutter/cally/cally-stage.h index 7ce4bb21f..d4860a035 100644 --- a/clutter/cally/cally-stage.h +++ b/clutter/cally/cally-stage.h @@ -52,7 +52,7 @@ typedef struct _CallyStagePrivate CallyStagePrivate; struct _CallyStage { /*< private >*/ - CallyGroup parent; + CallyActor parent; CallyStagePrivate *priv; }; @@ -68,7 +68,7 @@ struct _CallyStage struct _CallyStageClass { /*< private >*/ - CallyGroupClass parent_class; + CallyActorClass parent_class; /* padding for future expansion */ gpointer _padding_dummy[16]; diff --git a/clutter/cally/cally.c b/clutter/cally/cally.c index 2edcdf82b..626dbefec 100644 --- a/clutter/cally/cally.c +++ b/clutter/cally/cally.c @@ -38,11 +38,8 @@ #include "cally.h" #include "cally-actor.h" -#include "cally-group.h" #include "cally-stage.h" #include "cally-text.h" -#include "cally-texture.h" -#include "cally-rectangle.h" #include "cally-clone.h" #include "cally-factory.h" @@ -57,11 +54,8 @@ static int cally_initialized = FALSE; /* factories initialization*/ 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) /** @@ -84,11 +78,8 @@ cally_accessibility_init (void) /* setting the factories */ CALLY_ACTOR_SET_FACTORY (CLUTTER_TYPE_ACTOR, cally_actor); - 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); /* Initialize the CallyUtility class */ |