From 66826bc6ba8a9fa250210ae16dfbf406d71dce24 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 17 Mar 2014 19:26:27 +0000 Subject: [PATCH] Annotate symbol visibility in Cally Like we did for the main library. --- clutter/cally/cally-actor.h | 13 +++++++++---- clutter/cally/cally-clone.c | 1 + clutter/cally/cally-clone.h | 10 ++++++---- clutter/cally/cally-group.c | 2 ++ clutter/cally/cally-group.h | 8 +++++--- clutter/cally/cally-main.h | 9 +++++++-- clutter/cally/cally-rectangle.c | 5 +++++ clutter/cally/cally-rectangle.h | 8 +++++--- clutter/cally/cally-root.c | 8 +++++++- clutter/cally/cally-root.h | 10 ++++++---- clutter/cally/cally-stage.c | 1 + clutter/cally/cally-stage.h | 8 +++++--- clutter/cally/cally-text.c | 2 ++ clutter/cally/cally-text.h | 10 ++++++---- clutter/cally/cally-texture.c | 5 +++++ clutter/cally/cally-texture.h | 10 ++++++---- clutter/cally/cally-util.h | 8 +++++--- 17 files changed, 83 insertions(+), 35 deletions(-) diff --git a/clutter/cally/cally-actor.h b/clutter/cally/cally-actor.h index 415054eeb..c17c26ea6 100644 --- a/clutter/cally/cally-actor.h +++ b/clutter/cally/cally-actor.h @@ -22,13 +22,13 @@ * License along with this library. If not, see . */ +#ifndef __CALLY_ACTOR_H__ +#define __CALLY_ACTOR_H__ + #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CALLY_ACTOR_H__ -#define __CALLY_ACTOR_H__ - #include #include @@ -126,16 +126,19 @@ struct _CallyActorClass gpointer _padding_dummy[32]; }; - +CLUTTER_AVAILABLE_IN_1_4 GType cally_actor_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_4 AtkObject* cally_actor_new (ClutterActor *actor); +CLUTTER_AVAILABLE_IN_1_4 guint cally_actor_add_action (CallyActor *cally_actor, const gchar *action_name, const gchar *action_description, const gchar *action_keybinding, CallyActionFunc action_func); +CLUTTER_AVAILABLE_IN_1_6 guint cally_actor_add_action_full (CallyActor *cally_actor, const gchar *action_name, const gchar *action_description, @@ -144,9 +147,11 @@ guint cally_actor_add_action_full (CallyActor *cally_actor, gpointer user_data, GDestroyNotify notify); +CLUTTER_AVAILABLE_IN_1_4 gboolean cally_actor_remove_action (CallyActor *cally_actor, gint action_id); +CLUTTER_AVAILABLE_IN_1_4 gboolean cally_actor_remove_action_by_name (CallyActor *cally_actor, const gchar *action_name); diff --git a/clutter/cally/cally-clone.c b/clutter/cally/cally-clone.c index 3f2704919..9672ce32a 100644 --- a/clutter/cally/cally-clone.c +++ b/clutter/cally/cally-clone.c @@ -69,6 +69,7 @@ * a11y POV should still be managed as a image (with the proper properties, * position, size, etc.). */ +#include "config.h" #include "cally-clone.h" #include "cally-actor-private.h" diff --git a/clutter/cally/cally-clone.h b/clutter/cally/cally-clone.h index 4e187b9d9..3a3777035 100644 --- a/clutter/cally/cally-clone.h +++ b/clutter/cally/cally-clone.h @@ -18,15 +18,15 @@ * License along with this library. If not, see . */ +#ifndef __CALLY_CLONE_H__ +#define __CALLY_CLONE_H__ + #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CALLY_CLONE_H__ -#define __CALLY_CLONE_H__ - -#include #include +#include G_BEGIN_DECLS @@ -74,7 +74,9 @@ struct _CallyCloneClass gpointer _padding_dummy[8]; }; +CLUTTER_AVAILABLE_IN_1_4 GType cally_clone_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_4 AtkObject *cally_clone_new (ClutterActor *actor); G_END_DECLS diff --git a/clutter/cally/cally-group.c b/clutter/cally/cally-group.c index f3b1a1290..ef633c31d 100644 --- a/clutter/cally/cally-group.c +++ b/clutter/cally/cally-group.c @@ -38,6 +38,8 @@ * */ +#include "config.h" + #include "cally-group.h" #include "cally-actor-private.h" diff --git a/clutter/cally/cally-group.h b/clutter/cally/cally-group.h index 0f0bd170a..4efd25902 100644 --- a/clutter/cally/cally-group.h +++ b/clutter/cally/cally-group.h @@ -21,13 +21,13 @@ * License along with this library. If not, see . */ +#ifndef __CALLY_GROUP_H__ +#define __CALLY_GROUP_H__ + #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CALLY_GROUP_H__ -#define __CALLY_GROUP_H__ - #include #include @@ -77,7 +77,9 @@ struct _CallyGroupClass gpointer _padding_dummy[8]; }; +CLUTTER_AVAILABLE_IN_1_4 GType cally_group_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_4 AtkObject* cally_group_new (ClutterActor *actor); G_END_DECLS diff --git a/clutter/cally/cally-main.h b/clutter/cally/cally-main.h index 00e613601..62931979b 100644 --- a/clutter/cally/cally-main.h +++ b/clutter/cally/cally-main.h @@ -22,16 +22,21 @@ * License along with this library. If not, see . */ +#ifndef __CALLY_MAIN_H__ +#define __CALLY_MAIN_H__ + #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CALLY_MAIN_H__ -#define __CALLY_MAIN_H__ +#include +#include G_BEGIN_DECLS +CLUTTER_AVAILABLE_IN_1_4 gboolean cally_get_cally_initialized (void); +CLUTTER_AVAILABLE_IN_1_4 gboolean cally_accessibility_init (void); G_END_DECLS diff --git a/clutter/cally/cally-rectangle.c b/clutter/cally/cally-rectangle.c index 51a9863bc..ec792efed 100644 --- a/clutter/cally/cally-rectangle.c +++ b/clutter/cally/cally-rectangle.c @@ -30,11 +30,16 @@ * In particular it sets a proper role for the rectangle. */ +#include "config.h" + #define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include "cally-rectangle.h" #include "cally-actor-private.h" +#include "clutter-color.h" +#include "deprecated/clutter-rectangle.h" + /* AtkObject */ static void cally_rectangle_real_initialize (AtkObject *obj, gpointer data); diff --git a/clutter/cally/cally-rectangle.h b/clutter/cally/cally-rectangle.h index 6cd245765..0a205c5e6 100644 --- a/clutter/cally/cally-rectangle.h +++ b/clutter/cally/cally-rectangle.h @@ -18,13 +18,13 @@ * License along with this library. If not, see . */ +#ifndef __CALLY_RECTANGLE_H__ +#define __CALLY_RECTANGLE_H__ + #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CALLY_RECTANGLE_H__ -#define __CALLY_RECTANGLE_H__ - #include #include @@ -74,7 +74,9 @@ struct _CallyRectangleClass gpointer _padding_dummy[8]; }; +CLUTTER_AVAILABLE_IN_1_4 GType cally_rectangle_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_4 AtkObject* cally_rectangle_new (ClutterActor *actor); G_END_DECLS diff --git a/clutter/cally/cally-root.c b/clutter/cally/cally-root.c index 111498158..aae37c6ab 100644 --- a/clutter/cally/cally-root.c +++ b/clutter/cally/cally-root.c @@ -35,9 +35,15 @@ * #ClutterStageManager). */ -#include +#include "config.h" + #include "cally-root.h" +#include "clutter-actor.h" +#include "clutter-stage-private.h" +#include "clutter-stage-manager.h" + + /* GObject */ static void cally_root_finalize (GObject *object); diff --git a/clutter/cally/cally-root.h b/clutter/cally/cally-root.h index fd3dcbfd0..10674942f 100644 --- a/clutter/cally/cally-root.h +++ b/clutter/cally/cally-root.h @@ -18,14 +18,15 @@ * License along with this library. If not, see . */ +#ifndef __CALLY_ROOT_H__ +#define __CALLY_ROOT_H__ + #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CALLY_ROOT_H__ -#define __CALLY_ROOT_H__ - #include +#include G_BEGIN_DECLS @@ -73,8 +74,9 @@ struct _CallyRootClass gpointer _padding_dummy[16]; }; - +CLUTTER_AVAILABLE_IN_1_4 GType cally_root_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_4 AtkObject *cally_root_new (void); G_END_DECLS diff --git a/clutter/cally/cally-stage.c b/clutter/cally/cally-stage.c index 9db527321..25bb321b5 100644 --- a/clutter/cally/cally-stage.c +++ b/clutter/cally/cally-stage.c @@ -34,6 +34,7 @@ * being a canvas. Anyway, this is required for applications using * just clutter, or directly #ClutterStage */ +#include "config.h" #include "cally-stage.h" #include "cally-actor-private.h" diff --git a/clutter/cally/cally-stage.h b/clutter/cally/cally-stage.h index 7ce4bb21f..c95d2ca13 100644 --- a/clutter/cally/cally-stage.h +++ b/clutter/cally/cally-stage.h @@ -18,13 +18,13 @@ * License along with this library. If not, see . */ +#ifndef __CALLY_STAGE_H__ +#define __CALLY_STAGE_H__ + #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CALLY_STAGE_H__ -#define __CALLY_STAGE_H__ - #include #include @@ -74,7 +74,9 @@ struct _CallyStageClass gpointer _padding_dummy[16]; }; +CLUTTER_AVAILABLE_IN_1_4 GType cally_stage_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_4 AtkObject *cally_stage_new (ClutterActor *actor); G_END_DECLS diff --git a/clutter/cally/cally-text.c b/clutter/cally/cally-text.c index b5b807e9b..0b6606f4a 100644 --- a/clutter/cally/cally-text.c +++ b/clutter/cally/cally-text.c @@ -46,7 +46,9 @@ #include "cally-text.h" #include "cally-actor-private.h" +#include "clutter-color.h" #include "clutter-main.h" +#include "clutter-text.h" static void cally_text_finalize (GObject *obj); diff --git a/clutter/cally/cally-text.h b/clutter/cally/cally-text.h index ea4b6889f..ce3c0cba0 100644 --- a/clutter/cally/cally-text.h +++ b/clutter/cally/cally-text.h @@ -18,15 +18,15 @@ * License along with this library. If not, see . */ +#ifndef __CALLY_TEXT_H__ +#define __CALLY_TEXT_H__ + #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CALLY_TEXT_H__ -#define __CALLY_TEXT_H__ - -#include #include +#include G_BEGIN_DECLS @@ -74,7 +74,9 @@ struct _CallyTextClass gpointer _padding_dummy[8]; }; +CLUTTER_AVAILABLE_IN_1_4 GType cally_text_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_4 AtkObject* cally_text_new (ClutterActor *actor); G_END_DECLS diff --git a/clutter/cally/cally-texture.c b/clutter/cally/cally-texture.c index d59bc3ad6..12964bd5e 100644 --- a/clutter/cally/cally-texture.c +++ b/clutter/cally/cally-texture.c @@ -30,10 +30,15 @@ * * In particular it sets a proper role for the texture. */ +#include "config.h" + +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include "cally-texture.h" #include "cally-actor-private.h" +#include "deprecated/clutter-texture.h" + /* AtkObject */ static void cally_texture_real_initialize (AtkObject *obj, gpointer data); diff --git a/clutter/cally/cally-texture.h b/clutter/cally/cally-texture.h index ff594c96a..dad576c14 100644 --- a/clutter/cally/cally-texture.h +++ b/clutter/cally/cally-texture.h @@ -18,15 +18,15 @@ * License along with this library. If not, see . */ +#ifndef __CALLY_TEXTURE_H__ +#define __CALLY_TEXTURE_H__ + #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CALLY_TEXTURE_H__ -#define __CALLY_TEXTURE_H__ - -#include #include +#include G_BEGIN_DECLS @@ -74,7 +74,9 @@ struct _CallyTextureClass gpointer _padding_dummy[8]; }; +CLUTTER_AVAILABLE_IN_1_4 GType cally_texture_get_type (void) G_GNUC_CONST; +CLUTTER_AVAILABLE_IN_1_4 AtkObject *cally_texture_new (ClutterActor *actor); G_END_DECLS diff --git a/clutter/cally/cally-util.h b/clutter/cally/cally-util.h index 23d386ce6..382e23a7f 100644 --- a/clutter/cally/cally-util.h +++ b/clutter/cally/cally-util.h @@ -18,13 +18,14 @@ * License along with this library. If not, see . */ +#ifndef __CALLY_UTIL_H__ +#define __CALLY_UTIL_H__ + #if !defined(__CALLY_H_INSIDE__) && !defined(CLUTTER_COMPILATION) #error "Only can be included directly." #endif -#ifndef __CALLY_UTIL_H__ -#define __CALLY_UTIL_H__ - +#include #include G_BEGIN_DECLS @@ -73,6 +74,7 @@ struct _CallyUtilClass gpointer _padding_dummy[8]; }; +CLUTTER_AVAILABLE_IN_1_4 GType cally_util_get_type (void) G_GNUC_CONST; G_END_DECLS