Revert "fix warnings about redefinting EWAPI etc. due to windows EAPI changes"
This reverts commite2d6691d52
. This reverts commitc02b796fdb
. This reverts commit6c969f6b7d
. This reverts commit74204bccd7
. This reverts commit1304d95717
. This reverts commit7c85be9674
. revert the EAPI changes that break cxx bindings build. sorry :( more fixes needed than i thought
This commit is contained in:
parent
26ea0eaac2
commit
39b48ca430
|
@ -276,7 +276,32 @@
|
|||
#include <Eina.h>
|
||||
#include <Eo.h>
|
||||
#include <Efl.h>
|
||||
#include <ecore_api.h>
|
||||
|
||||
#ifdef EAPI
|
||||
# undef EAPI
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifdef EFL_BUILD
|
||||
# ifdef DLL_EXPORT
|
||||
# define EAPI __declspec(dllexport)
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI __declspec(dllimport)
|
||||
# endif
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
# define EAPI __attribute__ ((visibility("default")))
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
|
@ -306,10 +331,13 @@ extern "C" {
|
|||
#endif
|
||||
#include "Ecore_Eo.h"
|
||||
|
||||
ECORE_API double _ecore_main_loop_wakeup_time_get(void);
|
||||
EAPI double _ecore_main_loop_wakeup_time_get(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#undef EAPI
|
||||
#define EAPI
|
||||
|
||||
#endif
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -45,9 +45,9 @@
|
|||
/* To be deprecated at some point */
|
||||
|
||||
/** Please use efl_provider_register instead. */
|
||||
ECORE_API Eina_Bool efl_loop_register(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider);
|
||||
EAPI Eina_Bool efl_loop_register(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider);
|
||||
/** Please use efl_provider_unregister instead. */
|
||||
ECORE_API Eina_Bool efl_loop_unregister(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider);
|
||||
EAPI Eina_Bool efl_loop_unregister(Efl_Loop *obj, const Efl_Class *klass, const Efl_Object *provider);
|
||||
|
||||
/**
|
||||
* @brief Quits the main loop once all the events currently on the queue have
|
||||
|
@ -59,9 +59,9 @@ ECORE_API Eina_Bool efl_loop_unregister(Efl_Loop *obj, const Efl_Class *klass, c
|
|||
*
|
||||
* @ingroup Efl_Loop
|
||||
*/
|
||||
ECORE_API void efl_exit(int exit_code);
|
||||
EAPI void efl_exit(int exit_code);
|
||||
|
||||
ECORE_API int efl_loop_exit_code_process(Eina_Value *value);
|
||||
EAPI int efl_loop_exit_code_process(Eina_Value *value);
|
||||
|
||||
#include "efl_loop_consumer.eo.h"
|
||||
|
||||
|
@ -71,7 +71,7 @@ ECORE_API int efl_loop_exit_code_process(Eina_Value *value);
|
|||
* @param[in] obj An object which is either a loop or a loop consumer
|
||||
* @return The current loop's future scheduler.
|
||||
*/
|
||||
ECORE_API Eina_Future_Scheduler *efl_loop_future_scheduler_get(const Eo *obj);
|
||||
EAPI Eina_Future_Scheduler *efl_loop_future_scheduler_get(const Eo *obj);
|
||||
|
||||
#include "efl_loop_fd.eo.h"
|
||||
#include "efl_loop_handler.eo.h"
|
||||
|
@ -86,7 +86,7 @@ ECORE_API Eina_Future_Scheduler *efl_loop_future_scheduler_get(const Eo *obj);
|
|||
#include "efl_cubic_bezier_interpolator.eo.h"
|
||||
|
||||
/* We ue the factory pattern here, so you shouldn't call eo_add directly. */
|
||||
ECORE_API Eo *efl_main_loop_get(void);
|
||||
EAPI Eo *efl_main_loop_get(void);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
|
|
@ -3,7 +3,32 @@
|
|||
|
||||
#include <stdio.h>
|
||||
#include <Eina.h>
|
||||
#include <ecore_api.h>
|
||||
|
||||
#ifdef EAPI
|
||||
# undef EAPI
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifdef EFL_BUILD
|
||||
# ifdef DLL_EXPORT
|
||||
# define EAPI __declspec(dllexport)
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI __declspec(dllimport)
|
||||
# endif
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
# define EAPI __attribute__ ((visibility("default")))
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @ingroup Ecore
|
||||
|
@ -1000,7 +1025,7 @@ struct _Ecore_Getopt
|
|||
*
|
||||
* @see ecore_getopt_help_category()
|
||||
*/
|
||||
ECORE_API void ecore_getopt_help(FILE *fp, const Ecore_Getopt *info);
|
||||
EAPI void ecore_getopt_help(FILE *fp, const Ecore_Getopt *info);
|
||||
|
||||
/**
|
||||
* Shows help for a single category (along with program usage and description).
|
||||
|
@ -1013,7 +1038,7 @@ ECORE_API void ecore_getopt_help(FILE *fp, const Ecore_Getopt *info);
|
|||
*
|
||||
* @see ecore_getopt_help()
|
||||
*/
|
||||
ECORE_API Eina_Bool ecore_getopt_help_category(FILE *fp, const Ecore_Getopt *info, const char *category);
|
||||
EAPI Eina_Bool ecore_getopt_help_category(FILE *fp, const Ecore_Getopt *info, const char *category);
|
||||
|
||||
/**
|
||||
* Checks parser for duplicate entries, print them out.
|
||||
|
@ -1021,7 +1046,7 @@ ECORE_API Eina_Bool ecore_getopt_help_category(FILE *fp, const Ecore_Getopt *in
|
|||
* @return @c EINA_TRUE if there are duplicates, @c EINA_FALSE otherwise.
|
||||
* @param parser The parser to be checked.
|
||||
*/
|
||||
ECORE_API Eina_Bool ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser);
|
||||
EAPI Eina_Bool ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser);
|
||||
|
||||
/**
|
||||
* Parses command line parameters.
|
||||
|
@ -1085,7 +1110,7 @@ ECORE_API Eina_Bool ecore_getopt_parser_has_duplicates(const Ecore_Getopt *pars
|
|||
*
|
||||
* @see ecore_getopt_parse_positional()
|
||||
*/
|
||||
ECORE_API int ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv);
|
||||
EAPI int ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv);
|
||||
|
||||
/**
|
||||
* Parses command line positional parameters.
|
||||
|
@ -1138,7 +1163,7 @@ ECORE_API int ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt
|
|||
* last positional argument is of action @c
|
||||
* ECORE_GETOPT_ACTION_APPEND then it will be the same as @a argc.
|
||||
*/
|
||||
ECORE_API int ecore_getopt_parse_positional(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv, int start);
|
||||
EAPI int ecore_getopt_parse_positional(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int argc, char **argv, int start);
|
||||
|
||||
|
||||
/**
|
||||
|
@ -1147,7 +1172,7 @@ ECORE_API int ecore_getopt_parse_positional(const Ecore_Getopt *parser, E
|
|||
* @param list Pointer to list to be freed.
|
||||
* @return always @c NULL, so you can easily make your list head @c NULL.
|
||||
*/
|
||||
ECORE_API Eina_List *ecore_getopt_list_free(Eina_List *list);
|
||||
EAPI Eina_List *ecore_getopt_list_free(Eina_List *list);
|
||||
|
||||
/**
|
||||
* Helper ecore_getopt callback to parse geometry (x:y:w:h).
|
||||
|
@ -1164,7 +1189,7 @@ ECORE_API Eina_List *ecore_getopt_list_free(Eina_List *list);
|
|||
*
|
||||
* @c callback_data value is ignored, you can safely use @c NULL.
|
||||
*/
|
||||
ECORE_API Eina_Bool ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage);
|
||||
EAPI Eina_Bool ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage);
|
||||
|
||||
/**
|
||||
* Helper ecore_getopt callback to parse geometry size (WxH).
|
||||
|
@ -1180,7 +1205,7 @@ ECORE_API Eina_Bool ecore_getopt_callback_geometry_parse(const Ecore_Getopt *pa
|
|||
*
|
||||
* @c callback_data value is ignored, you can safely use @c NULL.
|
||||
*/
|
||||
ECORE_API Eina_Bool ecore_getopt_callback_size_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage);
|
||||
EAPI Eina_Bool ecore_getopt_callback_size_parse(const Ecore_Getopt *parser, const Ecore_Getopt_Desc *desc, const char *str, void *data, Ecore_Getopt_Value *storage);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
@ -1190,4 +1215,7 @@ ECORE_API Eina_Bool ecore_getopt_callback_size_parse(const Ecore_Getopt *parser
|
|||
* @}
|
||||
*/
|
||||
|
||||
#undef EAPI
|
||||
#define EAPI
|
||||
|
||||
#endif /* _ECORE_GETOPT_H */
|
||||
|
|
|
@ -38,7 +38,7 @@ typedef struct _Ecore_Poller Ecore_Poller;
|
|||
* @c 0 it will be deleted automatically making any references/handles for it
|
||||
* invalid.
|
||||
*/
|
||||
ECORE_API Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data);
|
||||
EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_Task_Cb func, const void *data);
|
||||
|
||||
/**
|
||||
* @brief Deletes the specified poller from the timer list.
|
||||
|
@ -49,7 +49,7 @@ ECORE_API Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, E
|
|||
* @note @a poller must be a valid handle. If the poller function has already
|
||||
* returned @c 0, the handle is no longer valid (and does not need to be deleted).
|
||||
*/
|
||||
ECORE_API void *ecore_poller_del(Ecore_Poller *poller);
|
||||
EAPI void *ecore_poller_del(Ecore_Poller *poller);
|
||||
|
||||
/**
|
||||
* @brief Sets the time(in seconds) between ticks for the given poller type.
|
||||
|
@ -59,7 +59,7 @@ ECORE_API void *ecore_poller_del(Ecore_Poller *poller);
|
|||
* This will adjust the time between ticks of the given timer type defined by
|
||||
* @p type to the time period defined by @p poll_time.
|
||||
*/
|
||||
ECORE_API void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time);
|
||||
EAPI void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time);
|
||||
|
||||
/**
|
||||
* @brief Gets the time(in seconds) between ticks for the given poller type.
|
||||
|
@ -68,7 +68,7 @@ ECORE_API void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double pol
|
|||
*
|
||||
* This will get the time between ticks of the specified poller timer.
|
||||
*/
|
||||
ECORE_API double ecore_poller_poll_interval_get(Ecore_Poller_Type type);
|
||||
EAPI double ecore_poller_poll_interval_get(Ecore_Poller_Type type);
|
||||
|
||||
/**
|
||||
* @brief Polling interval rate of the poller.
|
||||
|
@ -77,14 +77,14 @@ ECORE_API double ecore_poller_poll_interval_get(Ecore_Poller_Type type);
|
|||
*
|
||||
* @return @c true on success, @c false on failure.
|
||||
*/
|
||||
ECORE_API Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *obj, int interval);
|
||||
EAPI Eina_Bool ecore_poller_poller_interval_set(Ecore_Poller *obj, int interval);
|
||||
|
||||
/**
|
||||
* @brief Polling interval rate of the poller.
|
||||
*
|
||||
* @return The tick interval; must be a power of 2 and <= 32768.
|
||||
*/
|
||||
ECORE_API int ecore_poller_poller_interval_get(const Ecore_Poller *obj);
|
||||
EAPI int ecore_poller_poller_interval_get(const Ecore_Poller *obj);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
@ -125,7 +125,7 @@ typedef struct _Ecore_Animator Ecore_Animator;
|
|||
* @note The default @p frametime value is 1/30th of a second.
|
||||
*
|
||||
*/
|
||||
ECORE_API Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *data);
|
||||
EAPI Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *data);
|
||||
|
||||
/**
|
||||
* @brief Adds an animator that runs for a limited time.
|
||||
|
@ -157,7 +157,7 @@ ECORE_API Ecore_Animator *ecore_animator_add(Ecore_Task_Cb func, const void *dat
|
|||
*
|
||||
* @since 1.1.0
|
||||
*/
|
||||
ECORE_API Ecore_Animator *ecore_animator_timeline_add(double runtime, Ecore_Timeline_Cb func, const void *data);
|
||||
EAPI Ecore_Animator *ecore_animator_timeline_add(double runtime, Ecore_Timeline_Cb func, const void *data);
|
||||
|
||||
/**
|
||||
* @brief Deletes the specified animator from the animator list.
|
||||
|
@ -172,7 +172,7 @@ ECORE_API Ecore_Animator *ecore_animator_timeline_add(double runtime, Ecore_Time
|
|||
* is invalid and should not be used again. It will not get called again after
|
||||
* deletion.
|
||||
*/
|
||||
ECORE_API void *ecore_animator_del(Ecore_Animator *animator);
|
||||
EAPI void *ecore_animator_del(Ecore_Animator *animator);
|
||||
|
||||
/**
|
||||
* @brief Suspends the specified animator.
|
||||
|
@ -188,7 +188,7 @@ ECORE_API void *ecore_animator_del(Ecore_Animator *animator);
|
|||
* will increase as if the animator hadn't been frozen and the animator may
|
||||
* have it's execution halted if @p runtime elapsed.
|
||||
*/
|
||||
ECORE_API void ecore_animator_freeze(Ecore_Animator *animator);
|
||||
EAPI void ecore_animator_freeze(Ecore_Animator *animator);
|
||||
|
||||
/**
|
||||
* @brief Restores execution of the specified animator.
|
||||
|
@ -198,7 +198,7 @@ ECORE_API void ecore_animator_freeze(Ecore_Animator *animator);
|
|||
* The specified @p animator will be put back in the set of animators that are
|
||||
* executed during main loop.
|
||||
*/
|
||||
ECORE_API void ecore_animator_thaw(Ecore_Animator *animator);
|
||||
EAPI void ecore_animator_thaw(Ecore_Animator *animator);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
@ -228,7 +228,7 @@ ECORE_API void ecore_animator_thaw(Ecore_Animator *animator);
|
|||
* @c 0 it will be deleted automatically making any references/handles for it
|
||||
* invalid.
|
||||
*/
|
||||
ECORE_API Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data);
|
||||
EAPI Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void *data);
|
||||
|
||||
/**
|
||||
* Creates a timer to call the given function in the given period of time.
|
||||
|
@ -242,7 +242,7 @@ ECORE_API Ecore_Timer *ecore_timer_add(double in, Ecore_Task_Cb func, const void
|
|||
* ecore_loop_time_get() not ecore_time_get() as ecore_timer_add() uses. See
|
||||
* ecore_timer_add() for more details.
|
||||
*/
|
||||
ECORE_API Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data);
|
||||
EAPI Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data);
|
||||
|
||||
/**
|
||||
* Deletes the specified timer from the timer list.
|
||||
|
@ -253,7 +253,7 @@ ECORE_API Ecore_Timer *ecore_timer_loop_add(double in, Ecore_Task_Cb func, const
|
|||
* Note: @p timer must be a valid handle. If the timer function has already
|
||||
* returned @c 0, the handle is no longer valid (and does not need to be delete).
|
||||
*/
|
||||
ECORE_API void *ecore_timer_del(Ecore_Timer *timer);
|
||||
EAPI void *ecore_timer_del(Ecore_Timer *timer);
|
||||
|
||||
/**
|
||||
* Pauses a running timer.
|
||||
|
@ -269,7 +269,7 @@ ECORE_API void *ecore_timer_del(Ecore_Timer *timer);
|
|||
*
|
||||
* @see ecore_timer_thaw()
|
||||
*/
|
||||
ECORE_API void ecore_timer_freeze(Ecore_Timer *timer);
|
||||
EAPI void ecore_timer_freeze(Ecore_Timer *timer);
|
||||
|
||||
/**
|
||||
* @brief Return whether the timer is freezing.
|
||||
|
@ -278,7 +278,7 @@ ECORE_API void ecore_timer_freeze(Ecore_Timer *timer);
|
|||
*
|
||||
* @see ecore_timer_freeze(), ecore_timer_thaw()
|
||||
*/
|
||||
ECORE_API Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer);
|
||||
EAPI Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer);
|
||||
|
||||
/**
|
||||
* @brief Resumes a frozen (paused) timer.
|
||||
|
@ -293,7 +293,7 @@ ECORE_API Eina_Bool ecore_timer_freeze_get(Ecore_Timer *timer);
|
|||
*
|
||||
* @see ecore_timer_freeze()
|
||||
*/
|
||||
ECORE_API void ecore_timer_thaw(Ecore_Timer *timer);
|
||||
EAPI void ecore_timer_thaw(Ecore_Timer *timer);
|
||||
|
||||
#include "efl_loop_timer_eo.legacy.h"
|
||||
|
||||
|
@ -321,7 +321,7 @@ ECORE_API void ecore_timer_thaw(Ecore_Timer *timer);
|
|||
*
|
||||
* Idlers are useful for progressively processing data without blocking.
|
||||
*/
|
||||
ECORE_API Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data);
|
||||
EAPI Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data);
|
||||
|
||||
/**
|
||||
* Deletes an idler callback from the list to be executed.
|
||||
|
@ -329,7 +329,7 @@ ECORE_API Ecore_Idler *ecore_idler_add(Ecore_Task_Cb func, const void *data);
|
|||
* @return The data pointer passed to the idler callback on success, @c NULL
|
||||
* otherwise.
|
||||
*/
|
||||
ECORE_API void *ecore_idler_del(Ecore_Idler *idler);
|
||||
EAPI void *ecore_idler_del(Ecore_Idler *idler);
|
||||
|
||||
/**
|
||||
* Adds an idle enterer handler.
|
||||
|
@ -341,7 +341,7 @@ ECORE_API void *ecore_idler_del(Ecore_Idler *idler);
|
|||
* idle state, as long as it returns @c 1 (or @c ECORE_CALLBACK_RENEW). A return of @c 0
|
||||
* (or @c ECORE_CALLBACK_CANCEL) deletes the idle enterer.
|
||||
*/
|
||||
ECORE_API Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data);
|
||||
EAPI Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const void *data);
|
||||
|
||||
/**
|
||||
* Adds an idle enterer handler at the start of the list so it gets called earlier than others.
|
||||
|
@ -353,7 +353,7 @@ ECORE_API Ecore_Idle_Enterer *ecore_idle_enterer_add(Ecore_Task_Cb func, const v
|
|||
* idle state, as long as it returns @c 1 (or @c ECORE_CALLBACK_RENEW). A return of @c 0
|
||||
* (or @c ECORE_CALLBACK_CANCEL) deletes the idle enterer.
|
||||
*/
|
||||
ECORE_API Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data);
|
||||
EAPI Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func, const void *data);
|
||||
|
||||
/**
|
||||
* Deletes an idle enterer callback.
|
||||
|
@ -361,7 +361,7 @@ ECORE_API Ecore_Idle_Enterer *ecore_idle_enterer_before_add(Ecore_Task_Cb func,
|
|||
* @return The data pointer passed to the idler enterer callback on success.
|
||||
* @c NULL otherwise.
|
||||
*/
|
||||
ECORE_API void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
|
||||
EAPI void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
|
||||
|
||||
/**
|
||||
* Adds an idle exiter handler.
|
||||
|
@ -372,7 +372,7 @@ ECORE_API void *ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer);
|
|||
* idle state, as long as it returns @c 1 (or @c ECORE_CALLBACK_RENEW). A return of @c 0
|
||||
* (or @c ECORE_CALLBACK_CANCEL) deletes the idle exiter.
|
||||
*/
|
||||
ECORE_API Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data);
|
||||
EAPI Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const void *data);
|
||||
|
||||
/**
|
||||
* Deletes an idle exiter handler from the list to be run on exiting idle state.
|
||||
|
@ -380,7 +380,7 @@ ECORE_API Ecore_Idle_Exiter *ecore_idle_exiter_add(Ecore_Task_Cb func, const voi
|
|||
* @return The data pointer that was being being passed to the handler if
|
||||
* successful. @c NULL otherwise.
|
||||
*/
|
||||
ECORE_API void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
|
||||
EAPI void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
@ -412,22 +412,22 @@ ECORE_API void *ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter);
|
|||
* added to the queue.
|
||||
* @note Once the job has been executed, the job handle is invalid.
|
||||
*/
|
||||
ECORE_API Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data);
|
||||
EAPI Ecore_Job *ecore_job_add(Ecore_Cb func, const void *data);
|
||||
|
||||
/**
|
||||
* Deletes a queued job that has not yet been executed.
|
||||
* @param obj Handle of the job to delete.
|
||||
* @return The data pointer that was to be passed to the job.
|
||||
*/
|
||||
ECORE_API void *ecore_job_del(Ecore_Job *obj);
|
||||
EAPI void *ecore_job_del(Ecore_Job *obj);
|
||||
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
||||
#ifdef EFL_BETA_API_SUPPORT
|
||||
ECORE_API Ecore_Animator *ecore_evas_animator_timeline_add(void *evo, double runtime, Ecore_Timeline_Cb func, const void *data);
|
||||
ECORE_API Ecore_Animator *ecore_evas_animator_add(void *evo, Ecore_Task_Cb func, const void *data);
|
||||
EAPI Ecore_Animator *ecore_evas_animator_timeline_add(void *evo, double runtime, Ecore_Timeline_Cb func, const void *data);
|
||||
EAPI Ecore_Animator *ecore_evas_animator_add(void *evo, Ecore_Task_Cb func, const void *data);
|
||||
#endif /* EFL_BETA_API_SUPPORT */
|
||||
|
||||
#endif
|
||||
|
|
|
@ -6,8 +6,31 @@
|
|||
#include <Eina.h>
|
||||
#include <Eo.h>
|
||||
#include <Efl.h>
|
||||
#ifdef EAPI
|
||||
# undef EAPI
|
||||
#endif
|
||||
|
||||
#include "ecore_api.h"
|
||||
#ifdef _WIN32
|
||||
# ifdef EFL_BUILD
|
||||
# ifdef DLL_EXPORT
|
||||
# define EAPI __declspec(dllexport)
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI __declspec(dllimport)
|
||||
# endif
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
# define EAPI __attribute__ ((visibility("default")))
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
|
@ -31,7 +54,7 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
ECORE_API extern double _efl_startup_time;
|
||||
EAPI extern double _efl_startup_time;
|
||||
|
||||
#include "Ecore_Common.h"
|
||||
#include "Ecore_Eo.h"
|
||||
|
@ -40,6 +63,9 @@ ECORE_API extern double _efl_startup_time;
|
|||
}
|
||||
#endif
|
||||
|
||||
#undef EAPI
|
||||
#define EAPI
|
||||
|
||||
#endif
|
||||
|
||||
// We are including efl_general.h again, just in case Efl_Core.h was already included before this
|
||||
|
|
|
@ -41,9 +41,9 @@
|
|||
#endif
|
||||
|
||||
static Ecore_Version _version = { VMAJ, VMIN, VMIC, VREV };
|
||||
ECORE_API Ecore_Version *ecore_version = &_version;
|
||||
EAPI Ecore_Version *ecore_version = &_version;
|
||||
|
||||
ECORE_API double _efl_startup_time = 0;
|
||||
EAPI double _efl_startup_time = 0;
|
||||
|
||||
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2)
|
||||
# define KEEP_MAX(Global, Local) \
|
||||
|
@ -220,13 +220,13 @@ _efl_first_loop_iterate(void *data, const Efl_Event *event)
|
|||
_efl_first_loop_iterate, data);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_app_no_system_modules(void)
|
||||
{
|
||||
_no_system_modules = EINA_TRUE;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_init(void)
|
||||
{
|
||||
if (++_ecore_init_count != 1)
|
||||
|
@ -367,7 +367,7 @@ shutdown_evil:
|
|||
return --_ecore_init_count;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_shutdown(void)
|
||||
{
|
||||
Ecore_Pipe *p;
|
||||
|
@ -481,7 +481,7 @@ ecore_shutdown(void)
|
|||
|
||||
static unsigned int _ecore_init_ex = 0;
|
||||
|
||||
ECORE_API unsigned int
|
||||
EAPI unsigned int
|
||||
ecore_init_ex(int argc, char **argv)
|
||||
{
|
||||
if (_ecore_init_ex++ != 0) return _ecore_init_ex;
|
||||
|
@ -494,7 +494,7 @@ ecore_init_ex(int argc, char **argv)
|
|||
return _ecore_init_ex;
|
||||
}
|
||||
|
||||
ECORE_API unsigned int
|
||||
EAPI unsigned int
|
||||
ecore_shutdown_ex(void)
|
||||
{
|
||||
if (--_ecore_init_ex != 0) return _ecore_init_ex;
|
||||
|
@ -516,7 +516,7 @@ typedef struct _Ecore_Fork_Cb Ecore_Fork_Cb;
|
|||
static int fork_cbs_walking = 0;
|
||||
static Eina_List *fork_cbs = NULL;
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_fork_reset_callback_add(Ecore_Cb func, const void *data)
|
||||
{
|
||||
Ecore_Fork_Cb *fcb;
|
||||
|
@ -530,7 +530,7 @@ ecore_fork_reset_callback_add(Ecore_Cb func, const void *data)
|
|||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_fork_reset_callback_del(Ecore_Cb func, const void *data)
|
||||
{
|
||||
Eina_List *l;
|
||||
|
@ -553,7 +553,7 @@ ecore_fork_reset_callback_del(Ecore_Cb func, const void *data)
|
|||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_fork_reset(void)
|
||||
{
|
||||
Eina_List *l, *ln;
|
||||
|
@ -608,7 +608,7 @@ ecore_fork_reset(void)
|
|||
#endif
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_main_loop_thread_safe_call_async(Ecore_Cb callback,
|
||||
void *data)
|
||||
{
|
||||
|
@ -633,7 +633,7 @@ ecore_main_loop_thread_safe_call_async(Ecore_Cb callback,
|
|||
_ecore_main_loop_thread_safe_call(order);
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback,
|
||||
void *data)
|
||||
{
|
||||
|
@ -673,7 +673,7 @@ ecore_main_loop_thread_safe_call_sync(Ecore_Data_Cb callback,
|
|||
return ret;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_main_loop_thread_safe_call_wait(double wait)
|
||||
{
|
||||
ecore_pipe_wait(_thread_call, 1, wait);
|
||||
|
@ -681,7 +681,7 @@ ecore_main_loop_thread_safe_call_wait(double wait)
|
|||
|
||||
static Efl_Id_Domain _ecore_main_domain = EFL_ID_DOMAIN_INVALID;
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_thread_main_loop_begin(void)
|
||||
{
|
||||
Ecore_Safe_Call *order;
|
||||
|
@ -731,7 +731,7 @@ ecore_thread_main_loop_begin(void)
|
|||
return _thread_loop;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_thread_main_loop_end(void)
|
||||
{
|
||||
int current_id;
|
||||
|
@ -774,7 +774,7 @@ ecore_thread_main_loop_end(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_print_warning(const char *function EINA_UNUSED,
|
||||
const char *sparam EINA_UNUSED)
|
||||
{
|
||||
|
@ -787,7 +787,7 @@ ecore_print_warning(const char *function EINA_UNUSED,
|
|||
if (getenv("ECORE_ERROR_ABORT")) abort();
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
_ecore_magic_fail(const void *d,
|
||||
Ecore_Magic m,
|
||||
Ecore_Magic req_m,
|
||||
|
@ -1123,13 +1123,13 @@ _thread_callback(void *data EINA_UNUSED,
|
|||
_ecore_main_call_flush();
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Power_State
|
||||
EAPI Ecore_Power_State
|
||||
ecore_power_state_get(void)
|
||||
{
|
||||
return _ecore_power_state;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_power_state_set(Ecore_Power_State state)
|
||||
{
|
||||
if (_ecore_power_state == state) return;
|
||||
|
@ -1137,13 +1137,13 @@ ecore_power_state_set(Ecore_Power_State state)
|
|||
ecore_event_add(ECORE_EVENT_POWER_STATE, NULL, NULL, NULL);
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Memory_State
|
||||
EAPI Ecore_Memory_State
|
||||
ecore_memory_state_get(void)
|
||||
{
|
||||
return _ecore_memory_state;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_memory_state_set(Ecore_Memory_State state)
|
||||
{
|
||||
if (_ecore_memory_state == state) return;
|
||||
|
|
|
@ -532,14 +532,14 @@ _ecore_animator_add(Ecore_Task_Cb func,
|
|||
return animator;
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Animator *
|
||||
EAPI Ecore_Animator *
|
||||
ecore_animator_add(Ecore_Task_Cb func,
|
||||
const void *data)
|
||||
{
|
||||
return _ecore_animator_add(func, data);
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Animator *
|
||||
EAPI Ecore_Animator *
|
||||
ecore_animator_timeline_add(double runtime,
|
||||
Ecore_Timeline_Cb func,
|
||||
const void *data)
|
||||
|
@ -745,7 +745,7 @@ _pos_map_cubic_bezier(double pos,
|
|||
#define SUB(A, B) eina_f32p32_sub(A, B)
|
||||
#define MUL(A, B) eina_f32p32_mul(A, B)
|
||||
|
||||
ECORE_API double
|
||||
EAPI double
|
||||
ecore_animator_pos_map_n(double pos,
|
||||
Ecore_Pos_Map map,
|
||||
int v_size,
|
||||
|
@ -828,7 +828,7 @@ ecore_animator_pos_map_n(double pos,
|
|||
return pos;
|
||||
}
|
||||
|
||||
ECORE_API double
|
||||
EAPI double
|
||||
ecore_animator_pos_map(double pos,
|
||||
Ecore_Pos_Map map,
|
||||
double v1,
|
||||
|
@ -841,7 +841,7 @@ ecore_animator_pos_map(double pos,
|
|||
return ecore_animator_pos_map_n(pos, map, 2, v);
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_animator_del(Ecore_Animator *animator)
|
||||
{
|
||||
void *data = NULL;
|
||||
|
@ -869,7 +869,7 @@ ecore_animator_del(Ecore_Animator *animator)
|
|||
return data;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_animator_frametime_set(double frametime)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -880,14 +880,14 @@ ecore_animator_frametime_set(double frametime)
|
|||
if (_have_animators()) _begin_tick();
|
||||
}
|
||||
|
||||
ECORE_API double
|
||||
EAPI double
|
||||
ecore_animator_frametime_get(void)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0);
|
||||
return animators_frametime;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_animator_freeze(Ecore_Animator *animator)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -905,7 +905,7 @@ ecore_animator_freeze(Ecore_Animator *animator)
|
|||
if (!_have_animators()) _end_tick();
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_animator_thaw(Ecore_Animator *animator)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -923,7 +923,7 @@ ecore_animator_thaw(Ecore_Animator *animator)
|
|||
if (_have_animators()) _begin_tick();
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_animator_source_set(Ecore_Animator_Source source)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -936,14 +936,14 @@ ecore_animator_source_set(Ecore_Animator_Source source)
|
|||
if (_have_animators()) _begin_tick();
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Animator_Source
|
||||
EAPI Ecore_Animator_Source
|
||||
ecore_animator_source_get(void)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
|
||||
return src;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func,
|
||||
const void *data)
|
||||
{
|
||||
|
@ -954,7 +954,7 @@ ecore_animator_custom_source_tick_begin_callback_set(Ecore_Cb func,
|
|||
if (_have_animators()) _begin_tick();
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func,
|
||||
const void *data)
|
||||
{
|
||||
|
@ -965,7 +965,7 @@ ecore_animator_custom_source_tick_end_callback_set(Ecore_Cb func,
|
|||
if (_have_animators()) _begin_tick();
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_animator_custom_tick(void)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
|
|
@ -1,32 +0,0 @@
|
|||
#ifndef _EFL_CORE_API_H
|
||||
#define _EFL_CORE_API_H
|
||||
|
||||
#ifdef ECORE_API
|
||||
#error ECORE_API should not be already defined
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifndef ECORE_STATIC
|
||||
# ifdef ECORE_BUILD
|
||||
# define ECORE_API __declspec(dllexport)
|
||||
# else
|
||||
# define ECORE_API __declspec(dllimport)
|
||||
# endif
|
||||
# else
|
||||
# define ECORE_API
|
||||
# endif
|
||||
# define ECORE_API_WEAK
|
||||
#elif defined(__GNUC__)
|
||||
# if __GNUC__ >= 4
|
||||
# define ECORE_API __attribute__ ((visibility("default")))
|
||||
# define ECORE_API_WEAK __attribute__ ((weak))
|
||||
# else
|
||||
# define ECORE_API
|
||||
# define ECORE_API_WEAK
|
||||
# endif
|
||||
#else
|
||||
# define ECORE_API
|
||||
# define ECORE_API_WEAK
|
||||
#endif
|
||||
|
||||
#endif
|
|
@ -11,7 +11,7 @@
|
|||
static int app_argc = 0;
|
||||
static char **app_argv = NULL;
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_app_args_set(int argc,
|
||||
const char **argv)
|
||||
{
|
||||
|
@ -25,7 +25,7 @@ ecore_app_args_set(int argc,
|
|||
app_argv = (char **)argv;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_app_args_get(int *argc,
|
||||
char ***argv)
|
||||
{
|
||||
|
@ -35,7 +35,7 @@ ecore_app_args_get(int *argc,
|
|||
if (argv) *argv = app_argv;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_app_restart(void)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
static Ecore_Event_Message_Handler *_event_msg_handler = NULL;
|
||||
|
||||
ECORE_API Ecore_Event_Handler *
|
||||
EAPI Ecore_Event_Handler *
|
||||
ecore_event_handler_add(int type,
|
||||
Ecore_Event_Handler_Cb func,
|
||||
const void *data)
|
||||
|
@ -18,7 +18,7 @@ ecore_event_handler_add(int type,
|
|||
type, func, (void *)data);
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Event_Handler *
|
||||
EAPI Ecore_Event_Handler *
|
||||
ecore_event_handler_prepend(int type,
|
||||
Ecore_Event_Handler_Cb func,
|
||||
const void *data)
|
||||
|
@ -27,20 +27,20 @@ ecore_event_handler_prepend(int type,
|
|||
type, func, (void *)data);
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_event_handler_del(Ecore_Event_Handler *event_handler)
|
||||
{
|
||||
return ecore_event_message_handler_del(_event_msg_handler,
|
||||
event_handler);
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_event_handler_data_get(Ecore_Event_Handler *eh)
|
||||
{
|
||||
return ecore_event_message_handler_data_get(_event_msg_handler, eh);
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_event_handler_data_set(Ecore_Event_Handler *eh,
|
||||
const void *data)
|
||||
{
|
||||
|
@ -48,7 +48,7 @@ ecore_event_handler_data_set(Ecore_Event_Handler *eh,
|
|||
(void *)data);
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Event *
|
||||
EAPI Ecore_Event *
|
||||
ecore_event_add(int type,
|
||||
void *ev,
|
||||
Ecore_End_Cb func_free,
|
||||
|
@ -66,7 +66,7 @@ ecore_event_add(int type,
|
|||
return (Ecore_Event *)msg;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_event_del(Ecore_Event *event)
|
||||
{
|
||||
void *data = NULL;
|
||||
|
@ -76,13 +76,13 @@ ecore_event_del(Ecore_Event *event)
|
|||
return data;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_event_type_new(void)
|
||||
{
|
||||
return ecore_event_message_handler_type_new(_event_msg_handler);
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Event_Filter *
|
||||
EAPI Ecore_Event_Filter *
|
||||
ecore_event_filter_add(Ecore_Data_Cb func_start,
|
||||
Ecore_Filter_Cb func_filter,
|
||||
Ecore_End_Cb func_end,
|
||||
|
@ -93,19 +93,19 @@ ecore_event_filter_add(Ecore_Data_Cb func_start,
|
|||
func_end, (void *)data);
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_event_filter_del(Ecore_Event_Filter *ef)
|
||||
{
|
||||
return ecore_event_message_handler_filter_del(_event_msg_handler, ef);
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_event_current_type_get(void)
|
||||
{
|
||||
return ecore_event_message_handler_current_type_get(_event_msg_handler);
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_event_current_event_get(void)
|
||||
{
|
||||
return ecore_event_message_handler_current_event_get(_event_msg_handler);
|
||||
|
@ -192,7 +192,7 @@ _ecore_event_signal_realtime_new(void)
|
|||
return calloc(1, sizeof(Ecore_Event_Signal_Realtime));
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_event_type_flush_internal(int type, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
|
|
@ -33,26 +33,26 @@ struct _ecore_exe_dead_exe
|
|||
char *cmd;
|
||||
};
|
||||
|
||||
ECORE_API int ECORE_EXE_EVENT_ADD = 0;
|
||||
ECORE_API int ECORE_EXE_EVENT_DEL = 0;
|
||||
ECORE_API int ECORE_EXE_EVENT_DATA = 0;
|
||||
ECORE_API int ECORE_EXE_EVENT_ERROR = 0;
|
||||
EAPI int ECORE_EXE_EVENT_ADD = 0;
|
||||
EAPI int ECORE_EXE_EVENT_DEL = 0;
|
||||
EAPI int ECORE_EXE_EVENT_DATA = 0;
|
||||
EAPI int ECORE_EXE_EVENT_ERROR = 0;
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_run_priority_set(int pri)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
_impl_ecore_exe_run_priority_set(pri);
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_exe_run_priority_get(void)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
|
||||
return _impl_ecore_exe_run_priority_get();
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Exe *
|
||||
EAPI Ecore_Exe *
|
||||
ecore_exe_run(const char *exe_cmd,
|
||||
const void *data)
|
||||
{
|
||||
|
@ -60,7 +60,7 @@ ecore_exe_run(const char *exe_cmd,
|
|||
return ecore_exe_pipe_run(exe_cmd, 0, data);
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Exe *
|
||||
EAPI Ecore_Exe *
|
||||
ecore_exe_pipe_run(const char *exe_cmd,
|
||||
Ecore_Exe_Flags flags,
|
||||
const void *data)
|
||||
|
@ -101,7 +101,7 @@ _ecore_exe_efl_object_finalize(Eo *obj, Ecore_Exe_Data *exe)
|
|||
return _impl_ecore_exe_efl_object_finalize(obj, exe);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_callback_pre_free_set(Ecore_Exe *obj,
|
||||
Ecore_Exe_Cb func)
|
||||
{
|
||||
|
@ -111,7 +111,7 @@ ecore_exe_callback_pre_free_set(Ecore_Exe *obj,
|
|||
exe->pre_free_cb = func;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_exe_send(Ecore_Exe *obj,
|
||||
const void *data,
|
||||
int size)
|
||||
|
@ -130,7 +130,7 @@ ecore_exe_send(Ecore_Exe *obj,
|
|||
return _impl_ecore_exe_send(obj, exe, data, size);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_close_stdin(Ecore_Exe *obj)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -139,7 +139,7 @@ ecore_exe_close_stdin(Ecore_Exe *obj)
|
|||
exe->close_stdin = 1;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_auto_limits_set(Ecore_Exe *obj,
|
||||
int start_bytes,
|
||||
int end_bytes,
|
||||
|
@ -153,7 +153,7 @@ ecore_exe_auto_limits_set(Ecore_Exe *obj,
|
|||
start_lines, end_lines);
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Exe_Event_Data *
|
||||
EAPI Ecore_Exe_Event_Data *
|
||||
ecore_exe_event_data_get(Ecore_Exe *obj,
|
||||
Ecore_Exe_Flags flags)
|
||||
{
|
||||
|
@ -163,7 +163,7 @@ ecore_exe_event_data_get(Ecore_Exe *obj,
|
|||
return _impl_ecore_exe_event_data_get(obj, exe, flags);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_tag_set(Ecore_Exe *obj,
|
||||
const char *tag)
|
||||
{
|
||||
|
@ -175,7 +175,7 @@ ecore_exe_tag_set(Ecore_Exe *obj,
|
|||
else exe->tag = NULL;
|
||||
}
|
||||
|
||||
ECORE_API const char *
|
||||
EAPI const char *
|
||||
ecore_exe_tag_get(const Ecore_Exe *obj)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
|
||||
|
@ -184,7 +184,7 @@ ecore_exe_tag_get(const Ecore_Exe *obj)
|
|||
return exe->tag;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_exe_free(Ecore_Exe *obj)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
|
||||
|
@ -202,7 +202,7 @@ _ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *exe)
|
|||
_impl_ecore_exe_efl_object_destructor(obj, exe);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_event_data_free(Ecore_Exe_Event_Data *e)
|
||||
{
|
||||
if (!e) return;
|
||||
|
@ -211,7 +211,7 @@ ecore_exe_event_data_free(Ecore_Exe_Event_Data *e)
|
|||
free(e);
|
||||
}
|
||||
|
||||
ECORE_API pid_t
|
||||
EAPI pid_t
|
||||
ecore_exe_pid_get(const Ecore_Exe *obj)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
|
||||
|
@ -220,7 +220,7 @@ ecore_exe_pid_get(const Ecore_Exe *obj)
|
|||
return exe->pid;
|
||||
}
|
||||
|
||||
ECORE_API const char *
|
||||
EAPI const char *
|
||||
ecore_exe_cmd_get(const Ecore_Exe *obj)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
|
||||
|
@ -229,7 +229,7 @@ ecore_exe_cmd_get(const Ecore_Exe *obj)
|
|||
return ret;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_exe_data_get(const Ecore_Exe *obj)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
|
||||
|
@ -238,7 +238,7 @@ ecore_exe_data_get(const Ecore_Exe *obj)
|
|||
return exe->data;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_exe_data_set(Ecore_Exe *obj,
|
||||
void *data)
|
||||
{
|
||||
|
@ -251,7 +251,7 @@ ecore_exe_data_set(Ecore_Exe *obj,
|
|||
return ret;
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Exe_Flags
|
||||
EAPI Ecore_Exe_Flags
|
||||
ecore_exe_flags_get(const Ecore_Exe *obj)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
|
||||
|
@ -260,13 +260,13 @@ ecore_exe_flags_get(const Ecore_Exe *obj)
|
|||
return exe->flags;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_pause(Ecore_Exe *obj)
|
||||
{
|
||||
efl_control_suspend_set(obj, EINA_TRUE);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_continue(Ecore_Exe *obj)
|
||||
{
|
||||
efl_control_suspend_set(obj, EINA_FALSE);
|
||||
|
@ -280,7 +280,7 @@ _ecore_exe_efl_control_suspend_set(Eo *obj EINA_UNUSED, Ecore_Exe_Data *exe, Ein
|
|||
else _impl_ecore_exe_continue(obj, exe);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_interrupt(Ecore_Exe *obj)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -289,7 +289,7 @@ ecore_exe_interrupt(Ecore_Exe *obj)
|
|||
_impl_ecore_exe_interrupt(obj, exe);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_quit(Ecore_Exe *obj)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -298,7 +298,7 @@ ecore_exe_quit(Ecore_Exe *obj)
|
|||
_impl_ecore_exe_quit(obj, exe);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_terminate(Ecore_Exe *obj)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -307,7 +307,7 @@ ecore_exe_terminate(Ecore_Exe *obj)
|
|||
_impl_ecore_exe_terminate(obj, exe);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_kill(Ecore_Exe *obj)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -316,7 +316,7 @@ ecore_exe_kill(Ecore_Exe *obj)
|
|||
_impl_ecore_exe_kill(obj, exe);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_signal(Ecore_Exe *obj,
|
||||
int num)
|
||||
{
|
||||
|
@ -326,7 +326,7 @@ ecore_exe_signal(Ecore_Exe *obj,
|
|||
_impl_ecore_exe_signal(obj, exe, num);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_exe_hup(Ecore_Exe *obj)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
ECORE_API ECORE_API_WEAK const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET =
|
||||
EWAPI const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET =
|
||||
EFL_EVENT_DESCRIPTION("data,get");
|
||||
ECORE_API ECORE_API_WEAK const Efl_Event_Description _ECORE_EXE_EVENT_DATA_ERROR =
|
||||
EWAPI const Efl_Event_Description _ECORE_EXE_EVENT_DATA_ERROR =
|
||||
EFL_EVENT_DESCRIPTION("data,error");
|
||||
|
||||
void _ecore_exe_command_set(Eo *obj, Ecore_Exe_Data *pd, const char *exe_cmd, Ecore_Exe_Flags flags);
|
||||
|
||||
ECORE_API ECORE_API_WEAK EFL_VOID_FUNC_BODYV(ecore_obj_exe_command_set, EFL_FUNC_CALL(exe_cmd, flags), const char *exe_cmd, Ecore_Exe_Flags flags);
|
||||
EOAPI EFL_VOID_FUNC_BODYV(ecore_obj_exe_command_set, EFL_FUNC_CALL(exe_cmd, flags), const char *exe_cmd, Ecore_Exe_Flags flags);
|
||||
|
||||
void _ecore_exe_command_get(const Eo *obj, Ecore_Exe_Data *pd, const char **exe_cmd, Ecore_Exe_Flags *flags);
|
||||
|
||||
ECORE_API ECORE_API_WEAK EFL_VOID_FUNC_BODYV_CONST(ecore_obj_exe_command_get, EFL_FUNC_CALL(exe_cmd, flags), const char **exe_cmd, Ecore_Exe_Flags *flags);
|
||||
EOAPI EFL_VOID_FUNC_BODYV_CONST(ecore_obj_exe_command_get, EFL_FUNC_CALL(exe_cmd, flags), const char **exe_cmd, Ecore_Exe_Flags *flags);
|
||||
|
||||
void _ecore_exe_efl_object_destructor(Eo *obj, Ecore_Exe_Data *pd);
|
||||
|
||||
|
|
|
@ -80,7 +80,7 @@ typedef enum
|
|||
*/
|
||||
#define ECORE_EXE_CLASS ecore_exe_class_get()
|
||||
|
||||
ECORE_API ECORE_API_WEAK const Efl_Class *ecore_exe_class_get(void) EINA_CONST;
|
||||
EWAPI const Efl_Class *ecore_exe_class_get(void) EINA_CONST;
|
||||
|
||||
/**
|
||||
* @brief Controls the command that's executed. FIXME: May need a split/rename.
|
||||
|
@ -91,7 +91,7 @@ ECORE_API ECORE_API_WEAK const Efl_Class *ecore_exe_class_get(void) EINA_CONST;
|
|||
*
|
||||
* @ingroup Ecore_Exe
|
||||
*/
|
||||
ECORE_API ECORE_API_WEAK void ecore_obj_exe_command_set(Eo *obj, const char *exe_cmd, Ecore_Exe_Flags flags);
|
||||
EOAPI void ecore_obj_exe_command_set(Eo *obj, const char *exe_cmd, Ecore_Exe_Flags flags);
|
||||
|
||||
/**
|
||||
* @brief Controls the command that's executed. FIXME: May need a split/rename.
|
||||
|
@ -102,9 +102,9 @@ ECORE_API ECORE_API_WEAK void ecore_obj_exe_command_set(Eo *obj, const char *exe
|
|||
*
|
||||
* @ingroup Ecore_Exe
|
||||
*/
|
||||
ECORE_API ECORE_API_WEAK void ecore_obj_exe_command_get(const Eo *obj, const char **exe_cmd, Ecore_Exe_Flags *flags);
|
||||
EOAPI void ecore_obj_exe_command_get(const Eo *obj, const char **exe_cmd, Ecore_Exe_Flags *flags);
|
||||
|
||||
ECORE_API ECORE_API_WEAK extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET;
|
||||
EWAPI extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_GET;
|
||||
|
||||
/** Data received event from the child process
|
||||
* @return Ecore_Exe_Event_Data
|
||||
|
@ -113,7 +113,7 @@ ECORE_API ECORE_API_WEAK extern const Efl_Event_Description _ECORE_EXE_EVENT_DAT
|
|||
*/
|
||||
#define ECORE_EXE_EVENT_DATA_GET (&(_ECORE_EXE_EVENT_DATA_GET))
|
||||
|
||||
ECORE_API ECORE_API_WEAK extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_ERROR;
|
||||
EWAPI extern const Efl_Event_Description _ECORE_EXE_EVENT_DATA_ERROR;
|
||||
|
||||
/** Error received event from the child process
|
||||
* @return Ecore_Exe_Event_Data
|
||||
|
|
|
@ -133,10 +133,10 @@ struct _Ecore_Exe_Data
|
|||
|
||||
typedef struct _Ecore_Exe_Data Ecore_Exe_Data;
|
||||
|
||||
ECORE_API extern int ECORE_EXE_EVENT_ADD;
|
||||
ECORE_API extern int ECORE_EXE_EVENT_DEL;
|
||||
ECORE_API extern int ECORE_EXE_EVENT_DATA;
|
||||
ECORE_API extern int ECORE_EXE_EVENT_ERROR;
|
||||
EAPI extern int ECORE_EXE_EVENT_ADD;
|
||||
EAPI extern int ECORE_EXE_EVENT_DEL;
|
||||
EAPI extern int ECORE_EXE_EVENT_DATA;
|
||||
EAPI extern int ECORE_EXE_EVENT_ERROR;
|
||||
|
||||
Ecore_Exe *_ecore_exe_find(pid_t pid);
|
||||
void *_ecore_exe_event_del_new(void);
|
||||
|
|
|
@ -810,7 +810,7 @@ _ecore_getopt_help_prepare(const Ecore_Getopt *parser)
|
|||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_getopt_help(FILE *fp,
|
||||
const Ecore_Getopt *parser)
|
||||
{
|
||||
|
@ -822,7 +822,7 @@ ecore_getopt_help(FILE *fp,
|
|||
_ecore_getopt_help_options(fp, parser);
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_getopt_help_category(FILE *fp,
|
||||
const Ecore_Getopt *parser,
|
||||
const char *category)
|
||||
|
@ -1977,7 +1977,7 @@ _ecore_getopt_parse_find_long_other(const Ecore_Getopt *parser,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_getopt_parser_has_duplicates(const Ecore_Getopt *parser)
|
||||
{
|
||||
const Ecore_Getopt_Desc *desc = parser->descs;
|
||||
|
@ -2028,7 +2028,7 @@ _ecore_getopt_find_help(const Ecore_Getopt *parser)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_getopt_parse(const Ecore_Getopt *parser,
|
||||
Ecore_Getopt_Value *values,
|
||||
int argc,
|
||||
|
@ -2092,7 +2092,7 @@ error:
|
|||
return -1;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_getopt_parse_positional(const Ecore_Getopt *parser,
|
||||
Ecore_Getopt_Value *values,
|
||||
int argc,
|
||||
|
@ -2159,7 +2159,7 @@ error:
|
|||
return -1;
|
||||
}
|
||||
|
||||
ECORE_API Eina_List *
|
||||
EAPI Eina_List *
|
||||
ecore_getopt_list_free(Eina_List *list)
|
||||
{
|
||||
void *data;
|
||||
|
@ -2169,7 +2169,7 @@ ecore_getopt_list_free(Eina_List *list)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser EINA_UNUSED,
|
||||
const Ecore_Getopt_Desc *desc EINA_UNUSED,
|
||||
const char *str,
|
||||
|
@ -2187,7 +2187,7 @@ ecore_getopt_callback_geometry_parse(const Ecore_Getopt *parser EINA_UNUSED
|
|||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_getopt_callback_size_parse(const Ecore_Getopt *parser EINA_UNUSED,
|
||||
const Ecore_Getopt_Desc *desc EINA_UNUSED,
|
||||
const char *str,
|
||||
|
|
|
@ -286,7 +286,7 @@ _ecore_glib_shutdown(void)
|
|||
#endif
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_main_loop_glib_integrate(void)
|
||||
{
|
||||
#ifdef HAVE_GLIB
|
||||
|
@ -310,7 +310,7 @@ ecore_main_loop_glib_integrate(void)
|
|||
|
||||
Eina_Bool _ecore_glib_always_integrate = 1;
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_main_loop_glib_always_integrate_disable(void)
|
||||
{
|
||||
_ecore_glib_always_integrate = 0;
|
||||
|
|
|
@ -14,14 +14,14 @@ EFL_CALLBACKS_ARRAY_DEFINE(ecore_idle_enterer_callbacks,
|
|||
{ EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
|
||||
|
||||
|
||||
ECORE_API Ecore_Idle_Enterer *
|
||||
EAPI Ecore_Idle_Enterer *
|
||||
ecore_idle_enterer_add(Ecore_Task_Cb func,
|
||||
const void *data)
|
||||
{
|
||||
return _ecore_factorized_idle_add(ecore_idle_enterer_callbacks(), func, data);
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Idle_Enterer *
|
||||
EAPI Ecore_Idle_Enterer *
|
||||
ecore_idle_enterer_before_add(Ecore_Task_Cb func,
|
||||
const void *data)
|
||||
{
|
||||
|
@ -36,7 +36,7 @@ ecore_idle_enterer_before_add(Ecore_Task_Cb func,
|
|||
return ie;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_idle_enterer_del(Ecore_Idle_Enterer *idle_enterer)
|
||||
{
|
||||
return _ecore_factorized_idle_del(idle_enterer);
|
||||
|
|
|
@ -13,14 +13,14 @@ EFL_CALLBACKS_ARRAY_DEFINE(ecore_idle_exiter_callbacks,
|
|||
{ EFL_LOOP_EVENT_IDLE_EXIT, _ecore_factorized_idle_process },
|
||||
{ EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
|
||||
|
||||
ECORE_API Ecore_Idle_Exiter *
|
||||
EAPI Ecore_Idle_Exiter *
|
||||
ecore_idle_exiter_add(Ecore_Task_Cb func,
|
||||
const void *data)
|
||||
{
|
||||
return _ecore_factorized_idle_add(ecore_idle_exiter_callbacks(), func, data);
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_idle_exiter_del(Ecore_Idle_Exiter *idle_exiter)
|
||||
{
|
||||
return _ecore_factorized_idle_del(idle_exiter);
|
||||
|
|
|
@ -105,14 +105,14 @@ EFL_CALLBACKS_ARRAY_DEFINE(ecore_idler_callbacks,
|
|||
{ EFL_LOOP_EVENT_IDLE, _ecore_factorized_idle_process },
|
||||
{ EFL_EVENT_DEL, _ecore_factorized_idle_event_del });
|
||||
|
||||
ECORE_API Ecore_Idler *
|
||||
EAPI Ecore_Idler *
|
||||
ecore_idler_add(Ecore_Task_Cb func,
|
||||
const void *data)
|
||||
{
|
||||
return _ecore_factorized_idle_add(ecore_idler_callbacks(), func, data);
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_idler_del(Ecore_Idler *idler)
|
||||
{
|
||||
return _ecore_factorized_idle_del(idler);
|
||||
|
|
|
@ -2,10 +2,34 @@
|
|||
#ifndef _ECORE_INTERNAL_H
|
||||
#define _ECORE_INTERNAL_H
|
||||
|
||||
#include <ecore_api.h>
|
||||
#ifdef EAPI
|
||||
# undef EAPI
|
||||
#endif
|
||||
|
||||
ECORE_API void ecore_loop_arguments_send(int argc, const char **argv);
|
||||
ECORE_API Eina_Bool efl_loop_message_process(Eo *obj);
|
||||
#ifdef _WIN32
|
||||
# ifdef EFL_BUILD
|
||||
# ifdef DLL_EXPORT
|
||||
# define EAPI __declspec(dllexport)
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI __declspec(dllimport)
|
||||
# endif
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
# define EAPI __attribute__ ((visibility("default")))
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
#endif
|
||||
|
||||
EAPI void ecore_loop_arguments_send(int argc, const char **argv);
|
||||
EAPI Eina_Bool efl_loop_message_process(Eo *obj);
|
||||
|
||||
static inline Eina_Value
|
||||
efl_model_list_value_get(Eina_List *childrens,
|
||||
|
@ -138,4 +162,7 @@ _efl_future_all_repack(Eo *o EINA_UNUSED, void *data EINA_UNUSED, const Eina_Val
|
|||
return eina_value_error_init(EFL_MODEL_ERROR_UNKNOWN);
|
||||
}
|
||||
|
||||
#undef EAPI
|
||||
#define EAPI
|
||||
|
||||
#endif
|
||||
|
|
|
@ -39,7 +39,7 @@ _ecore_job_shutdown(void)
|
|||
_ecore_job_handler = NULL;
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Job *
|
||||
EAPI Ecore_Job *
|
||||
ecore_job_add(Ecore_Cb func,
|
||||
const void *data)
|
||||
{
|
||||
|
@ -69,7 +69,7 @@ ecore_job_add(Ecore_Cb func,
|
|||
return job;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_job_del(Ecore_Job *job)
|
||||
{
|
||||
void *data;
|
||||
|
|
|
@ -209,7 +209,7 @@ static gboolean ecore_fds_ready;
|
|||
|
||||
static double _ecore_main_loop_wakeup_time = 0.0;
|
||||
|
||||
ECORE_API double _ecore_main_loop_wakeup_time_get(void)
|
||||
EAPI double _ecore_main_loop_wakeup_time_get(void)
|
||||
{
|
||||
return _ecore_main_loop_wakeup_time;
|
||||
}
|
||||
|
@ -1280,21 +1280,21 @@ _ecore_main_loop_quit(Eo *obj, Efl_Loop_Data *pd)
|
|||
#endif
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_main_loop_iterate(void)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
efl_loop_iterate(ML_OBJ);
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_main_loop_iterate_may_block(int may_block)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
|
||||
return efl_loop_iterate_may_block(ML_OBJ, may_block);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_main_loop_begin(void)
|
||||
{
|
||||
DBG("ecore_main_loop_begin");
|
||||
|
@ -1304,7 +1304,7 @@ ecore_main_loop_begin(void)
|
|||
eina_evlog("-mainloop", NULL, 0.0, NULL);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_main_loop_quit(void)
|
||||
{
|
||||
Eina_Value v = EINA_VALUE_EMPTY;
|
||||
|
@ -1315,27 +1315,27 @@ ecore_main_loop_quit(void)
|
|||
efl_loop_quit(ML_OBJ, v);
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_main_loop_nested_get(void)
|
||||
{
|
||||
return in_main_loop;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_main_loop_animator_ticked_get(void)
|
||||
{
|
||||
DBG("ecore_main_loop_animator_ticked_get");
|
||||
return _ecore_animator_run_get();
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_main_loop_select_func_set(Ecore_Select_Function func)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
main_loop_select = func;
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Select_Function
|
||||
EAPI Ecore_Select_Function
|
||||
ecore_main_loop_select_func_get(void)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(NULL);
|
||||
|
@ -1432,7 +1432,7 @@ _ecore_main_fd_handler_del(Eo *obj EINA_UNUSED,
|
|||
return r;
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Fd_Handler *
|
||||
EAPI Ecore_Fd_Handler *
|
||||
ecore_main_fd_handler_add(int fd,
|
||||
Ecore_Fd_Handler_Flags flags,
|
||||
Ecore_Fd_Cb func,
|
||||
|
@ -1449,7 +1449,7 @@ ecore_main_fd_handler_add(int fd,
|
|||
return fdh;
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Fd_Handler *
|
||||
EAPI Ecore_Fd_Handler *
|
||||
ecore_main_fd_handler_file_add(int fd,
|
||||
Ecore_Fd_Handler_Flags flags,
|
||||
Ecore_Fd_Cb func,
|
||||
|
@ -1463,7 +1463,7 @@ ecore_main_fd_handler_file_add(int fd,
|
|||
buf_func, buf_data, EINA_TRUE);
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler)
|
||||
{
|
||||
if (!fd_handler) return NULL;
|
||||
|
@ -1479,7 +1479,7 @@ ecore_main_fd_handler_del(Ecore_Fd_Handler *fd_handler)
|
|||
}
|
||||
|
||||
#ifdef _WIN32
|
||||
ECORE_API Ecore_Win32_Handler *
|
||||
EAPI Ecore_Win32_Handler *
|
||||
_ecore_main_win32_handler_add(Eo *obj,
|
||||
Efl_Loop_Data *pd,
|
||||
Eo *handler,
|
||||
|
@ -1525,7 +1525,7 @@ _ecore_main_win32_handler_del(Eo *obj EINA_UNUSED,
|
|||
return win32_handler->data;
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Win32_Handler *
|
||||
EAPI Ecore_Win32_Handler *
|
||||
ecore_main_win32_handler_add(void *h,
|
||||
Ecore_Win32_Handle_Cb func,
|
||||
const void *data)
|
||||
|
@ -1534,7 +1534,7 @@ ecore_main_win32_handler_add(void *h,
|
|||
return _ecore_main_win32_handler_add(ML_OBJ, ML_DAT, NULL, h, func, data);
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler)
|
||||
{
|
||||
void *ret = NULL;
|
||||
|
@ -1551,7 +1551,7 @@ ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler)
|
|||
return ret;
|
||||
}
|
||||
#else
|
||||
ECORE_API Ecore_Win32_Handler *
|
||||
EAPI Ecore_Win32_Handler *
|
||||
_ecore_main_win32_handler_add(Eo *obj EINA_UNUSED,
|
||||
Efl_Loop_Data *pd EINA_UNUSED,
|
||||
Eo *handler EINA_UNUSED,
|
||||
|
@ -1570,7 +1570,7 @@ _ecore_main_win32_handler_del(Eo *obj EINA_UNUSED,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Win32_Handler *
|
||||
EAPI Ecore_Win32_Handler *
|
||||
ecore_main_win32_handler_add(void *h EINA_UNUSED,
|
||||
Ecore_Win32_Handle_Cb func EINA_UNUSED,
|
||||
const void *data EINA_UNUSED)
|
||||
|
@ -1578,14 +1578,14 @@ ecore_main_win32_handler_add(void *h EINA_UNUSED,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_main_win32_handler_del(Ecore_Win32_Handler *win32_handler EINA_UNUSED)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler,
|
||||
Ecore_Fd_Prep_Cb func,
|
||||
const void *data)
|
||||
|
@ -1610,7 +1610,7 @@ ecore_main_fd_handler_prepare_callback_set(Ecore_Fd_Handler *fd_handler,
|
|||
(pd->fd_handlers_with_prep, fd_handler);
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler)
|
||||
{
|
||||
if (!fd_handler) return -1;
|
||||
|
@ -1626,7 +1626,7 @@ ecore_main_fd_handler_fd_get(Ecore_Fd_Handler *fd_handler)
|
|||
return fd_handler->fd;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler,
|
||||
Ecore_Fd_Handler_Flags flags)
|
||||
{
|
||||
|
@ -1646,7 +1646,7 @@ ecore_main_fd_handler_active_get(Ecore_Fd_Handler *fd_handler,
|
|||
return ret;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_main_fd_handler_active_set(Ecore_Fd_Handler *fd_handler,
|
||||
Ecore_Fd_Handler_Flags flags)
|
||||
{
|
||||
|
|
|
@ -89,14 +89,14 @@ GENERIC_ALLOC_SIZE_DECLARE(Ecore_Pipe);
|
|||
static Eina_Bool _ecore_pipe_read(void *data,
|
||||
Ecore_Fd_Handler *fd_handler);
|
||||
|
||||
ECORE_API Ecore_Pipe *
|
||||
EAPI Ecore_Pipe *
|
||||
ecore_pipe_add(Ecore_Pipe_Cb handler,
|
||||
const void *data)
|
||||
{
|
||||
return _ecore_pipe_add(handler, data);
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_pipe_del(Ecore_Pipe *p)
|
||||
{
|
||||
if (!p) return NULL;
|
||||
|
@ -104,7 +104,7 @@ ecore_pipe_del(Ecore_Pipe *p)
|
|||
return _ecore_pipe_del(p);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_pipe_read_close(Ecore_Pipe *p)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -125,7 +125,7 @@ ecore_pipe_read_close(Ecore_Pipe *p)
|
|||
}
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_pipe_read_fd(Ecore_Pipe *p)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(PIPE_FD_INVALID);
|
||||
|
@ -133,7 +133,7 @@ ecore_pipe_read_fd(Ecore_Pipe *p)
|
|||
return p->fd_read;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_pipe_freeze(Ecore_Pipe *p)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -149,7 +149,7 @@ ecore_pipe_freeze(Ecore_Pipe *p)
|
|||
}
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_pipe_thaw(Ecore_Pipe *p)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -164,7 +164,7 @@ ecore_pipe_thaw(Ecore_Pipe *p)
|
|||
NULL, NULL);
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_pipe_wait(Ecore_Pipe *p,
|
||||
int message_count,
|
||||
double wait)
|
||||
|
@ -172,7 +172,7 @@ ecore_pipe_wait(Ecore_Pipe *p,
|
|||
return _ecore_pipe_wait(p, message_count, wait);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_pipe_write_close(Ecore_Pipe *p)
|
||||
{
|
||||
if (!ECORE_MAGIC_CHECK(p, ECORE_MAGIC_PIPE))
|
||||
|
@ -187,7 +187,7 @@ ecore_pipe_write_close(Ecore_Pipe *p)
|
|||
}
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_pipe_write_fd(Ecore_Pipe *p)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(PIPE_FD_INVALID);
|
||||
|
@ -195,7 +195,7 @@ ecore_pipe_write_fd(Ecore_Pipe *p)
|
|||
return p->fd_write;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_pipe_write(Ecore_Pipe *p,
|
||||
const void *buffer,
|
||||
unsigned int nbytes)
|
||||
|
@ -289,7 +289,7 @@ out:
|
|||
return ok;
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Pipe *
|
||||
EAPI Ecore_Pipe *
|
||||
ecore_pipe_full_add(Ecore_Pipe_Cb handler,
|
||||
const void *data,
|
||||
int fd_read,
|
||||
|
|
|
@ -211,7 +211,7 @@ _ecore_poller_cb_timer(void *data EINA_UNUSED)
|
|||
return ECORE_CALLBACK_RENEW;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_poller_poll_interval_set(Ecore_Poller_Type type EINA_UNUSED,
|
||||
double poll_time)
|
||||
{
|
||||
|
@ -227,14 +227,14 @@ ecore_poller_poll_interval_set(Ecore_Poller_Type type EINA_UNUSED,
|
|||
_ecore_poller_next_tick_eval();
|
||||
}
|
||||
|
||||
ECORE_API double
|
||||
EAPI double
|
||||
ecore_poller_poll_interval_get(Ecore_Poller_Type type EINA_UNUSED)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0);
|
||||
return poll_interval;
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Poller *
|
||||
EAPI Ecore_Poller *
|
||||
ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED,
|
||||
int interval,
|
||||
Ecore_Task_Cb func,
|
||||
|
@ -278,7 +278,7 @@ ecore_poller_add(Ecore_Poller_Type type EINA_UNUSED,
|
|||
return poller;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval)
|
||||
{
|
||||
int ibit;
|
||||
|
@ -310,7 +310,7 @@ ecore_poller_poller_interval_set(Ecore_Poller *poller, int interval)
|
|||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_poller_poller_interval_get(const Ecore_Poller *poller)
|
||||
{
|
||||
int ibit, interval = 1;
|
||||
|
@ -328,7 +328,7 @@ ecore_poller_poller_interval_get(const Ecore_Poller *poller)
|
|||
return interval;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_poller_del(Ecore_Poller *poller)
|
||||
{
|
||||
void *data;
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
#define _ECORE_PRIVATE_H
|
||||
|
||||
#include <assert.h>
|
||||
#include <ecore_api.h>
|
||||
|
||||
#include "ecore_internal.h"
|
||||
|
||||
|
@ -10,6 +9,32 @@
|
|||
#include "ecore_event_message.eo.h"
|
||||
#include "ecore_event_message_handler.eo.h"
|
||||
|
||||
#ifdef EAPI
|
||||
# undef EAPI
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifdef EFL_BUILD
|
||||
# ifdef DLL_EXPORT
|
||||
# define EAPI __declspec(dllexport)
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI __declspec(dllimport)
|
||||
# endif
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
# define EAPI __attribute__ ((visibility("default")))
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
#endif
|
||||
|
||||
extern int _ecore_log_dom;
|
||||
#ifdef _ECORE_DEFAULT_LOG_DOM
|
||||
# undef _ECORE_DEFAULT_LOG_DOM
|
||||
|
@ -197,7 +222,7 @@ typedef struct _Ecore_Evas_Object_Animator_Interface
|
|||
void *(*del)(Ecore_Animator *animator);
|
||||
} Ecore_Evas_Object_Animator_Interface;
|
||||
|
||||
ECORE_API void ecore_evas_object_animator_init(Ecore_Evas_Object_Animator_Interface *iface);
|
||||
EAPI void ecore_evas_object_animator_init(Ecore_Evas_Object_Animator_Interface *iface);
|
||||
|
||||
#define EVAS_FRAME_QUEUING 1 /* for test */
|
||||
|
||||
|
@ -222,12 +247,6 @@ ECORE_API void ecore_evas_object_animator_init(Ecore_Evas_Object_Animator_Interf
|
|||
typedef unsigned int Ecore_Magic;
|
||||
#define ECORE_MAGIC Ecore_Magic __magic
|
||||
|
||||
ECORE_API void
|
||||
_ecore_magic_fail(const void *d,
|
||||
Ecore_Magic m,
|
||||
Ecore_Magic req_m,
|
||||
const char *fname EINA_UNUSED);
|
||||
|
||||
#define ECORE_MAGIC_SET(d, m) (d)->__magic = (m)
|
||||
#define ECORE_MAGIC_CHECK(d, m) ((d) && ((d)->__magic == (m)))
|
||||
#define ECORE_MAGIC_FAIL(d, m, fn) _ecore_magic_fail((d), (d) ? (d)->__magic : 0, (m), (fn));
|
||||
|
@ -242,7 +261,7 @@ _ecore_magic_fail(const void *d,
|
|||
#undef IF_FN_DEL
|
||||
#define IF_FN_DEL(_fn, ptr) if (ptr) { _fn(ptr); ptr = NULL; }
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_print_warning(const char *function,
|
||||
const char *sparam);
|
||||
|
||||
|
@ -263,7 +282,7 @@ ecore_print_warning(const char *function,
|
|||
return; \
|
||||
}
|
||||
|
||||
ECORE_API void _ecore_magic_fail(const void *d,
|
||||
EAPI void _ecore_magic_fail(const void *d,
|
||||
Ecore_Magic m,
|
||||
Ecore_Magic req_m,
|
||||
const char *fname);
|
||||
|
@ -538,4 +557,7 @@ extern Efl_Version _app_efl_version;
|
|||
|
||||
#define EFL_LOOP_DATA efl_data_scope_get(efl_main_loop_get(), EFL_LOOP_CLASS)
|
||||
|
||||
#undef EAPI
|
||||
#define EAPI
|
||||
|
||||
#endif
|
||||
|
|
|
@ -654,7 +654,7 @@ _ecore_thread_shutdown(void)
|
|||
CDD(_ecore_thread_global_hash_cond);
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Thread *
|
||||
EAPI Ecore_Thread *
|
||||
ecore_thread_run(Ecore_Thread_Cb func_blocking,
|
||||
Ecore_Thread_Cb func_end,
|
||||
Ecore_Thread_Cb func_cancel,
|
||||
|
@ -737,7 +737,7 @@ retry:
|
|||
return (Ecore_Thread *)work;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_thread_cancel(Ecore_Thread *thread)
|
||||
{
|
||||
Ecore_Pthread_Worker *volatile work = (Ecore_Pthread_Worker *)thread;
|
||||
|
@ -846,7 +846,7 @@ _ecore_thread_wait_end(void *data EINA_UNUSED, Ecore_Thread *thread)
|
|||
_ecore_thread_wait_reset(waiter, worker);
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_thread_wait(Ecore_Thread *thread, double wait)
|
||||
{
|
||||
Ecore_Pthread_Worker *worker = (Ecore_Pthread_Worker *)thread;
|
||||
|
@ -888,7 +888,7 @@ ecore_thread_wait(Ecore_Thread *thread, double wait)
|
|||
}
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_thread_check(Ecore_Thread *thread)
|
||||
{
|
||||
Ecore_Pthread_Worker *volatile worker = (Ecore_Pthread_Worker *)thread;
|
||||
|
@ -907,7 +907,7 @@ ecore_thread_check(Ecore_Thread *thread)
|
|||
return cancel;
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Thread *
|
||||
EAPI Ecore_Thread *
|
||||
ecore_thread_feedback_run(Ecore_Thread_Cb func_heavy,
|
||||
Ecore_Thread_Notify_Cb func_notify,
|
||||
Ecore_Thread_Cb func_end,
|
||||
|
@ -1033,7 +1033,7 @@ on_error:
|
|||
return (Ecore_Thread *)worker;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_thread_feedback(Ecore_Thread *thread,
|
||||
const void *data)
|
||||
{
|
||||
|
@ -1086,7 +1086,7 @@ ecore_thread_feedback(Ecore_Thread *thread,
|
|||
}
|
||||
|
||||
#if 0
|
||||
ECORE_API Ecore_Thread *
|
||||
EAPI Ecore_Thread *
|
||||
ecore_thread_message_run(Ecore_Thread_Cb func_main,
|
||||
Ecore_Thread_Notify_Cb func_notify,
|
||||
Ecore_Thread_Cb func_end,
|
||||
|
@ -1145,7 +1145,7 @@ ecore_thread_message_run(Ecore_Thread_Cb func_main,
|
|||
|
||||
#endif
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_thread_reschedule(Ecore_Thread *thread)
|
||||
{
|
||||
Ecore_Pthread_Worker *worker = (Ecore_Pthread_Worker *)thread;
|
||||
|
@ -1158,14 +1158,14 @@ ecore_thread_reschedule(Ecore_Thread *thread)
|
|||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_thread_active_get(void)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
|
||||
return _ecore_thread_count;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_thread_pending_get(void)
|
||||
{
|
||||
int ret;
|
||||
|
@ -1177,7 +1177,7 @@ ecore_thread_pending_get(void)
|
|||
return ret;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_thread_pending_feedback_get(void)
|
||||
{
|
||||
int ret;
|
||||
|
@ -1189,7 +1189,7 @@ ecore_thread_pending_feedback_get(void)
|
|||
return ret;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_thread_pending_total_get(void)
|
||||
{
|
||||
int ret;
|
||||
|
@ -1201,14 +1201,14 @@ ecore_thread_pending_total_get(void)
|
|||
return ret;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_thread_max_get(void)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0);
|
||||
return _ecore_thread_count_max;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_thread_max_set(int num)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -1219,14 +1219,14 @@ ecore_thread_max_set(int num)
|
|||
_ecore_thread_count_max = num;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_thread_max_reset(void)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
_ecore_thread_count_max = eina_cpu_count() * 4;
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
ecore_thread_available_get(void)
|
||||
{
|
||||
int ret;
|
||||
|
@ -1237,7 +1237,7 @@ ecore_thread_available_get(void)
|
|||
return ret;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_thread_local_data_add(Ecore_Thread *thread,
|
||||
const char *key,
|
||||
void *value,
|
||||
|
@ -1275,7 +1275,7 @@ ecore_thread_local_data_add(Ecore_Thread *thread,
|
|||
return ret;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_thread_local_data_set(Ecore_Thread *thread,
|
||||
const char *key,
|
||||
void *value,
|
||||
|
@ -1316,7 +1316,7 @@ ecore_thread_local_data_set(Ecore_Thread *thread,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_thread_local_data_find(Ecore_Thread *thread,
|
||||
const char *key)
|
||||
{
|
||||
|
@ -1337,7 +1337,7 @@ ecore_thread_local_data_find(Ecore_Thread *thread,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_thread_local_data_del(Ecore_Thread *thread,
|
||||
const char *key)
|
||||
{
|
||||
|
@ -1356,7 +1356,7 @@ ecore_thread_local_data_del(Ecore_Thread *thread,
|
|||
return r;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_thread_global_data_add(const char *key,
|
||||
void *value,
|
||||
Eina_Free_Cb cb,
|
||||
|
@ -1395,7 +1395,7 @@ ecore_thread_global_data_add(const char *key,
|
|||
return ret;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_thread_global_data_set(const char *key,
|
||||
void *value,
|
||||
Eina_Free_Cb cb)
|
||||
|
@ -1434,7 +1434,7 @@ ecore_thread_global_data_set(const char *key,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_thread_global_data_find(const char *key)
|
||||
{
|
||||
Ecore_Thread_Data *ret;
|
||||
|
@ -1452,7 +1452,7 @@ ecore_thread_global_data_find(const char *key)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_thread_global_data_del(const char *key)
|
||||
{
|
||||
Eina_Bool ret;
|
||||
|
@ -1469,7 +1469,7 @@ ecore_thread_global_data_del(const char *key)
|
|||
return ret;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_thread_global_data_wait(const char *key,
|
||||
double seconds)
|
||||
{
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
static int throttle_val = 0;
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_throttle_adjust(double amount)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -19,7 +19,7 @@ ecore_throttle_adjust(double amount)
|
|||
if (throttle_val < 0) throttle_val = 0;
|
||||
}
|
||||
|
||||
ECORE_API double
|
||||
EAPI double
|
||||
ecore_throttle_get(void)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0);
|
||||
|
|
|
@ -29,7 +29,7 @@ static Eina_Bool _ecore_time_got_clock_id = EINA_FALSE;
|
|||
static double _ecore_time_clock_conversion = 1e-9;
|
||||
#endif
|
||||
|
||||
ECORE_API double
|
||||
EAPI double
|
||||
ecore_time_get(void)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
|
@ -57,7 +57,7 @@ ecore_time_get(void)
|
|||
#endif
|
||||
}
|
||||
|
||||
ECORE_API double
|
||||
EAPI double
|
||||
ecore_time_unix_get(void)
|
||||
{
|
||||
#ifdef HAVE_GETTIMEOFDAY
|
||||
|
@ -70,13 +70,13 @@ ecore_time_unix_get(void)
|
|||
#endif
|
||||
}
|
||||
|
||||
ECORE_API double
|
||||
EAPI double
|
||||
ecore_loop_time_get(void)
|
||||
{
|
||||
return efl_loop_time_get(ML_OBJ);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_loop_time_set(double t)
|
||||
{
|
||||
efl_loop_time_set(ML_OBJ, t);
|
||||
|
|
|
@ -65,14 +65,14 @@ static void _efl_loop_timer_set(Efl_Loop_Timer_Data *timer, double at, double in
|
|||
|
||||
static double precision = 10.0 / 1000000.0;
|
||||
|
||||
ECORE_API double
|
||||
EAPI double
|
||||
ecore_timer_precision_get(void)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(0.0);
|
||||
return precision;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_timer_precision_set(double value)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN;
|
||||
|
@ -185,7 +185,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(legacy_timer,
|
|||
{ EFL_LOOP_TIMER_EVENT_TIMER_TICK, _ecore_timer_legacy_tick },
|
||||
{ EFL_EVENT_DEL, _ecore_timer_legacy_del });
|
||||
|
||||
ECORE_API Ecore_Timer *
|
||||
EAPI Ecore_Timer *
|
||||
ecore_timer_add(double in, Ecore_Task_Cb func, const void *data)
|
||||
{
|
||||
Ecore_Timer_Legacy *legacy;
|
||||
|
@ -209,7 +209,7 @@ ecore_timer_add(double in, Ecore_Task_Cb func, const void *data)
|
|||
return timer;
|
||||
}
|
||||
|
||||
ECORE_API Ecore_Timer *
|
||||
EAPI Ecore_Timer *
|
||||
ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data)
|
||||
{
|
||||
Ecore_Timer_Legacy *legacy;
|
||||
|
@ -234,7 +234,7 @@ ecore_timer_loop_add(double in, Ecore_Task_Cb func, const void *data)
|
|||
return timer;
|
||||
}
|
||||
|
||||
ECORE_API void *
|
||||
EAPI void *
|
||||
ecore_timer_del(Ecore_Timer *timer)
|
||||
{
|
||||
void *data;
|
||||
|
@ -330,7 +330,7 @@ _efl_loop_timer_time_pending_get(const Eo *obj EINA_UNUSED, Efl_Loop_Timer_Data
|
|||
return ret;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_timer_freeze(Ecore_Timer *timer)
|
||||
{
|
||||
ECORE_TIMER_CHECK(timer);
|
||||
|
@ -360,7 +360,7 @@ _efl_loop_timer_efl_object_event_freeze(Eo *obj, Efl_Loop_Timer_Data *timer)
|
|||
_efl_loop_timer_util_instanciate(timer->loop_data, timer);
|
||||
}
|
||||
|
||||
ECORE_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
ecore_timer_freeze_get(Ecore_Timer *timer)
|
||||
{
|
||||
EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
|
||||
|
@ -373,7 +373,7 @@ _efl_loop_timer_efl_object_event_freeze_count_get(const Eo *obj EINA_UNUSED, Efl
|
|||
return timer->frozen;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_timer_thaw(Ecore_Timer *timer)
|
||||
{
|
||||
ECORE_TIMER_CHECK(timer);
|
||||
|
@ -399,7 +399,7 @@ _efl_loop_timer_efl_object_event_thaw(Eo *obj, Efl_Loop_Timer_Data *timer)
|
|||
_efl_loop_timer_set(timer, timer->pending + now, timer->in);
|
||||
}
|
||||
|
||||
ECORE_API char *
|
||||
EAPI char *
|
||||
ecore_timer_dump(void)
|
||||
{
|
||||
return NULL;
|
||||
|
|
|
@ -33,7 +33,7 @@ GENERIC_ALLOC_SIZE_DECLARE(Efl_Loop_Promise_Simple_Data);
|
|||
Eo *_mainloop_singleton = NULL;
|
||||
Efl_Loop_Data *_mainloop_singleton_data = NULL;
|
||||
|
||||
ECORE_API Eo *
|
||||
EAPI Eo *
|
||||
efl_main_loop_get(void)
|
||||
{
|
||||
return efl_app_main_get();
|
||||
|
@ -97,7 +97,7 @@ _efl_loop_time_get(const Eo *obj EINA_UNUSED, Efl_Loop_Data *pd)
|
|||
return pd->loop_time;
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
efl_exit(int exit_code)
|
||||
{
|
||||
Eina_Value v = EINA_VALUE_EMPTY;
|
||||
|
@ -107,7 +107,7 @@ efl_exit(int exit_code)
|
|||
efl_loop_quit(efl_main_loop_get(), v);
|
||||
}
|
||||
|
||||
ECORE_API int
|
||||
EAPI int
|
||||
efl_loop_exit_code_process(Eina_Value *value)
|
||||
{
|
||||
Eina_Value def = EINA_VALUE_EMPTY;
|
||||
|
@ -363,7 +363,7 @@ _efl_loop_arguments_cleanup(Eo *o EINA_UNUSED, void *data, const Eina_Future *de
|
|||
// It doesn't make sense to send those argument to any other mainloop
|
||||
// As it also doesn't make sense to allow anyone to override this, so
|
||||
// should be internal for sure, not even protected.
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_loop_arguments_send(int argc, const char **argv)
|
||||
{
|
||||
Eina_Array *arga, *cml;
|
||||
|
@ -637,9 +637,9 @@ _efl_loop_message_process(Eo *obj, Efl_Loop_Data *pd)
|
|||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
ECORE_API ECORE_API_WEAK EFL_FUNC_BODY(efl_loop_message_process, Eina_Bool, 0);
|
||||
EOAPI EFL_FUNC_BODY(efl_loop_message_process, Eina_Bool, 0);
|
||||
|
||||
ECORE_API ECORE_API_WEAK void
|
||||
EWAPI void
|
||||
efl_build_version_set(int vmaj, int vmin, int vmic, int revision,
|
||||
const char *flavor, const char *build_id)
|
||||
{
|
||||
|
@ -671,7 +671,7 @@ EFL_SCHEDULER_ARRAY_DEFINE(loop_scheduler,
|
|||
EFL_LOOP_EVENT_IDLE_ENTER,
|
||||
EFL_LOOP_EVENT_IDLE);
|
||||
|
||||
ECORE_API Eina_Future_Scheduler *
|
||||
EAPI Eina_Future_Scheduler *
|
||||
efl_loop_future_scheduler_get(const Eo *obj)
|
||||
{
|
||||
Efl_Loop *loop;
|
||||
|
|
|
@ -1,35 +1,35 @@
|
|||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_timer_interval_set(Efl_Loop_Timer *obj, double in)
|
||||
{
|
||||
efl_loop_timer_interval_set(obj, in);
|
||||
}
|
||||
|
||||
ECORE_API double
|
||||
EAPI double
|
||||
ecore_timer_interval_get(const Efl_Loop_Timer *obj)
|
||||
{
|
||||
return efl_loop_timer_interval_get(obj);
|
||||
}
|
||||
|
||||
ECORE_API double
|
||||
EAPI double
|
||||
ecore_timer_pending_get(const Efl_Loop_Timer *obj)
|
||||
{
|
||||
return efl_loop_timer_time_pending_get(obj);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_timer_reset(Efl_Loop_Timer *obj)
|
||||
{
|
||||
efl_loop_timer_reset(obj);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_timer_loop_reset(Efl_Loop_Timer *obj)
|
||||
{
|
||||
efl_loop_timer_loop_reset(obj);
|
||||
}
|
||||
|
||||
ECORE_API void
|
||||
EAPI void
|
||||
ecore_timer_delay(Efl_Loop_Timer *obj, double add)
|
||||
{
|
||||
efl_loop_timer_delay(obj, add);
|
||||
|
|
|
@ -24,7 +24,7 @@ typedef Eo Efl_Loop_Timer;
|
|||
*
|
||||
* @ingroup Ecore_Timer_Group
|
||||
*/
|
||||
ECORE_API void ecore_timer_interval_set(Efl_Loop_Timer *obj, double in);
|
||||
EAPI void ecore_timer_interval_set(Efl_Loop_Timer *obj, double in);
|
||||
|
||||
/**
|
||||
* @brief Interval the timer ticks on.
|
||||
|
@ -35,7 +35,7 @@ ECORE_API void ecore_timer_interval_set(Efl_Loop_Timer *obj, double in);
|
|||
*
|
||||
* @ingroup Ecore_Timer_Group
|
||||
*/
|
||||
ECORE_API double ecore_timer_interval_get(const Efl_Loop_Timer *obj);
|
||||
EAPI double ecore_timer_interval_get(const Efl_Loop_Timer *obj);
|
||||
|
||||
/**
|
||||
* @brief Pending time regarding a timer.
|
||||
|
@ -46,7 +46,7 @@ ECORE_API double ecore_timer_interval_get(const Efl_Loop_Timer *obj);
|
|||
*
|
||||
* @ingroup Ecore_Timer_Group
|
||||
*/
|
||||
ECORE_API double ecore_timer_pending_get(const Efl_Loop_Timer *obj);
|
||||
EAPI double ecore_timer_pending_get(const Efl_Loop_Timer *obj);
|
||||
|
||||
/**
|
||||
* @brief Resets a timer to its full interval. This effectively makes the timer
|
||||
|
@ -61,7 +61,7 @@ ECORE_API double ecore_timer_pending_get(const Efl_Loop_Timer *obj);
|
|||
*
|
||||
* @ingroup Ecore_Timer_Group
|
||||
*/
|
||||
ECORE_API void ecore_timer_reset(Efl_Loop_Timer *obj);
|
||||
EAPI void ecore_timer_reset(Efl_Loop_Timer *obj);
|
||||
|
||||
/** This effectively resets a timer but based on the time when this iteration
|
||||
* of the main loop started.
|
||||
|
@ -70,7 +70,7 @@ ECORE_API void ecore_timer_reset(Efl_Loop_Timer *obj);
|
|||
*
|
||||
* @ingroup Ecore_Timer_Group
|
||||
*/
|
||||
ECORE_API void ecore_timer_loop_reset(Efl_Loop_Timer *obj);
|
||||
EAPI void ecore_timer_loop_reset(Efl_Loop_Timer *obj);
|
||||
|
||||
/**
|
||||
* @brief Adds a delay to the next occurrence of a timer. This doesn't affect
|
||||
|
@ -81,6 +81,6 @@ ECORE_API void ecore_timer_loop_reset(Efl_Loop_Timer *obj);
|
|||
*
|
||||
* @ingroup Ecore_Timer_Group
|
||||
*/
|
||||
ECORE_API void ecore_timer_delay(Efl_Loop_Timer *obj, double add);
|
||||
EAPI void ecore_timer_delay(Efl_Loop_Timer *obj, double add);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -23,7 +23,6 @@ foreach eo_file : pub_legacy_eo_files
|
|||
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
||||
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
||||
'-e', 'ECORE_API',
|
||||
'-gchd', '@INPUT@'])
|
||||
endforeach
|
||||
|
||||
|
@ -84,7 +83,6 @@ foreach eo_file : pub_eo_files
|
|||
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
||||
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
||||
'-e', 'ECORE_API',
|
||||
'-gchd', '@INPUT@'])
|
||||
endforeach
|
||||
|
||||
|
@ -101,7 +99,6 @@ ecore_header_src = [
|
|||
'efl_general.h',
|
||||
'Ecore_Getopt.h',
|
||||
'ecore_exe_eo.h',
|
||||
'ecore_api.h',
|
||||
'ecore_exe_eo.legacy.h',
|
||||
'efl_loop_timer_eo.legacy.h',
|
||||
]
|
||||
|
@ -205,7 +202,7 @@ ecore_lib = library('ecore',
|
|||
dependencies: ecore_pub_deps + [ecore_deps, ecore_ext_deps],
|
||||
include_directories : config_dir + [include_directories(join_paths('..','..'))],
|
||||
install: true,
|
||||
c_args : [package_c_args, '-DECORE_BUILD'],
|
||||
c_args : package_c_args,
|
||||
version : meson.project_version()
|
||||
)
|
||||
|
||||
|
|
|
@ -219,9 +219,6 @@ param in edje programs
|
|||
#ifdef EAPI
|
||||
# undef EAPI
|
||||
#endif
|
||||
#ifdef EAPI_WEAK
|
||||
# undef EAPI_WEAK
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifdef EFL_BUILD
|
||||
|
@ -233,19 +230,15 @@ param in edje programs
|
|||
# else
|
||||
# define EAPI __declspec(dllimport)
|
||||
# endif
|
||||
# define EAPI_WEAK
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
# define EAPI __attribute__ ((visibility("default")))
|
||||
# define EAPI_WEAK __attribute__ ((weak))
|
||||
# else
|
||||
# define EAPI
|
||||
# define EAPI_WEAK
|
||||
# endif
|
||||
# else
|
||||
# define EAPI
|
||||
# define EAPI_WEAK
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
|
|
@ -25,19 +25,15 @@
|
|||
# else
|
||||
# define EAPI __declspec(dllimport)
|
||||
# endif
|
||||
# define EAPI_WEAK
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
# define EAPI __attribute__ ((visibility("default")))
|
||||
# define EAPI_WEAK __attribute__ ((weak))
|
||||
# else
|
||||
# define EAPI
|
||||
# define EAPI_WEAK
|
||||
# endif
|
||||
# else
|
||||
# define EAPI
|
||||
# define EAPI_WEAK
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
|
|
@ -7,7 +7,44 @@ extern "C" {
|
|||
|
||||
#include <Eo.h>
|
||||
|
||||
#include <efl_api.h>
|
||||
#ifdef EAPI
|
||||
# undef EAPI
|
||||
#endif
|
||||
#ifdef EWAPI
|
||||
# undef EWAPI
|
||||
#endif
|
||||
#ifdef EOAPI
|
||||
# undef EOAPI
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifdef EFL_BUILD
|
||||
# ifdef DLL_EXPORT
|
||||
# define EAPI __declspec(dllexport)
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI __declspec(dllimport)
|
||||
# endif
|
||||
# define EAPI_WEAK
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
# define EAPI __attribute__ ((visibility("default")))
|
||||
# define EAPI_WEAK __attribute__ ((weak))
|
||||
# else
|
||||
# define EAPI
|
||||
# define EAPI_WEAK
|
||||
# endif
|
||||
# else
|
||||
# define EAPI
|
||||
# define EAPI_WEAK
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#define EWAPI EAPI EAPI_WEAK
|
||||
#define EOAPI EAPI EAPI_WEAK
|
||||
|
||||
#define EFL_VERSION_1_18 1
|
||||
#define EFL_VERSION_1_19 1
|
||||
|
@ -46,39 +83,39 @@ typedef struct _Efl_Text_Attribute_Handle Efl_Text_Attribute_Handle;
|
|||
|
||||
#ifdef EFL_BETA_API_SUPPORT
|
||||
/** No error on load */
|
||||
EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_NONE;
|
||||
extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_NONE;
|
||||
|
||||
/** A non-specific error occurred */
|
||||
EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_GENERIC;
|
||||
extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_GENERIC;
|
||||
|
||||
/** File (or file path) does not exist */
|
||||
EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_DOES_NOT_EXIST;
|
||||
extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_DOES_NOT_EXIST;
|
||||
|
||||
/** Permission denied to an existing file (or path) */
|
||||
EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_PERMISSION_DENIED;
|
||||
extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_PERMISSION_DENIED;
|
||||
|
||||
/** Allocation of resources failure prevented load */
|
||||
EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
|
||||
extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
|
||||
|
||||
/** File corrupt (but was detected as a known format) */
|
||||
EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CORRUPT_FILE;
|
||||
extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CORRUPT_FILE;
|
||||
|
||||
/** File is not a known format */
|
||||
EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT;
|
||||
extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT;
|
||||
|
||||
/** Reading operation has been cancelled during decoding */
|
||||
EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CANCELLED;
|
||||
extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_CANCELLED;
|
||||
|
||||
/** (Edje only) The file pointed to is incompatible, i.e., it doesn't
|
||||
* match the library's current version's format. */
|
||||
EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_INCOMPATIBLE_FILE;
|
||||
extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_INCOMPATIBLE_FILE;
|
||||
|
||||
/** (Edje only) The group/collection set to load from was not found in the file */
|
||||
EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_COLLECTION;
|
||||
extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_UNKNOWN_COLLECTION;
|
||||
|
||||
/** (Edje only) The group/collection set to load from had recursive references
|
||||
* on its components */
|
||||
EFL_API EFL_API_WEAK extern Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RECURSIVE_REFERENCE;
|
||||
extern EWAPI Eina_Error EFL_GFX_IMAGE_LOAD_ERROR_RECURSIVE_REFERENCE;
|
||||
#endif /* EFL_BETA_API_SUPPORT */
|
||||
|
||||
#include "interfaces/efl_gfx_types.eot.h"
|
||||
|
@ -194,11 +231,11 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
|
|||
*
|
||||
* @since 1.21
|
||||
*/
|
||||
EFL_API Efl_Object *efl_part(const Eo *obj, const char *name);
|
||||
EAPI Efl_Object *efl_part(const Eo *obj, const char *name);
|
||||
|
||||
#ifdef EFL_BETA_API_SUPPORT
|
||||
|
||||
EFL_API void efl_observable_tuple_free(Efl_Observable_Tuple *tuple);
|
||||
EAPI void efl_observable_tuple_free(Efl_Observable_Tuple *tuple);
|
||||
|
||||
|
||||
|
||||
|
@ -305,10 +342,13 @@ efl_config_string_get(const Efl_Config *obj, const char *name)
|
|||
#endif
|
||||
|
||||
/* work-around bug in gcc --as-needed link optimization */
|
||||
EFL_API void __efl_internal_init(void);
|
||||
EAPI void __efl_internal_init(void);
|
||||
|
||||
#if defined ( __cplusplus )
|
||||
}
|
||||
#endif
|
||||
|
||||
#undef EAPI
|
||||
#define EAPI
|
||||
|
||||
#endif
|
||||
|
|
|
@ -3,22 +3,22 @@
|
|||
|
||||
#include <Eina.h>
|
||||
|
||||
EFL_API extern Eina_Error EFL_MODEL_ERROR_UNKNOWN;
|
||||
EFL_API extern Eina_Error EFL_MODEL_ERROR_NOT_SUPPORTED;
|
||||
EFL_API extern Eina_Error EFL_MODEL_ERROR_NOT_FOUND;
|
||||
EFL_API extern Eina_Error EFL_MODEL_ERROR_READ_ONLY;
|
||||
EFL_API extern Eina_Error EFL_MODEL_ERROR_INIT_FAILED;
|
||||
EFL_API extern Eina_Error EFL_MODEL_ERROR_INCORRECT_VALUE;
|
||||
EFL_API extern Eina_Error EFL_MODEL_ERROR_PERMISSION_DENIED;
|
||||
EFL_API extern Eina_Error EFL_MODEL_ERROR_INVALID_OBJECT; /**< @since 1.19 */
|
||||
EAPI extern Eina_Error EFL_MODEL_ERROR_UNKNOWN;
|
||||
EAPI extern Eina_Error EFL_MODEL_ERROR_NOT_SUPPORTED;
|
||||
EAPI extern Eina_Error EFL_MODEL_ERROR_NOT_FOUND;
|
||||
EAPI extern Eina_Error EFL_MODEL_ERROR_READ_ONLY;
|
||||
EAPI extern Eina_Error EFL_MODEL_ERROR_INIT_FAILED;
|
||||
EAPI extern Eina_Error EFL_MODEL_ERROR_INCORRECT_VALUE;
|
||||
EAPI extern Eina_Error EFL_MODEL_ERROR_PERMISSION_DENIED;
|
||||
EAPI extern Eina_Error EFL_MODEL_ERROR_INVALID_OBJECT; /**< @since 1.19 */
|
||||
|
||||
EFL_API extern Eina_Error EFL_PROPERTY_ERROR_INVALID_KEY; /**< Returned when the given key during a efl_ui_property_bind does not exist on the object. */
|
||||
EAPI extern Eina_Error EFL_PROPERTY_ERROR_INVALID_KEY; /**< Returned when the given key during a efl_ui_property_bind does not exist on the object. */
|
||||
|
||||
EFL_API extern Eina_Error EFL_FACTORY_ERROR_NOT_SUPPORTED; /**< Returned error when factory got a request that it can't fullfil due to a set of unsupported parameters @since 1.22 */
|
||||
EAPI extern Eina_Error EFL_FACTORY_ERROR_NOT_SUPPORTED; /**< Returned error when factory got a request that it can't fullfil due to a set of unsupported parameters @since 1.22 */
|
||||
|
||||
#include "interfaces/efl_model.eo.h"
|
||||
|
||||
EFL_API int efl_model_init(void);
|
||||
EAPI int efl_model_init(void);
|
||||
|
||||
|
||||
/**
|
||||
|
@ -29,7 +29,7 @@ EFL_API int efl_model_init(void);
|
|||
*
|
||||
* @since 1.17
|
||||
*/
|
||||
EFL_API void _efl_model_properties_changed_internal(const Efl_Model *model, ...);
|
||||
EAPI void _efl_model_properties_changed_internal(const Efl_Model *model, ...);
|
||||
|
||||
#define efl_model_properties_changed(Model, ...) _efl_model_properties_changed_internal(Model, ##__VA_ARGS__, NULL)
|
||||
|
||||
|
@ -41,7 +41,7 @@ EFL_API void _efl_model_properties_changed_internal(const Efl_Model *model, ...)
|
|||
*
|
||||
* @since 1.17
|
||||
*/
|
||||
EFL_API void efl_model_property_invalidated_notify(Efl_Model *model, const char *property);
|
||||
EAPI void efl_model_property_invalidated_notify(Efl_Model *model, const char *property);
|
||||
|
||||
/**
|
||||
* @brief Callback to setup a member of @c Eina_Value_Struct
|
||||
|
@ -62,7 +62,7 @@ typedef void (*Efl_Model_Value_Struct_Member_Setup_Cb)(void *data, int index, Ei
|
|||
*
|
||||
* @since 1.17
|
||||
*/
|
||||
EFL_API Eina_Value_Struct_Desc *efl_model_value_struct_description_new(unsigned int member_count, Efl_Model_Value_Struct_Member_Setup_Cb setup_cb, void *data) EINA_ARG_NONNULL(2);
|
||||
EAPI Eina_Value_Struct_Desc *efl_model_value_struct_description_new(unsigned int member_count, Efl_Model_Value_Struct_Member_Setup_Cb setup_cb, void *data) EINA_ARG_NONNULL(2);
|
||||
|
||||
/**
|
||||
* @brief Frees the memory allocated to the struct description.
|
||||
|
@ -71,6 +71,6 @@ EFL_API Eina_Value_Struct_Desc *efl_model_value_struct_description_new(unsigned
|
|||
*
|
||||
* @since 1.17
|
||||
*/
|
||||
EFL_API void efl_model_value_struct_description_free(Eina_Value_Struct_Desc *desc);
|
||||
EAPI void efl_model_value_struct_description_free(Eina_Value_Struct_Desc *desc);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,32 +0,0 @@
|
|||
#ifndef _EFL_EFL_API_H
|
||||
#define _EFL_EFL_API_H
|
||||
|
||||
#ifdef EFL_API
|
||||
#error EFL_API should not be already defined
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifndef EFL_STATIC
|
||||
# ifdef EFL_BUILD
|
||||
# define EFL_API __declspec(dllexport)
|
||||
# else
|
||||
# define EFL_API __declspec(dllimport)
|
||||
# endif
|
||||
# else
|
||||
# define EFL_API
|
||||
# endif
|
||||
# define EFL_API_WEAK
|
||||
#elif defined(__GNUC__)
|
||||
# if __GNUC__ >= 4
|
||||
# define EFL_API __attribute__ ((visibility("default")))
|
||||
# define EFL_API_WEAK __attribute__ ((weak))
|
||||
# else
|
||||
# define EFL_API
|
||||
# define EFL_API_WEAK
|
||||
# endif
|
||||
#else
|
||||
# define EFL_API
|
||||
# define EFL_API_WEAK
|
||||
#endif
|
||||
|
||||
#endif
|
|
@ -167,7 +167,7 @@ _efl_file_efl_object_finalize(Eo *obj, Efl_File_Data *pd)
|
|||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
EFL_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
efl_file_simple_load(Eo *obj, const char *file, const char *key)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
|
||||
|
@ -192,7 +192,7 @@ fail:
|
|||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
EFL_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
efl_file_simple_mmap_load(Eo *obj, const Eina_File *file, const char *key)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE);
|
||||
|
@ -213,7 +213,7 @@ fail:
|
|||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
EFL_API void
|
||||
EAPI void
|
||||
efl_file_simple_get(const Eo *obj, const char **file, const char **key)
|
||||
{
|
||||
efl_ref((Eo*)obj);
|
||||
|
@ -222,7 +222,7 @@ efl_file_simple_get(const Eo *obj, const char **file, const char **key)
|
|||
efl_unref((Eo*)obj);
|
||||
}
|
||||
|
||||
EFL_API void
|
||||
EAPI void
|
||||
efl_file_simple_mmap_get(const Eo *obj, const Eina_File **file, const char **key)
|
||||
{
|
||||
efl_ref((Eo*)obj);
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
# define _EFL_FILE_H
|
||||
|
||||
/* add doc note about needing ref/unref when passing efl_part to these functions */
|
||||
EFL_API Eina_Bool efl_file_simple_load(Eo *obj, const char *file, const char *key);
|
||||
EFL_API Eina_Bool efl_file_simple_mmap_load(Eo *obj, const Eina_File *file, const char *key);
|
||||
EFL_API void efl_file_simple_get(const Eo *obj, const char **file, const char **key);
|
||||
EFL_API void efl_file_simple_mmap_get(const Eo *obj, const Eina_File **file, const char **key);
|
||||
EAPI Eina_Bool efl_file_simple_load(Eo *obj, const char *file, const char *key);
|
||||
EAPI Eina_Bool efl_file_simple_mmap_load(Eo *obj, const Eina_File *file, const char *key);
|
||||
EAPI void efl_file_simple_get(const Eo *obj, const char **file, const char **key);
|
||||
EAPI void efl_file_simple_mmap_get(const Eo *obj, const Eina_File **file, const char **key);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -85,7 +85,7 @@ _noref_death(void *data EINA_UNUSED, const Efl_Event *event)
|
|||
efl_del(event->object);
|
||||
}
|
||||
|
||||
EFL_API Efl_Object *
|
||||
EAPI Efl_Object *
|
||||
efl_part(const Eo *obj, const char *name)
|
||||
{
|
||||
Efl_Object *r;
|
||||
|
@ -105,7 +105,7 @@ efl_part(const Eo *obj, const char *name)
|
|||
return efl_ref(r);
|
||||
}
|
||||
|
||||
EFL_API void
|
||||
EAPI void
|
||||
__efl_internal_init(void)
|
||||
{
|
||||
efl_model_init();
|
||||
|
|
|
@ -5,17 +5,17 @@
|
|||
#include "Efl.h"
|
||||
#include "Efl_MVVM_Common.h"
|
||||
|
||||
EFL_API Eina_Error EFL_MODEL_ERROR_UNKNOWN = 0;
|
||||
EFL_API Eina_Error EFL_MODEL_ERROR_NOT_SUPPORTED = 0;
|
||||
EFL_API Eina_Error EFL_MODEL_ERROR_NOT_FOUND = 0;
|
||||
EFL_API Eina_Error EFL_MODEL_ERROR_READ_ONLY = 0;
|
||||
EFL_API Eina_Error EFL_MODEL_ERROR_INIT_FAILED = 0;
|
||||
EFL_API Eina_Error EFL_MODEL_ERROR_PERMISSION_DENIED = 0;
|
||||
EFL_API Eina_Error EFL_MODEL_ERROR_INCORRECT_VALUE = 0;
|
||||
EFL_API Eina_Error EFL_MODEL_ERROR_INVALID_OBJECT = 0;
|
||||
EAPI Eina_Error EFL_MODEL_ERROR_UNKNOWN = 0;
|
||||
EAPI Eina_Error EFL_MODEL_ERROR_NOT_SUPPORTED = 0;
|
||||
EAPI Eina_Error EFL_MODEL_ERROR_NOT_FOUND = 0;
|
||||
EAPI Eina_Error EFL_MODEL_ERROR_READ_ONLY = 0;
|
||||
EAPI Eina_Error EFL_MODEL_ERROR_INIT_FAILED = 0;
|
||||
EAPI Eina_Error EFL_MODEL_ERROR_PERMISSION_DENIED = 0;
|
||||
EAPI Eina_Error EFL_MODEL_ERROR_INCORRECT_VALUE = 0;
|
||||
EAPI Eina_Error EFL_MODEL_ERROR_INVALID_OBJECT = 0;
|
||||
|
||||
EFL_API Eina_Error EFL_FACTORY_ERROR_NOT_SUPPORTED = 0;
|
||||
EFL_API Eina_Error EFL_PROPERTY_ERROR_INVALID_KEY = 0;
|
||||
EAPI Eina_Error EFL_FACTORY_ERROR_NOT_SUPPORTED = 0;
|
||||
EAPI Eina_Error EFL_PROPERTY_ERROR_INVALID_KEY = 0;
|
||||
|
||||
static const char EFL_MODEL_ERROR_UNKNOWN_STR[] = "Unknown Error";
|
||||
static const char EFL_MODEL_ERROR_NOT_SUPPORTED_STR[] = "Operation not supported";
|
||||
|
@ -31,7 +31,7 @@ static const char EFL_FACTORY_ERROR_NOT_SUPPORTED_STR[] = "Operation not suppo
|
|||
static const char EFL_PROPERTY_ERROR_INVALID_KEY_STR[] = "Incorrect key provided";
|
||||
|
||||
|
||||
EFL_API int
|
||||
EAPI int
|
||||
efl_model_init(void)
|
||||
{
|
||||
#define _ERROR(Name) EFL_MODEL_ERROR_##Name = eina_error_msg_static_register(EFL_MODEL_ERROR_##Name##_STR);
|
||||
|
@ -57,7 +57,7 @@ efl_model_init(void)
|
|||
|
||||
#undef _ERROR
|
||||
|
||||
EFL_API void
|
||||
EAPI void
|
||||
_efl_model_properties_changed_internal(const Efl_Model *model, ...)
|
||||
{
|
||||
Efl_Model_Property_Event ev = { 0 };
|
||||
|
@ -84,7 +84,7 @@ _efl_model_properties_changed_internal(const Efl_Model *model, ...)
|
|||
eina_array_free(properties);
|
||||
}
|
||||
|
||||
EFL_API void
|
||||
EAPI void
|
||||
efl_model_property_invalidated_notify(Efl_Model *model, const char *property)
|
||||
{
|
||||
Eina_Array *invalidated_properties = eina_array_new(1);
|
||||
|
@ -112,7 +112,7 @@ struct _Efl_Model_Value_Struct_Desc
|
|||
Eina_Value_Struct_Member members[];
|
||||
};
|
||||
|
||||
EFL_API Eina_Value_Struct_Desc *
|
||||
EAPI Eina_Value_Struct_Desc *
|
||||
efl_model_value_struct_description_new(unsigned int member_count, Efl_Model_Value_Struct_Member_Setup_Cb setup_cb, void *data)
|
||||
{
|
||||
Efl_Model_Value_Struct_Desc *desc;
|
||||
|
@ -152,7 +152,7 @@ efl_model_value_struct_description_new(unsigned int member_count, Efl_Model_Valu
|
|||
return &desc->base;
|
||||
}
|
||||
|
||||
EFL_API void
|
||||
EAPI void
|
||||
efl_model_value_struct_description_free(Eina_Value_Struct_Desc *desc)
|
||||
{
|
||||
size_t i;
|
||||
|
|
|
@ -257,7 +257,7 @@ _efl_observable_iterator_tuple_new(Eo *obj, Efl_Observable_Data *pd)
|
|||
return &it->iterator;
|
||||
}
|
||||
|
||||
EFL_API void
|
||||
EAPI void
|
||||
efl_observable_tuple_free(Efl_Observable_Tuple *tuple)
|
||||
{
|
||||
//key is not owned
|
||||
|
|
|
@ -25,7 +25,6 @@ foreach eo_file : pub_legacy_eo_files
|
|||
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
||||
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
||||
'-e', 'EFL_API',
|
||||
'-gchd', '@INPUT@'])
|
||||
endforeach
|
||||
|
||||
|
@ -108,7 +107,6 @@ foreach eo_file : pub_eo_files
|
|||
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
||||
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
||||
'-e', 'EFL_API',
|
||||
'-gchd', '@INPUT@'])
|
||||
endforeach
|
||||
|
||||
|
@ -131,7 +129,6 @@ foreach eo_file : pub_eo_types_files
|
|||
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
|
||||
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
||||
'-e', 'EFL_API',
|
||||
'-ghd', '@INPUT@'])
|
||||
endforeach
|
||||
|
||||
|
|
|
@ -4,8 +4,7 @@ efl_ext_deps = []
|
|||
|
||||
efl_header_src = [
|
||||
'Efl.h',
|
||||
'Efl_MVVM_Common.h',
|
||||
'efl_api.h'
|
||||
'Efl_MVVM_Common.h'
|
||||
]
|
||||
|
||||
efl_src = []
|
||||
|
@ -15,7 +14,7 @@ package_header_subdirs += 'interfaces'
|
|||
|
||||
efl_lib = library('efl',
|
||||
efl_src, pub_eo_file_target,
|
||||
c_args : [package_c_args, '-DEFL_BUILD'],
|
||||
c_args : package_c_args,
|
||||
dependencies: [efl_deps, efl_pub_deps, efl_ext_deps],
|
||||
install: true,
|
||||
version : meson.project_version()
|
||||
|
|
|
@ -20,6 +20,8 @@
|
|||
# endif
|
||||
# endif
|
||||
|
||||
#define EWAPI EAPI EAPI_WEAK
|
||||
|
||||
#ifdef WAYLAND_UTIL_H
|
||||
typedef struct wl_surface Efl_Canvas_Wl_Wl_Surface;
|
||||
typedef struct wl_global Efl_Canvas_Wl_Wl_Global;
|
||||
|
|
|
@ -83,7 +83,31 @@
|
|||
#ifdef EFL_BETA_API_SUPPORT
|
||||
#include <Efl.h>
|
||||
#endif
|
||||
#include <eldbus_api.h>
|
||||
#ifdef EAPI
|
||||
# undef EAPI
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifdef EFL_BUILD
|
||||
# ifdef DLL_EXPORT
|
||||
# define EAPI __declspec(dllexport)
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI __declspec(dllimport)
|
||||
# endif
|
||||
#else
|
||||
# ifdef __GNUC__
|
||||
# if __GNUC__ >= 4
|
||||
# define EAPI __attribute__ ((visibility("default")))
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
# else
|
||||
# define EAPI
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
@ -120,20 +144,20 @@ typedef struct _Eldbus_Version
|
|||
int revision; /**< git revision (0 if a proper release or the git revision number Eldbus is built from) */
|
||||
} Eldbus_Version;
|
||||
|
||||
ELDBUS_API extern const Eldbus_Version * eldbus_version; /**< Global Eldbus_Version object */
|
||||
EAPI extern const Eldbus_Version * eldbus_version; /**< Global Eldbus_Version object */
|
||||
|
||||
/**
|
||||
* @brief Initialize eldbus.
|
||||
*
|
||||
* @return 1 or greater on success, 0 otherwise
|
||||
*/
|
||||
ELDBUS_API int eldbus_init(void);
|
||||
EAPI int eldbus_init(void);
|
||||
/**
|
||||
* @brief Shutdown eldbus.
|
||||
*
|
||||
* @return 0 if e_dbus shuts down, greater than 0 otherwise.
|
||||
*/
|
||||
ELDBUS_API int eldbus_shutdown(void);
|
||||
EAPI int eldbus_shutdown(void);
|
||||
|
||||
/**
|
||||
* @typedef Eldbus_Free_Cb
|
||||
|
@ -234,4 +258,7 @@ typedef struct _Eldbus_Object Eldbus_Object;
|
|||
}
|
||||
#endif
|
||||
|
||||
#undef EAPI
|
||||
#define EAPI
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1,32 +0,0 @@
|
|||
#ifndef _EFL_ELDBUS_API_H
|
||||
#define _EFL_ELDBUS_API_H
|
||||
|
||||
#ifdef ELDBUS_API
|
||||
#error ELDBUS_API should not be already defined
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifndef ELDBUS_STATIC
|
||||
# ifdef ELDBUS_BUILD
|
||||
# define ELDBUS_API __declspec(dllexport)
|
||||
# else
|
||||
# define ELDBUS_API __declspec(dllimport)
|
||||
# endif
|
||||
# else
|
||||
# define ELDBUS_API
|
||||
# endif
|
||||
# define ELDBUS_API_WEAK
|
||||
#elif defined(__GNUC__)
|
||||
# if __GNUC__ >= 4
|
||||
# define ELDBUS_API __attribute__ ((visibility("default")))
|
||||
# define ELDBUS_API_WEAK __attribute__ ((weak))
|
||||
# else
|
||||
# define ELDBUS_API
|
||||
# define ELDBUS_API_WEAK
|
||||
# endif
|
||||
#else
|
||||
# define ELDBUS_API
|
||||
# define ELDBUS_API_WEAK
|
||||
#endif
|
||||
|
||||
#endif
|
|
@ -34,7 +34,7 @@ typedef enum
|
|||
*
|
||||
* @return connection with bus
|
||||
*/
|
||||
ELDBUS_API Eldbus_Connection *eldbus_connection_get(Eldbus_Connection_Type type);
|
||||
EAPI Eldbus_Connection *eldbus_connection_get(Eldbus_Connection_Type type);
|
||||
|
||||
/**
|
||||
* Always create and establish a new connection to bus and integrate it with
|
||||
|
@ -47,7 +47,7 @@ ELDBUS_API Eldbus_Connection *eldbus_connection_get(Eldbus_Connection_Type type)
|
|||
*
|
||||
* @return connection with bus
|
||||
*/
|
||||
ELDBUS_API Eldbus_Connection *eldbus_private_connection_get(Eldbus_Connection_Type type);
|
||||
EAPI Eldbus_Connection *eldbus_private_connection_get(Eldbus_Connection_Type type);
|
||||
|
||||
/**
|
||||
* Establish a connection to bus and integrate it with the ecore main
|
||||
|
@ -58,7 +58,7 @@ ELDBUS_API Eldbus_Connection *eldbus_private_connection_get(Eldbus_Connection_Ty
|
|||
*
|
||||
* @return connection with bus
|
||||
*/
|
||||
ELDBUS_API Eldbus_Connection *eldbus_address_connection_get(const char *address) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Connection *eldbus_address_connection_get(const char *address) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* Always create and establish a new connection to bus and integrate it with
|
||||
|
@ -70,7 +70,7 @@ ELDBUS_API Eldbus_Connection *eldbus_address_connection_get(const char *address)
|
|||
*
|
||||
* @return connection with bus
|
||||
*/
|
||||
ELDBUS_API Eldbus_Connection *eldbus_private_address_connection_get(const char *address) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Connection *eldbus_private_address_connection_get(const char *address) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Increment connection reference count.
|
||||
|
@ -78,7 +78,7 @@ ELDBUS_API Eldbus_Connection *eldbus_private_address_connection_get(const char *
|
|||
* @param conn The given Eldbus_Connection object to reference.
|
||||
* @return The Eldbus_Connection object given as parameter.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Connection *eldbus_connection_ref(Eldbus_Connection *conn) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Connection *eldbus_connection_ref(Eldbus_Connection *conn) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Decrement connection reference count.
|
||||
|
@ -88,7 +88,7 @@ ELDBUS_API Eldbus_Connection *eldbus_connection_ref(Eldbus_Connection *conn) EIN
|
|||
*
|
||||
* @param conn The given Eldbus_Connection object to unreference.
|
||||
*/
|
||||
ELDBUS_API void eldbus_connection_unref(Eldbus_Connection *conn) EINA_ARG_NONNULL(1);
|
||||
EAPI void eldbus_connection_unref(Eldbus_Connection *conn) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Add a callback function to be called when connection is freed
|
||||
|
@ -97,7 +97,7 @@ ELDBUS_API void eldbus_connection_unref(Eldbus_Connection *conn) EI
|
|||
* @param cb The callback to be called when the connection is free.
|
||||
* @param data The data passed to the callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_connection_free_cb_add(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void eldbus_connection_free_cb_add(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Remove callback registered in eldbus_connection_free_cb_add().
|
||||
|
@ -106,7 +106,7 @@ ELDBUS_API void eldbus_connection_free_cb_add(Eldbus_Connection *co
|
|||
* @param cb The callback that was called when the connection was free.
|
||||
* @param data The data that was passed to the callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_connection_free_cb_del(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void eldbus_connection_free_cb_del(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Set an attached data pointer to an object with a given string key.
|
||||
|
@ -115,7 +115,7 @@ ELDBUS_API void eldbus_connection_free_cb_del(Eldbus_Connection *co
|
|||
* @param key to identify data
|
||||
* @param data data that will be stored
|
||||
*/
|
||||
ELDBUS_API void eldbus_connection_data_set(Eldbus_Connection *conn, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI void eldbus_connection_data_set(Eldbus_Connection *conn, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
/**
|
||||
* @brief Get data stored in connection.
|
||||
|
@ -125,7 +125,7 @@ ELDBUS_API void eldbus_connection_data_set(Eldbus_Connection *conn,
|
|||
*
|
||||
* @return pointer to data if found otherwise NULL
|
||||
*/
|
||||
ELDBUS_API void *eldbus_connection_data_get(const Eldbus_Connection *conn, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void *eldbus_connection_data_get(const Eldbus_Connection *conn, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Del data stored in connection.
|
||||
|
@ -135,7 +135,7 @@ ELDBUS_API void *eldbus_connection_data_get(const Eldbus_Connection
|
|||
*
|
||||
* @return pointer to data if found otherwise NULL
|
||||
*/
|
||||
ELDBUS_API void *eldbus_connection_data_del(Eldbus_Connection *conn, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void *eldbus_connection_data_del(Eldbus_Connection *conn, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @typedef Eldbus_Connection_Event_Type
|
||||
|
@ -164,7 +164,7 @@ typedef void (*Eldbus_Connection_Event_Cb)(void *data, Eldbus_Connection *conn,
|
|||
* @param cb The callback to be called when the event is triggered.
|
||||
* @param cb_data The data passed to the callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_connection_event_callback_add(Eldbus_Connection *conn, Eldbus_Connection_Event_Type type, Eldbus_Connection_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
EAPI void eldbus_connection_event_callback_add(Eldbus_Connection *conn, Eldbus_Connection_Event_Type type, Eldbus_Connection_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
|
||||
/**
|
||||
* @brief Remove callback registered in eldbus_connection_event_callback_add().
|
||||
|
@ -174,7 +174,7 @@ ELDBUS_API void eldbus_connection_event_callback_add(Eldbus_Con
|
|||
* @param cb The callback that was called when the event was triggered.
|
||||
* @param cb_data The data that was passed to the callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_connection_event_callback_del(Eldbus_Connection *conn, Eldbus_Connection_Event_Type type, Eldbus_Connection_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
EAPI void eldbus_connection_event_callback_del(Eldbus_Connection *conn, Eldbus_Connection_Event_Type type, Eldbus_Connection_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
|
||||
/**
|
||||
* @brief Send a message.
|
||||
|
@ -188,7 +188,7 @@ ELDBUS_API void eldbus_connection_event_callback_del(Eldbus_Con
|
|||
* ELDBUS_TIMEOUT_INFINITE for no timeout
|
||||
* @return A Eldbus_Pending struct.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_connection_send(Eldbus_Connection *conn, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Pending *eldbus_connection_send(Eldbus_Connection *conn, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Gets unique name assigned by the message bus.
|
||||
|
@ -198,7 +198,7 @@ ELDBUS_API Eldbus_Pending *eldbus_connection_send(Eldbus_Connection *conn, Eldbu
|
|||
* @return pointer to unique name string or NULL or error. Returned value
|
||||
* remains valid until connection is free.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_connection_unique_name_get(Eldbus_Connection *conn) EINA_ARG_NONNULL(1);
|
||||
EAPI const char *eldbus_connection_unique_name_get(Eldbus_Connection *conn) EINA_ARG_NONNULL(1);
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
|
|
@ -69,7 +69,7 @@ typedef struct _Eldbus_Timeout_Data
|
|||
} Eldbus_Timeout_Data;
|
||||
|
||||
static const Eldbus_Version _version = {VMAJ, VMIN, VMIC, VREV};
|
||||
ELDBUS_API const Eldbus_Version * eldbus_version = &_version;
|
||||
EAPI const Eldbus_Version * eldbus_version = &_version;
|
||||
|
||||
static int _eldbus_init_count = 0;
|
||||
int _eldbus_log_dom = -1;
|
||||
|
@ -124,7 +124,7 @@ _eldbus_fork_reset()
|
|||
address_connections = NULL;
|
||||
}
|
||||
|
||||
ELDBUS_API int
|
||||
EAPI int
|
||||
eldbus_init(void)
|
||||
{
|
||||
if (_eldbus_init_count++ > 0)
|
||||
|
@ -242,7 +242,7 @@ print_live_connection(Eldbus_Connection *conn)
|
|||
}
|
||||
}
|
||||
|
||||
ELDBUS_API int
|
||||
EAPI int
|
||||
eldbus_shutdown(void)
|
||||
{
|
||||
if (_eldbus_init_count <= 0)
|
||||
|
@ -1091,14 +1091,14 @@ _connection_get(Eldbus_Connection_Type type, const char *address, Eina_Bool shar
|
|||
return conn;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Connection *
|
||||
EAPI Eldbus_Connection *
|
||||
eldbus_private_connection_get(Eldbus_Connection_Type type)
|
||||
{
|
||||
DBG("Getting private connection with type %d", type);
|
||||
return _connection_get(type, NULL, EINA_FALSE);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Connection *
|
||||
EAPI Eldbus_Connection *
|
||||
eldbus_connection_get(Eldbus_Connection_Type type)
|
||||
{
|
||||
Eldbus_Connection *conn;
|
||||
|
@ -1129,7 +1129,7 @@ eldbus_connection_get(Eldbus_Connection_Type type)
|
|||
return conn;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Connection *
|
||||
EAPI Eldbus_Connection *
|
||||
eldbus_address_connection_get(const char *address)
|
||||
{
|
||||
Eldbus_Connection *conn = NULL;
|
||||
|
@ -1160,14 +1160,14 @@ eldbus_address_connection_get(const char *address)
|
|||
return conn;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Connection *
|
||||
EAPI Eldbus_Connection *
|
||||
eldbus_private_address_connection_get(const char *address)
|
||||
{
|
||||
DBG("Getting private connection with address %s", address);
|
||||
return _connection_get(ELDBUS_CONNECTION_TYPE_ADDRESS, address, EINA_FALSE);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Connection *
|
||||
EAPI Eldbus_Connection *
|
||||
eldbus_connection_ref(Eldbus_Connection *conn)
|
||||
{
|
||||
ELDBUS_CONNECTION_CHECK_RETVAL(conn, NULL);
|
||||
|
@ -1302,7 +1302,7 @@ _eldbus_connection_free(Eldbus_Connection *conn)
|
|||
free(conn);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_connection_unref(Eldbus_Connection *conn)
|
||||
{
|
||||
ELDBUS_CONNECTION_CHECK(conn);
|
||||
|
@ -1312,7 +1312,7 @@ eldbus_connection_unref(Eldbus_Connection *conn)
|
|||
_eldbus_connection_free(conn);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_connection_free_cb_add(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const void *data)
|
||||
{
|
||||
ELDBUS_CONNECTION_CHECK(conn);
|
||||
|
@ -1320,7 +1320,7 @@ eldbus_connection_free_cb_add(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const
|
|||
conn->cbs_free = eldbus_cbs_free_add(conn->cbs_free, cb, data);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_connection_free_cb_del(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const void *data)
|
||||
{
|
||||
ELDBUS_CONNECTION_CHECK(conn);
|
||||
|
@ -1328,7 +1328,7 @@ eldbus_connection_free_cb_del(Eldbus_Connection *conn, Eldbus_Free_Cb cb, const
|
|||
conn->cbs_free = eldbus_cbs_free_del(conn->cbs_free, cb, data);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_connection_data_set(Eldbus_Connection *conn, const char *key, const void *data)
|
||||
{
|
||||
ELDBUS_CONNECTION_CHECK(conn);
|
||||
|
@ -1337,7 +1337,7 @@ eldbus_connection_data_set(Eldbus_Connection *conn, const char *key, const void
|
|||
eldbus_data_set(&(conn->data), key, data);
|
||||
}
|
||||
|
||||
ELDBUS_API void *
|
||||
EAPI void *
|
||||
eldbus_connection_data_get(const Eldbus_Connection *conn, const char *key)
|
||||
{
|
||||
ELDBUS_CONNECTION_CHECK_RETVAL(conn, NULL);
|
||||
|
@ -1345,7 +1345,7 @@ eldbus_connection_data_get(const Eldbus_Connection *conn, const char *key)
|
|||
return eldbus_data_get(&(((Eldbus_Connection *)conn)->data), key);
|
||||
}
|
||||
|
||||
ELDBUS_API void *
|
||||
EAPI void *
|
||||
eldbus_connection_data_del(Eldbus_Connection *conn, const char *key)
|
||||
{
|
||||
ELDBUS_CONNECTION_CHECK_RETVAL(conn, NULL);
|
||||
|
@ -1393,7 +1393,7 @@ dispach_name_owner_cb(void *context)
|
|||
return ECORE_CALLBACK_CANCEL;
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_name_owner_changed_callback_add(Eldbus_Connection *conn, const char *bus, Eldbus_Name_Owner_Changed_Cb cb, const void *cb_data, Eina_Bool allow_initial_call)
|
||||
{
|
||||
Eldbus_Connection_Name *cn;
|
||||
|
@ -1428,7 +1428,7 @@ cleanup:
|
|||
eldbus_connection_name_gc(conn, cn);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_name_owner_changed_callback_del(Eldbus_Connection *conn, const char *bus, Eldbus_Name_Owner_Changed_Cb cb, const void *cb_data)
|
||||
{
|
||||
Eldbus_Connection_Name *cn;
|
||||
|
@ -1473,7 +1473,7 @@ eldbus_name_owner_changed_callback_del(Eldbus_Connection *conn, const char *bus,
|
|||
eldbus_connection_name_gc(conn, cn);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_connection_event_callback_add(Eldbus_Connection *conn, Eldbus_Connection_Event_Type type, Eldbus_Connection_Event_Cb cb, const void *cb_data)
|
||||
{
|
||||
Eldbus_Connection_Context_Event *ce;
|
||||
|
@ -1500,7 +1500,7 @@ _eldbus_connection_context_event_cb_del(Eldbus_Connection_Context_Event *ce, Eld
|
|||
free(ctx);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_connection_event_callback_del(Eldbus_Connection *conn, Eldbus_Connection_Event_Type type, Eldbus_Connection_Event_Cb cb, const void *cb_data)
|
||||
{
|
||||
Eldbus_Connection_Context_Event *ce;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#include "eldbus_private_types.h"
|
||||
#include <dbus/dbus.h>
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_name_request(Eldbus_Connection *conn, const char *name, unsigned int flags, Eldbus_Message_Cb cb, const void *cb_data)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
|
||||
|
@ -12,7 +12,7 @@ eldbus_name_request(Eldbus_Connection *conn, const char *name, unsigned int flag
|
|||
cb_data, -1, "su", name, flags);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_name_release(Eldbus_Connection *conn, const char *name, Eldbus_Message_Cb cb, const void *cb_data)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
|
||||
|
@ -22,7 +22,7 @@ eldbus_name_release(Eldbus_Connection *conn, const char *name, Eldbus_Message_Cb
|
|||
cb_data, -1, "s", name);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_name_owner_get(Eldbus_Connection *conn, const char *name, Eldbus_Message_Cb cb, const void *cb_data)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
|
||||
|
@ -32,7 +32,7 @@ eldbus_name_owner_get(Eldbus_Connection *conn, const char *name, Eldbus_Message_
|
|||
cb_data, -1, "s", name);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_name_owner_has(Eldbus_Connection *conn, const char *name, Eldbus_Message_Cb cb, const void *cb_data)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
|
||||
|
@ -42,7 +42,7 @@ eldbus_name_owner_has(Eldbus_Connection *conn, const char *name, Eldbus_Message_
|
|||
cb_data, -1, "s", name);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_names_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
|
||||
|
@ -51,7 +51,7 @@ eldbus_names_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_
|
|||
cb_data, -1, "");
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_names_activatable_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
|
||||
|
@ -60,7 +60,7 @@ eldbus_names_activatable_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, con
|
|||
cb_data, -1, "");
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_name_start(Eldbus_Connection *conn, const char *name, unsigned int flags, Eldbus_Message_Cb cb, const void *cb_data)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
|
||||
|
@ -70,7 +70,7 @@ eldbus_name_start(Eldbus_Connection *conn, const char *name, unsigned int flags,
|
|||
cb_data, -1, "su", name, flags);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_object_managed_objects_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data)
|
||||
{
|
||||
Eldbus_Message *msg;
|
||||
|
@ -81,21 +81,21 @@ eldbus_object_managed_objects_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, cons
|
|||
return p;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Signal_Handler *
|
||||
EAPI Eldbus_Signal_Handler *
|
||||
eldbus_object_manager_interfaces_added(Eldbus_Object *obj, Eldbus_Signal_Cb cb, const void *cb_data)
|
||||
{
|
||||
return eldbus_object_signal_handler_add(obj, ELDBUS_FDO_INTERFACE_OBJECT_MANAGER,
|
||||
"InterfacesAdded", cb, cb_data);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Signal_Handler *
|
||||
EAPI Eldbus_Signal_Handler *
|
||||
eldbus_object_manager_interfaces_removed(Eldbus_Object *obj, Eldbus_Signal_Cb cb, const void *cb_data)
|
||||
{
|
||||
return eldbus_object_signal_handler_add(obj, ELDBUS_FDO_INTERFACE_OBJECT_MANAGER,
|
||||
"InterfacesRemoved", cb, cb_data);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_hello(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL);
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
* @param cb_data Data passed to callback.
|
||||
* @return The Eldbus_Pending corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_name_request(Eldbus_Connection *conn, const char *bus, unsigned int flags, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Pending *eldbus_name_request(Eldbus_Connection *conn, const char *bus, unsigned int flags, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/* Replies to releasing a name */
|
||||
#define ELDBUS_NAME_RELEASE_REPLY_RELEASED 1 /**< Service was released from the given name */
|
||||
|
@ -43,7 +43,7 @@ ELDBUS_API Eldbus_Pending *eldbus_name_request(Eldbus_Connection *conn, const ch
|
|||
* @param cb_data Data passed to callback.
|
||||
* @return The Eldbus_Pending corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_name_release(Eldbus_Connection *conn, const char *bus, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Pending *eldbus_name_release(Eldbus_Connection *conn, const char *bus, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* Send a "GetNameOwner" method call in proxy.
|
||||
|
@ -54,7 +54,7 @@ ELDBUS_API Eldbus_Pending *eldbus_name_release(Eldbus_Connection *conn, const ch
|
|||
* @param cb_data Data passed to callback.
|
||||
* @return The Eldbus_Pending corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_name_owner_get(Eldbus_Connection *conn, const char *bus, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Pending *eldbus_name_owner_get(Eldbus_Connection *conn, const char *bus, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* Send a "NameHasOwner" method call in proxy.
|
||||
|
@ -65,7 +65,7 @@ ELDBUS_API Eldbus_Pending *eldbus_name_owner_get(Eldbus_Connection *conn, const
|
|||
* @param cb_data Data passed to callback.
|
||||
* @return The Eldbus_Pending corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_name_owner_has(Eldbus_Connection *conn, const char *bus, Eldbus_Message_Cb cb, const void *cb_data);
|
||||
EAPI Eldbus_Pending *eldbus_name_owner_has(Eldbus_Connection *conn, const char *bus, Eldbus_Message_Cb cb, const void *cb_data);
|
||||
|
||||
/**
|
||||
* Send a "ListNames" method call in proxy.
|
||||
|
@ -75,7 +75,7 @@ ELDBUS_API Eldbus_Pending *eldbus_name_owner_has(Eldbus_Connection *conn, const
|
|||
* @param cb_data Data passed to callback.
|
||||
* @return The Eldbus_Pending corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_names_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Pending *eldbus_names_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* Send a "ListActivatableNames" method call in proxy.
|
||||
|
@ -85,7 +85,7 @@ ELDBUS_API Eldbus_Pending *eldbus_names_list(Eldbus_Connection *conn, Eldbus_Mes
|
|||
* @param cb_data Data passed to callback.
|
||||
* @return The Eldbus_Pending corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_names_activatable_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Pending *eldbus_names_activatable_list(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* Send a "Hello" method call in proxy.
|
||||
|
@ -95,7 +95,7 @@ ELDBUS_API Eldbus_Pending *eldbus_names_activatable_list(Eldbus_Connection *conn
|
|||
* @param cb_data Data passed to callback.
|
||||
* @return The Eldbus_Pending corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_hello(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Pending *eldbus_hello(Eldbus_Connection *conn, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
|
||||
|
||||
/* Replies to service starts */
|
||||
#define ELDBUS_NAME_START_REPLY_SUCCESS 1 /**< Service was auto started */
|
||||
|
@ -111,7 +111,7 @@ ELDBUS_API Eldbus_Pending *eldbus_hello(Eldbus_Connection *conn, Eldbus_Message_
|
|||
* @param cb_data Data passed to callback.
|
||||
* @return The Eldbus_Pending corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_name_start(Eldbus_Connection *conn, const char *bus, unsigned int flags, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Pending *eldbus_name_start(Eldbus_Connection *conn, const char *bus, unsigned int flags, Eldbus_Message_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @typedef Eldbus_Name_Owner_Changed_Cb
|
||||
|
@ -135,7 +135,7 @@ typedef void (*Eldbus_Name_Owner_Changed_Cb)(void *data, const char *bus, const
|
|||
* @param cb_data context data
|
||||
* @param allow_initial_call allow call callback with actual id of the bus
|
||||
*/
|
||||
ELDBUS_API void eldbus_name_owner_changed_callback_add(Eldbus_Connection *conn, const char *bus, Eldbus_Name_Owner_Changed_Cb cb, const void *cb_data, Eina_Bool allow_initial_call) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI void eldbus_name_owner_changed_callback_add(Eldbus_Connection *conn, const char *bus, Eldbus_Name_Owner_Changed_Cb cb, const void *cb_data, Eina_Bool allow_initial_call) EINA_ARG_NONNULL(1, 2, 3);
|
||||
/**
|
||||
* Remove callback added with eldbus_name_owner_changed_callback_add().
|
||||
*
|
||||
|
@ -144,7 +144,7 @@ ELDBUS_API void eldbus_name_owner_changed_callback_add(Eldbus_C
|
|||
* @param cb callback
|
||||
* @param cb_data context data
|
||||
*/
|
||||
ELDBUS_API void eldbus_name_owner_changed_callback_del(Eldbus_Connection *conn, const char *bus, Eldbus_Name_Owner_Changed_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI void eldbus_name_owner_changed_callback_del(Eldbus_Connection *conn, const char *bus, Eldbus_Name_Owner_Changed_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
/**
|
||||
* @defgroup Eldbus_FDO_Peer org.freedesktop.DBus.Peer
|
||||
|
@ -160,7 +160,7 @@ ELDBUS_API void eldbus_name_owner_changed_callback_del(Eldbus_C
|
|||
* @param data Data passed to the callback.
|
||||
* @return The Eldbus_Pending corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_object_peer_ping(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Pending *eldbus_object_peer_ping(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* Call the method "GetMachineId" on the eldbus object.
|
||||
|
@ -170,7 +170,7 @@ ELDBUS_API Eldbus_Pending *eldbus_object_peer_ping(Eldbus_Object *obj, El
|
|||
* @param data Data passed to the callback.
|
||||
* @return The Eldbus_Pending corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_object_peer_machine_id_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Pending *eldbus_object_peer_machine_id_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
@ -190,7 +190,7 @@ ELDBUS_API Eldbus_Pending *eldbus_object_peer_machine_id_get(Eldbus_Objec
|
|||
* @param data Data passed to the callback.
|
||||
* @return The Eldbus_Pending corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_object_introspect(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Pending *eldbus_object_introspect(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
@ -213,7 +213,7 @@ ELDBUS_API Eldbus_Pending *eldbus_object_introspect(Eldbus_Object *obj, E
|
|||
* You should listen for a ELDBUS_PROXY_EVENT_PROPERTY_LOADED
|
||||
* to know when properties finish to load.
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_proxy_properties_monitor(Eldbus_Proxy *proxy, Eina_Bool enable) EINA_ARG_NONNULL(1);
|
||||
EAPI Eina_Bool eldbus_proxy_properties_monitor(Eldbus_Proxy *proxy, Eina_Bool enable) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* Get a property.
|
||||
|
@ -224,7 +224,7 @@ ELDBUS_API Eina_Bool eldbus_proxy_properties_monitor(Eldbus_Proxy *proxy, Eina_B
|
|||
* @param data Data to be passed to the callback.
|
||||
* @return Eldbus_Pending object corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_proxy_property_get(Eldbus_Proxy *proxy, const char *name, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI Eldbus_Pending *eldbus_proxy_property_get(Eldbus_Proxy *proxy, const char *name, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
/**
|
||||
* Set a property.
|
||||
|
@ -237,7 +237,7 @@ ELDBUS_API Eldbus_Pending *eldbus_proxy_property_get(Eldbus_Proxy *proxy,
|
|||
* @param data Data to be passed to the callback.
|
||||
* @return Eldbus_Pending object corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_proxy_property_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const void *value, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3, 4);
|
||||
EAPI Eldbus_Pending *eldbus_proxy_property_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const void *value, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3, 4);
|
||||
|
||||
/**
|
||||
* Set a property with a Eina_Value.
|
||||
|
@ -252,7 +252,7 @@ ELDBUS_API Eldbus_Pending *eldbus_proxy_property_set(Eldbus_Proxy *proxy,
|
|||
*
|
||||
* @since 1.17
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_proxy_property_value_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const Eina_Value *value, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3, 4);
|
||||
EAPI Eldbus_Pending *eldbus_proxy_property_value_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const Eina_Value *value, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2, 3, 4);
|
||||
|
||||
/**
|
||||
* Get all properties.
|
||||
|
@ -262,7 +262,7 @@ ELDBUS_API Eldbus_Pending *eldbus_proxy_property_value_set(Eldbus_Proxy *
|
|||
* @param data Data to be passed to the callback.
|
||||
* @return Eldbus_Pending object corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_proxy_property_get_all(Eldbus_Proxy *proxy, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Pending *eldbus_proxy_property_get_all(Eldbus_Proxy *proxy, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* Register a callback on "PropertiesChanged" signal.
|
||||
|
@ -272,7 +272,7 @@ ELDBUS_API Eldbus_Pending *eldbus_proxy_property_get_all(Eldbus_Proxy *pr
|
|||
* @param data Data to be passed to the callback.
|
||||
* @return Eldbus_Signal_Handler object representing a listener for "PropertiesChanged" signal.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Signal_Handler *eldbus_proxy_properties_changed_callback_add(Eldbus_Proxy *proxy, Eldbus_Signal_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Signal_Handler *eldbus_proxy_properties_changed_callback_add(Eldbus_Proxy *proxy, Eldbus_Signal_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* Return the cached value of property.
|
||||
|
@ -285,7 +285,7 @@ ELDBUS_API Eldbus_Signal_Handler *eldbus_proxy_properties_changed_callback_add(E
|
|||
* @param name The property name to get.
|
||||
* @return Cached value of property.
|
||||
*/
|
||||
ELDBUS_API Eina_Value *eldbus_proxy_property_local_get(Eldbus_Proxy *proxy, const char *name) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eina_Value *eldbus_proxy_property_local_get(Eldbus_Proxy *proxy, const char *name) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* Get all cached properties.
|
||||
|
@ -297,7 +297,7 @@ ELDBUS_API Eina_Value *eldbus_proxy_property_local_get(Eldbus_Proxy *p
|
|||
* @param proxy The proxy object on which to do the query.
|
||||
* @return A Eina_Hash with all cached properties
|
||||
*/
|
||||
ELDBUS_API const Eina_Hash *eldbus_proxy_property_local_get_all(Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1);
|
||||
EAPI const Eina_Hash *eldbus_proxy_property_local_get_all(Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
@ -317,7 +317,7 @@ ELDBUS_API const Eina_Hash *eldbus_proxy_property_local_get_all(Eldbus_Prox
|
|||
*
|
||||
* @return A Eldbus_Pending object corresponding to the message sent.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_object_managed_objects_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Pending *eldbus_object_managed_objects_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* Register a callback on "InterfacesAdded" signal.
|
||||
|
@ -327,7 +327,7 @@ ELDBUS_API Eldbus_Pending *eldbus_object_managed_objects_get(Eldbus_Objec
|
|||
* @param cb_data Data to be passed to the callback.
|
||||
* @return Eldbus_Signal_Handler object representing a listener for "InterfacesAdded" signal.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Signal_Handler *eldbus_object_manager_interfaces_added(Eldbus_Object *obj, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Signal_Handler *eldbus_object_manager_interfaces_added(Eldbus_Object *obj, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* Register a callback on "InterfacesRemoved" signal.
|
||||
|
@ -337,7 +337,7 @@ ELDBUS_API Eldbus_Signal_Handler *eldbus_object_manager_interfaces_added(Eldbus_
|
|||
* @param cb_data Data to be passed to the callback.
|
||||
* @return Eldbus_Signal_Handler object representing a listener for "InterfacesRemoved" signal.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Signal_Handler *eldbus_object_manager_interfaces_removed(Eldbus_Object *obj, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Signal_Handler *eldbus_object_manager_interfaces_removed(Eldbus_Object *obj, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
|
|
@ -26,7 +26,7 @@ static void _eldbus_introspection_argument_free(Eldbus_Introspection_Argument *)
|
|||
static void _eldbus_introspection_property_free(Eldbus_Introspection_Property *);
|
||||
static void _eldbus_introspection_annotation_free(Eldbus_Introspection_Annotation *);
|
||||
|
||||
ELDBUS_API Eldbus_Introspection_Node *
|
||||
EAPI Eldbus_Introspection_Node *
|
||||
eldbus_introspection_parse(const char *xml)
|
||||
{
|
||||
Eldbus_Introspection_Node *node;
|
||||
|
@ -75,7 +75,7 @@ _eldbus_introspection_parse_node(Eina_Simple_XML_Node_Tag *tag)
|
|||
return node;
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_introspection_node_free(Eldbus_Introspection_Node *node)
|
||||
{
|
||||
Eldbus_Introspection_Node *child_node;
|
||||
|
@ -427,7 +427,7 @@ _eldbus_introspection_parse_children(Eina_Inlist *children, const Eldbus_Introsp
|
|||
}
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Introspection_Interface *
|
||||
EAPI Eldbus_Introspection_Interface *
|
||||
eldbus_introspection_interface_find(Eina_List *interfaces, const char *name)
|
||||
{
|
||||
Eina_List *it;
|
||||
|
@ -442,7 +442,7 @@ eldbus_introspection_interface_find(Eina_List *interfaces, const char *name)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Introspection_Property *
|
||||
EAPI Eldbus_Introspection_Property *
|
||||
eldbus_introspection_property_find(Eina_List *properties, const char *name)
|
||||
{
|
||||
Eina_List *it;
|
||||
|
@ -457,7 +457,7 @@ eldbus_introspection_property_find(Eina_List *properties, const char *name)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Introspection_Argument *
|
||||
EAPI Eldbus_Introspection_Argument *
|
||||
eldbus_introspection_argument_find(Eina_List *arguments, const char *name)
|
||||
{
|
||||
Eina_List *it;
|
||||
|
|
|
@ -4,8 +4,6 @@
|
|||
#include <Eina.h>
|
||||
#include <Eo.h>
|
||||
|
||||
#include <eldbus_api.h>
|
||||
|
||||
/* FIXME: these are duplicated as @extern in eldbus_types.eot */
|
||||
|
||||
/** Argument direction
|
||||
|
@ -118,7 +116,7 @@ typedef struct _Eldbus_Introspection_Signal
|
|||
*
|
||||
* @since 1.17
|
||||
*/
|
||||
ELDBUS_API Eldbus_Introspection_Node *eldbus_introspection_parse(const char *xml);
|
||||
EAPI Eldbus_Introspection_Node *eldbus_introspection_parse(const char *xml);
|
||||
|
||||
/**
|
||||
* @brief Frees the introspection object tree
|
||||
|
@ -127,7 +125,7 @@ ELDBUS_API Eldbus_Introspection_Node *eldbus_introspection_parse(const char *xml
|
|||
*
|
||||
* @since 1.17
|
||||
*/
|
||||
ELDBUS_API void eldbus_introspection_node_free(Eldbus_Introspection_Node *node);
|
||||
EAPI void eldbus_introspection_node_free(Eldbus_Introspection_Node *node);
|
||||
|
||||
/**
|
||||
* @brief Finds an interface by name
|
||||
|
@ -138,7 +136,7 @@ ELDBUS_API void eldbus_introspection_node_free(Eldbus_Introspection_Node *node);
|
|||
*
|
||||
* @since 1.17
|
||||
*/
|
||||
ELDBUS_API Eldbus_Introspection_Interface *eldbus_introspection_interface_find(Eina_List *interfaces, const char *name);
|
||||
EAPI Eldbus_Introspection_Interface *eldbus_introspection_interface_find(Eina_List *interfaces, const char *name);
|
||||
|
||||
/**
|
||||
* @brief Finds a property by name
|
||||
|
@ -149,7 +147,7 @@ ELDBUS_API Eldbus_Introspection_Interface *eldbus_introspection_interface_find(E
|
|||
*
|
||||
* @since 1.17
|
||||
*/
|
||||
ELDBUS_API Eldbus_Introspection_Property *eldbus_introspection_property_find(Eina_List *properties, const char *name);
|
||||
EAPI Eldbus_Introspection_Property *eldbus_introspection_property_find(Eina_List *properties, const char *name);
|
||||
|
||||
/**
|
||||
* @brief Finds an argument by name
|
||||
|
@ -160,6 +158,6 @@ ELDBUS_API Eldbus_Introspection_Property *eldbus_introspection_property_find(Ein
|
|||
*
|
||||
* @since 1.17
|
||||
*/
|
||||
ELDBUS_API Eldbus_Introspection_Argument *eldbus_introspection_argument_find(Eina_List *arguments, const char *name);
|
||||
EAPI Eldbus_Introspection_Argument *eldbus_introspection_argument_find(Eina_List *arguments, const char *name);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -98,7 +98,7 @@ fail:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Message *
|
||||
EAPI Eldbus_Message *
|
||||
eldbus_message_method_call_new(const char *dest, const char *path, const char *iface, const char *method)
|
||||
{
|
||||
Eldbus_Message *msg;
|
||||
|
@ -141,7 +141,7 @@ fail:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Message *
|
||||
EAPI Eldbus_Message *
|
||||
eldbus_message_ref(Eldbus_Message *msg)
|
||||
{
|
||||
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
|
||||
|
@ -168,7 +168,7 @@ _message_iterator_free(Eldbus_Message_Iter *iter)
|
|||
free(iter);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_message_unref(Eldbus_Message *msg)
|
||||
{
|
||||
ELDBUS_MESSAGE_CHECK(msg);
|
||||
|
@ -187,49 +187,49 @@ eldbus_message_unref(Eldbus_Message *msg)
|
|||
free(msg);
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_message_path_get(const Eldbus_Message *msg)
|
||||
{
|
||||
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
|
||||
return dbus_message_get_path(msg->dbus_msg);
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_message_interface_get(const Eldbus_Message *msg)
|
||||
{
|
||||
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
|
||||
return dbus_message_get_interface(msg->dbus_msg);
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_message_member_get(const Eldbus_Message *msg)
|
||||
{
|
||||
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
|
||||
return dbus_message_get_member(msg->dbus_msg);
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_message_destination_get(const Eldbus_Message *msg)
|
||||
{
|
||||
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
|
||||
return dbus_message_get_destination(msg->dbus_msg);
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_message_sender_get(const Eldbus_Message *msg)
|
||||
{
|
||||
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
|
||||
return dbus_message_get_sender(msg->dbus_msg);
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_message_signature_get(const Eldbus_Message *msg)
|
||||
{
|
||||
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
|
||||
return dbus_message_get_signature(msg->dbus_msg);
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_error_get(const Eldbus_Message *msg, const char **name, const char **text)
|
||||
{
|
||||
if (name) *name = NULL;
|
||||
|
@ -260,7 +260,7 @@ _eldbus_message_arguments_vget(Eldbus_Message *msg, const char *signature, va_li
|
|||
return eldbus_message_iter_arguments_vget(iter, signature, ap);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Message_Iter *
|
||||
EAPI Eldbus_Message_Iter *
|
||||
eldbus_message_iter_get(const Eldbus_Message *msg)
|
||||
{
|
||||
ELDBUS_MESSAGE_CHECK_RETVAL(msg, NULL);
|
||||
|
@ -270,7 +270,7 @@ eldbus_message_iter_get(const Eldbus_Message *msg)
|
|||
return msg->iterator;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_arguments_get(const Eldbus_Message *msg, const char *signature, ...)
|
||||
{
|
||||
Eina_Bool ret;
|
||||
|
@ -285,7 +285,7 @@ eldbus_message_arguments_get(const Eldbus_Message *msg, const char *signature, .
|
|||
return ret;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_arguments_vget(const Eldbus_Message *msg, const char *signature, va_list ap)
|
||||
{
|
||||
ELDBUS_MESSAGE_CHECK_RETVAL(msg, EINA_FALSE);
|
||||
|
@ -362,7 +362,7 @@ next:
|
|||
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_iter_arguments_vappend(Eldbus_Message_Iter *iter, const char *signature, va_list ap)
|
||||
{
|
||||
va_list aq;
|
||||
|
@ -375,7 +375,7 @@ eldbus_message_iter_arguments_vappend(Eldbus_Message_Iter *iter, const char *sig
|
|||
return ret;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_iter_arguments_append(Eldbus_Message_Iter *iter, const char *signature, ...)
|
||||
{
|
||||
Eina_Bool r;
|
||||
|
@ -491,7 +491,7 @@ _eldbus_message_arguments_vappend(Eldbus_Message *msg, const char *signature, va
|
|||
return r;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_arguments_append(Eldbus_Message *msg, const char *signature, ...)
|
||||
{
|
||||
Eina_Bool ret;
|
||||
|
@ -506,7 +506,7 @@ eldbus_message_arguments_append(Eldbus_Message *msg, const char *signature, ...)
|
|||
return ret;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_arguments_vappend(Eldbus_Message *msg, const char *signature, va_list ap)
|
||||
{
|
||||
va_list aq;
|
||||
|
@ -522,7 +522,7 @@ eldbus_message_arguments_vappend(Eldbus_Message *msg, const char *signature, va_
|
|||
return ret;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Message_Iter *
|
||||
EAPI Eldbus_Message_Iter *
|
||||
eldbus_message_iter_container_new(Eldbus_Message_Iter *iter, int type, const char* contained_signature)
|
||||
{
|
||||
Eldbus_Message_Iter *sub;
|
||||
|
@ -544,7 +544,7 @@ cleanup:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_iter_container_close(Eldbus_Message_Iter *iter, Eldbus_Message_Iter *sub)
|
||||
{
|
||||
ELDBUS_MESSAGE_ITERATOR_CHECK_RETVAL(iter, EINA_FALSE);
|
||||
|
@ -554,7 +554,7 @@ eldbus_message_iter_container_close(Eldbus_Message_Iter *iter, Eldbus_Message_It
|
|||
&sub->dbus_iterator);
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_iter_basic_append(Eldbus_Message_Iter *iter, int type, ...)
|
||||
{
|
||||
Eina_Bool r;
|
||||
|
@ -569,7 +569,7 @@ eldbus_message_iter_basic_append(Eldbus_Message_Iter *iter, int type, ...)
|
|||
return r;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_iter_fixed_array_append(Eldbus_Message_Iter *iter, int type, const void *array, unsigned int size)
|
||||
{
|
||||
ELDBUS_MESSAGE_ITERATOR_CHECK_RETVAL(iter, EINA_FALSE);
|
||||
|
@ -579,7 +579,7 @@ eldbus_message_iter_fixed_array_append(Eldbus_Message_Iter *iter, int type, cons
|
|||
return dbus_message_iter_append_fixed_array(&iter->dbus_iterator, type, &array, (int)size);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_message_iter_basic_get(Eldbus_Message_Iter *iter, void *value)
|
||||
{
|
||||
ELDBUS_MESSAGE_ITERATOR_CHECK(iter);
|
||||
|
@ -601,14 +601,14 @@ eldbus_message_iter_sub_iter_get(Eldbus_Message_Iter *iter)
|
|||
return sub;
|
||||
}
|
||||
|
||||
ELDBUS_API char *
|
||||
EAPI char *
|
||||
eldbus_message_iter_signature_get(Eldbus_Message_Iter *iter)
|
||||
{
|
||||
ELDBUS_MESSAGE_ITERATOR_CHECK_RETVAL(iter, NULL);
|
||||
return dbus_message_iter_get_signature(&iter->dbus_iterator);
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_iter_next(Eldbus_Message_Iter *iter)
|
||||
{
|
||||
ELDBUS_MESSAGE_ITERATOR_CHECK_RETVAL(iter, EINA_FALSE);
|
||||
|
@ -705,7 +705,7 @@ get_basic(char type, DBusMessageIter *iter, va_list *vl)
|
|||
}
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_iter_fixed_array_get(Eldbus_Message_Iter *iter, int signature, void *value, int *n_elements)
|
||||
{
|
||||
int iter_type;
|
||||
|
@ -732,7 +732,7 @@ eldbus_message_iter_fixed_array_get(Eldbus_Message_Iter *iter, int signature, vo
|
|||
/**
|
||||
* Useful when iterating over arrays
|
||||
*/
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_iter_get_and_next(Eldbus_Message_Iter *iter, char signature, ...)
|
||||
{
|
||||
char type;
|
||||
|
@ -838,7 +838,7 @@ _eldbus_message_iter_arguments_vget(Eldbus_Message_Iter *iter, const char *signa
|
|||
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_iter_arguments_get(Eldbus_Message_Iter *iter, const char *signature, ...)
|
||||
{
|
||||
va_list ap;
|
||||
|
@ -851,7 +851,7 @@ eldbus_message_iter_arguments_get(Eldbus_Message_Iter *iter, const char *signatu
|
|||
return ret;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_iter_arguments_vget(Eldbus_Message_Iter *iter, const char *signature, va_list ap)
|
||||
{
|
||||
va_list aq;
|
||||
|
@ -864,14 +864,14 @@ eldbus_message_iter_arguments_vget(Eldbus_Message_Iter *iter, const char *signat
|
|||
return ret;
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_message_iter_del(Eldbus_Message_Iter *iter)
|
||||
{
|
||||
ELDBUS_MESSAGE_ITERATOR_CHECK(iter);
|
||||
_message_iterator_free(iter);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Message *
|
||||
EAPI Eldbus_Message *
|
||||
eldbus_message_error_new(const Eldbus_Message *msg, const char *error_name, const char *error_msg)
|
||||
{
|
||||
Eldbus_Message *reply;
|
||||
|
@ -891,7 +891,7 @@ eldbus_message_error_new(const Eldbus_Message *msg, const char *error_name, cons
|
|||
return reply;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Message *
|
||||
EAPI Eldbus_Message *
|
||||
eldbus_message_method_return_new(const Eldbus_Message *msg)
|
||||
{
|
||||
Eldbus_Message *reply;
|
||||
|
@ -908,7 +908,7 @@ eldbus_message_method_return_new(const Eldbus_Message *msg)
|
|||
return reply;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Message *
|
||||
EAPI Eldbus_Message *
|
||||
eldbus_message_signal_new(const char *path, const char *interface, const char *name)
|
||||
{
|
||||
Eldbus_Message *msg;
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
* @param msg The Eldbus_Message object.
|
||||
* @return The previous Eldbus_Message with incremented refcount.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Message *eldbus_message_ref(Eldbus_Message *msg) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Message *eldbus_message_ref(Eldbus_Message *msg) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Decrease message reference.
|
||||
|
@ -24,7 +24,7 @@ ELDBUS_API Eldbus_Message *eldbus_message_ref(Eldbus_Message *msg) EINA_A
|
|||
*
|
||||
* @param msg The Eldbus_Message object.
|
||||
*/
|
||||
ELDBUS_API void eldbus_message_unref(Eldbus_Message *msg) EINA_ARG_NONNULL(1);
|
||||
EAPI void eldbus_message_unref(Eldbus_Message *msg) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* Get the Eldbus message path.
|
||||
|
@ -32,7 +32,7 @@ ELDBUS_API void eldbus_message_unref(Eldbus_Message *msg) EINA_
|
|||
* @param msg The Eldbus_Message object.
|
||||
* @return A string containing the dbus message path.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_message_path_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_message_path_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* Get the Eldbus message interface.
|
||||
|
@ -40,7 +40,7 @@ ELDBUS_API const char *eldbus_message_path_get(const Eldbus_Message *m
|
|||
* @param msg The Eldbus_Message object.
|
||||
* @return A string containing the dbus message interface.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_message_interface_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_message_interface_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* Get the Eldbus message member.
|
||||
|
@ -48,7 +48,7 @@ ELDBUS_API const char *eldbus_message_interface_get(const Eldbus_Messa
|
|||
* @param msg The Eldbus_Message object.
|
||||
* @return A string containing the dbus message member.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_message_member_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_message_member_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* Get the Eldbus message destination.
|
||||
|
@ -56,7 +56,7 @@ ELDBUS_API const char *eldbus_message_member_get(const Eldbus_Message
|
|||
* @param msg The Eldbus_Message object.
|
||||
* @return A string containing the dbus message destination.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_message_destination_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_message_destination_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* Get the Eldbus message sender.
|
||||
|
@ -64,7 +64,7 @@ ELDBUS_API const char *eldbus_message_destination_get(const Eldbus_Mes
|
|||
* @param msg The Eldbus_Message object.
|
||||
* @return A string containing the dbus message sender.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_message_sender_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_message_sender_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* Get the Eldbus message signature.
|
||||
|
@ -72,7 +72,7 @@ ELDBUS_API const char *eldbus_message_sender_get(const Eldbus_Message
|
|||
* @param msg The Eldbus_Message object.
|
||||
* @return A string containing the dbus message signature.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_message_signature_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_message_signature_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Create a new message to invoke a method on a remote object.
|
||||
|
@ -84,7 +84,7 @@ ELDBUS_API const char *eldbus_message_signature_get(const Eldbus_Messa
|
|||
*
|
||||
* @return a new Eldbus_Message, free with eldbus_message_unref()
|
||||
*/
|
||||
ELDBUS_API Eldbus_Message *eldbus_message_method_call_new(const char *dest, const char *path, const char *iface, const char *method) EINA_ARG_NONNULL(1, 2, 3, 4) EINA_WARN_UNUSED_RESULT EINA_MALLOC;
|
||||
EAPI Eldbus_Message *eldbus_message_method_call_new(const char *dest, const char *path, const char *iface, const char *method) EINA_ARG_NONNULL(1, 2, 3, 4) EINA_WARN_UNUSED_RESULT EINA_MALLOC;
|
||||
|
||||
/**
|
||||
* @brief Create a new signal message.
|
||||
|
@ -97,7 +97,7 @@ ELDBUS_API Eldbus_Message *eldbus_message_method_call_new(const char *des
|
|||
*
|
||||
* @since 1.16
|
||||
*/
|
||||
ELDBUS_API Eldbus_Message *eldbus_message_signal_new(const char *path, const char *interface, const char *name) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Message *eldbus_message_signal_new(const char *path, const char *interface, const char *name) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Create a new message that is an error reply to another message.
|
||||
|
@ -108,7 +108,7 @@ ELDBUS_API Eldbus_Message *eldbus_message_signal_new(const char *path, const cha
|
|||
*
|
||||
* @return a new Eldbus_Message, free with eldbus_message_unref()
|
||||
*/
|
||||
ELDBUS_API Eldbus_Message *eldbus_message_error_new(const Eldbus_Message *msg, const char *error_name, const char *error_msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Message *eldbus_message_error_new(const Eldbus_Message *msg, const char *error_name, const char *error_msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Create a message that is a reply to a method call.
|
||||
|
@ -117,7 +117,7 @@ ELDBUS_API Eldbus_Message *eldbus_message_error_new(const Eldbus_Message
|
|||
*
|
||||
* @return new Eldbus_Message, free with eldbus_message_unref()
|
||||
*/
|
||||
ELDBUS_API Eldbus_Message *eldbus_message_method_return_new(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Message *eldbus_message_method_return_new(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -133,7 +133,7 @@ ELDBUS_API Eldbus_Message *eldbus_message_method_return_new(const Eldbus_
|
|||
* desired.
|
||||
* @return EINA_TRUE on success, else EINA_FALSE.
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_error_get(const Eldbus_Message *msg, const char **name, const char **text) EINA_ARG_NONNULL(1);
|
||||
EAPI Eina_Bool eldbus_message_error_get(const Eldbus_Message *msg, const char **name, const char **text) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Get the arguments from an Eldbus_Message
|
||||
|
@ -152,7 +152,7 @@ ELDBUS_API Eina_Bool eldbus_message_error_get(const Eldbus_Message *
|
|||
* @return EINA_TRUE if the arguments were read successfully and stored in the
|
||||
* respective pointer arguments.
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_arguments_get(const Eldbus_Message *msg, const char *signature, ...) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eina_Bool eldbus_message_arguments_get(const Eldbus_Message *msg, const char *signature, ...) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Get the arguments from an Eldbus_Message using a va_list.
|
||||
|
@ -166,7 +166,7 @@ ELDBUS_API Eina_Bool eldbus_message_arguments_get(const Eldbus_Messa
|
|||
* @return EINA_TRUE if the arguments were read successfully and stored in the
|
||||
* respective pointer arguments.
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_arguments_vget(const Eldbus_Message *msg, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eina_Bool eldbus_message_arguments_vget(const Eldbus_Message *msg, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Append arguments into an Eldbus_Message
|
||||
|
@ -184,7 +184,7 @@ ELDBUS_API Eina_Bool eldbus_message_arguments_vget(const Eldbus_Mess
|
|||
*
|
||||
* @return EINA_TRUE on success, EINA_FALSE otherwise.
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_arguments_append(Eldbus_Message *msg, const char *signature, ...) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eina_Bool eldbus_message_arguments_append(Eldbus_Message *msg, const char *signature, ...) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Append arguments into an Eldbus_Message using a va_list.
|
||||
|
@ -197,7 +197,7 @@ ELDBUS_API Eina_Bool eldbus_message_arguments_append(Eldbus_Message
|
|||
*
|
||||
* @return EINA_TRUE on success, EINA_FALSE otherwise.
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_arguments_vappend(Eldbus_Message *msg, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eina_Bool eldbus_message_arguments_vappend(Eldbus_Message *msg, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @defgroup Eldbus_Message_Iter Iterator
|
||||
|
@ -222,7 +222,7 @@ ELDBUS_API Eina_Bool eldbus_message_arguments_vappend(Eldbus_Message
|
|||
*
|
||||
* @return the new iterator
|
||||
*/
|
||||
ELDBUS_API Eldbus_Message_Iter *eldbus_message_iter_container_new(Eldbus_Message_Iter *iter, int type, const char* contained_signature) EINA_ARG_NONNULL(1, 3) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Message_Iter *eldbus_message_iter_container_new(Eldbus_Message_Iter *iter, int type, const char* contained_signature) EINA_ARG_NONNULL(1, 3) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Append a basic type into an Eldbus_Iterator.
|
||||
|
@ -233,7 +233,7 @@ ELDBUS_API Eldbus_Message_Iter *eldbus_message_iter_container_new(Eldbus_Message
|
|||
*
|
||||
* @return EINA_TRUE on success, else EINA_FALSE.
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_iter_basic_append(Eldbus_Message_Iter *iter, int type, ...) EINA_ARG_NONNULL(1, 3);
|
||||
EAPI Eina_Bool eldbus_message_iter_basic_append(Eldbus_Message_Iter *iter, int type, ...) EINA_ARG_NONNULL(1, 3);
|
||||
|
||||
/**
|
||||
* @brief Append an argument into an Eldbus_Message_Iter. For each complete type
|
||||
|
@ -258,7 +258,7 @@ ELDBUS_API Eina_Bool eldbus_message_iter_basic_append(Eldbus_Messa
|
|||
* eldbus_message_iter_container_new() instead to create the variant, fill
|
||||
* with data and close it.
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_iter_arguments_append(Eldbus_Message_Iter *iter, const char *signature, ...) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eina_Bool eldbus_message_iter_arguments_append(Eldbus_Message_Iter *iter, const char *signature, ...) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Set data to Eldbus_Message_Iter. For each complete in signature
|
||||
|
@ -279,7 +279,7 @@ ELDBUS_API Eina_Bool eldbus_message_iter_arguments_append(Eldbus_M
|
|||
* eldbus_message_iter_container_new() to create the variant fill
|
||||
* data and close it.
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_iter_arguments_vappend(Eldbus_Message_Iter *iter, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI Eina_Bool eldbus_message_iter_arguments_vappend(Eldbus_Message_Iter *iter, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
|
||||
/**
|
||||
|
@ -291,7 +291,7 @@ ELDBUS_API Eina_Bool eldbus_message_iter_arguments_vappend(Eldbus_
|
|||
* @param size of array
|
||||
* @return EINA_TRUE on success, else EINA_FALSE
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_iter_fixed_array_append(Eldbus_Message_Iter *iter, int type, const void *array, unsigned int size) EINA_ARG_NONNULL(1, 3);
|
||||
EAPI Eina_Bool eldbus_message_iter_fixed_array_append(Eldbus_Message_Iter *iter, int type, const void *array, unsigned int size) EINA_ARG_NONNULL(1, 3);
|
||||
|
||||
/**
|
||||
* @brief Closes a container-typed value appended to the message.
|
||||
|
@ -301,7 +301,7 @@ ELDBUS_API Eina_Bool eldbus_message_iter_fixed_array_append(Eldbus
|
|||
*
|
||||
* @return EINA_FALSE if iterator was already close or if not enough memory
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_iter_container_close(Eldbus_Message_Iter *iter, Eldbus_Message_Iter *sub) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eina_Bool eldbus_message_iter_container_close(Eldbus_Message_Iter *iter, Eldbus_Message_Iter *sub) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Get the main Eldbus_Message_Iter from the Eldbus_Message.
|
||||
|
@ -310,7 +310,7 @@ ELDBUS_API Eina_Bool eldbus_message_iter_container_close(Eldbus_Me
|
|||
*
|
||||
* @return The iterator of the message.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Message_Iter *eldbus_message_iter_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Message_Iter *eldbus_message_iter_get(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Get a basic type from Eldbus_Iterator.
|
||||
|
@ -318,7 +318,7 @@ ELDBUS_API Eldbus_Message_Iter *eldbus_message_iter_get(const Eldbus_Message *ms
|
|||
* @param iter The iterator to get the basic type from.
|
||||
* @param value The basic type of the iterator.
|
||||
*/
|
||||
ELDBUS_API void eldbus_message_iter_basic_get(Eldbus_Message_Iter *iter, void *value) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void eldbus_message_iter_basic_get(Eldbus_Message_Iter *iter, void *value) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Returns the current signature of a message iterator.
|
||||
|
@ -328,7 +328,7 @@ ELDBUS_API void eldbus_message_iter_basic_get(Eldbus_Message_
|
|||
*
|
||||
* @note The returned string must be freed.
|
||||
*/
|
||||
ELDBUS_API char *eldbus_message_iter_signature_get(Eldbus_Message_Iter *iter) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI char *eldbus_message_iter_signature_get(Eldbus_Message_Iter *iter) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Moves the iterator to the next field, if any.
|
||||
|
@ -336,7 +336,7 @@ ELDBUS_API char *eldbus_message_iter_signature_get(Eldbus_Mess
|
|||
*
|
||||
* @return if iterator was reach to end return EINA_FALSE
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_iter_next(Eldbus_Message_Iter *iter) EINA_ARG_NONNULL(1);
|
||||
EAPI Eina_Bool eldbus_message_iter_next(Eldbus_Message_Iter *iter) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Get a complete type from Eldbus_Message_Iter if is not at the end
|
||||
|
@ -351,7 +351,7 @@ ELDBUS_API Eina_Bool eldbus_message_iter_next(Eldbus_Message_Iter
|
|||
* iterator points return EINA_FALSE
|
||||
*
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_iter_get_and_next(Eldbus_Message_Iter *iter, char signature, ...) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI Eina_Bool eldbus_message_iter_get_and_next(Eldbus_Message_Iter *iter, char signature, ...) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
/**
|
||||
* @brief Reads a block of fixed-length values from the message iterator.
|
||||
|
@ -376,7 +376,7 @@ ELDBUS_API Eina_Bool eldbus_message_iter_get_and_next(Eldbus_Messa
|
|||
* @param n_elements
|
||||
* @return EINA_TRUE on success, else EINA_FALSE.
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_iter_fixed_array_get(Eldbus_Message_Iter *iter, int signature, void *value, int *n_elements) EINA_ARG_NONNULL(1, 3, 4);
|
||||
EAPI Eina_Bool eldbus_message_iter_fixed_array_get(Eldbus_Message_Iter *iter, int signature, void *value, int *n_elements) EINA_ARG_NONNULL(1, 3, 4);
|
||||
|
||||
/**
|
||||
* @brief Get data from Eldbus_Message_Iter, for each complete type must have
|
||||
|
@ -389,7 +389,7 @@ ELDBUS_API Eina_Bool eldbus_message_iter_fixed_array_get(Eldbus_Message_Iter *it
|
|||
*
|
||||
* @return EINA_FALSE if signature different from signature in iterator
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_iter_arguments_get(Eldbus_Message_Iter *iter, const char *signature, ...) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eina_Bool eldbus_message_iter_arguments_get(Eldbus_Message_Iter *iter, const char *signature, ...) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Get data from Eldbus_Message_Iter, for each complete type must have
|
||||
|
@ -402,7 +402,7 @@ ELDBUS_API Eina_Bool eldbus_message_iter_arguments_get(Eldbus_Mess
|
|||
*
|
||||
* @return EINA_FALSE if signature different from signature in iterator
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_iter_arguments_vget(Eldbus_Message_Iter *iter, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eina_Bool eldbus_message_iter_arguments_vget(Eldbus_Message_Iter *iter, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Manually delete the iterator.
|
||||
|
@ -418,7 +418,7 @@ ELDBUS_API Eina_Bool eldbus_message_iter_arguments_vget(Eldbus_Mes
|
|||
*
|
||||
* @param iter the iterator to be deleted.
|
||||
*/
|
||||
ELDBUS_API void eldbus_message_iter_del(Eldbus_Message_Iter *iter) EINA_ARG_NONNULL(1);
|
||||
EAPI void eldbus_message_iter_del(Eldbus_Message_Iter *iter) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
* @param msg Message
|
||||
* @return Eina_Value of type Eina_Value_Type_Struct
|
||||
*/
|
||||
ELDBUS_API Eina_Value *eldbus_message_to_eina_value(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eina_Value *eldbus_message_to_eina_value(const Eldbus_Message *msg) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* Convert Eldbus_Message_Iter of type variant, struct or dict entry to
|
||||
|
@ -19,7 +19,7 @@ ELDBUS_API Eina_Value *eldbus_message_to_eina_value(const Eldbus_Message *msg) E
|
|||
* @param iter Message iterator
|
||||
* @return Eina_Value of type Eina_Value_Type_Struct
|
||||
*/
|
||||
ELDBUS_API Eina_Value *eldbus_message_iter_struct_like_to_eina_value(const Eldbus_Message_Iter *iter);
|
||||
EAPI Eina_Value *eldbus_message_iter_struct_like_to_eina_value(const Eldbus_Message_Iter *iter);
|
||||
|
||||
/**
|
||||
* Convert Eina_Value to Eldbus_Message
|
||||
|
@ -29,7 +29,7 @@ ELDBUS_API Eina_Value *eldbus_message_iter_struct_like_to_eina_value(const Eldbu
|
|||
* @param value source of data, must be of type Eina_Value_Type_Struct
|
||||
* @return success or not
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_message_from_eina_value(const char *signature, Eldbus_Message *msg, const Eina_Value *value) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI Eina_Bool eldbus_message_from_eina_value(const char *signature, Eldbus_Message *msg, const Eina_Value *value) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
|
|
@ -371,7 +371,7 @@ _message_iter_from_eina_value_struct(const char *signature, Eldbus_Message_Iter
|
|||
return r;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_message_from_eina_value(const char *signature, Eldbus_Message *msg, const Eina_Value *value)
|
||||
{
|
||||
Eldbus_Message_Iter *iter;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "eldbus_private.h"
|
||||
#include "eldbus_private_types.h"
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_message_iter_dict_iterate(Eldbus_Message_Iter *array, const char *signature, Eldbus_Dict_Cb_Get cb, const void *data)
|
||||
{
|
||||
Eldbus_Message_Iter *entry;
|
||||
|
|
|
@ -24,7 +24,7 @@ typedef void (*Eldbus_Dict_Cb_Get)(void *data, const void *key, Eldbus_Message_I
|
|||
* @param cb callback that will be called in each entry
|
||||
* @param data context data
|
||||
*/
|
||||
ELDBUS_API void eldbus_message_iter_dict_iterate(Eldbus_Message_Iter *dict, const char *signature, Eldbus_Dict_Cb_Get cb, const void *data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI void eldbus_message_iter_dict_iterate(Eldbus_Message_Iter *dict, const char *signature, Eldbus_Dict_Cb_Get cb, const void *data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
|
|
@ -449,7 +449,7 @@ end:
|
|||
return value_st;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Value *
|
||||
EAPI Eina_Value *
|
||||
eldbus_message_to_eina_value(const Eldbus_Message *msg)
|
||||
{
|
||||
Eldbus_Message_Iter *iter;
|
||||
|
@ -459,7 +459,7 @@ eldbus_message_to_eina_value(const Eldbus_Message *msg)
|
|||
return _message_iter_struct_to_eina_value(iter);
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Value *
|
||||
EAPI Eina_Value *
|
||||
eldbus_message_iter_struct_like_to_eina_value(const Eldbus_Message_Iter *iter)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
|
||||
|
|
|
@ -184,7 +184,7 @@ _on_connection_free(void *data, const void *dead_pointer EINA_UNUSED)
|
|||
_eldbus_object_free(obj);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Object *
|
||||
EAPI Eldbus_Object *
|
||||
eldbus_object_get(Eldbus_Connection *conn, const char *bus, const char *path)
|
||||
{
|
||||
Eldbus_Object *obj;
|
||||
|
@ -236,7 +236,7 @@ _eldbus_object_unref(Eldbus_Object *obj)
|
|||
_eldbus_object_free(obj);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Object *
|
||||
EAPI Eldbus_Object *
|
||||
eldbus_object_ref(Eldbus_Object *obj)
|
||||
{
|
||||
ELDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
|
||||
|
@ -246,7 +246,7 @@ eldbus_object_ref(Eldbus_Object *obj)
|
|||
return obj;
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_object_unref(Eldbus_Object *obj)
|
||||
{
|
||||
ELDBUS_OBJECT_CHECK(obj);
|
||||
|
@ -255,7 +255,7 @@ eldbus_object_unref(Eldbus_Object *obj)
|
|||
_eldbus_object_unref(obj);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_object_free_cb_add(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *data)
|
||||
{
|
||||
ELDBUS_OBJECT_CHECK(obj);
|
||||
|
@ -263,7 +263,7 @@ eldbus_object_free_cb_add(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *dat
|
|||
obj->cbs_free = eldbus_cbs_free_add(obj->cbs_free, cb, data);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_object_free_cb_del(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *data)
|
||||
{
|
||||
ELDBUS_OBJECT_CHECK(obj);
|
||||
|
@ -376,7 +376,7 @@ end:
|
|||
eldbus_proxy_unref(proxy);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_object_event_callback_add(Eldbus_Object *obj, Eldbus_Object_Event_Type type, Eldbus_Object_Event_Cb cb, const void *cb_data)
|
||||
{
|
||||
Eldbus_Object_Context_Event *ce;
|
||||
|
@ -451,7 +451,7 @@ _eldbus_object_context_event_cb_del(Eldbus_Object_Context_Event *ce, Eldbus_Obje
|
|||
free(ctx);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_object_event_callback_del(Eldbus_Object *obj, Eldbus_Object_Event_Type type, Eldbus_Object_Event_Cb cb, const void *cb_data)
|
||||
{
|
||||
Eldbus_Object_Context_Event *ce;
|
||||
|
@ -538,21 +538,21 @@ _eldbus_object_event_callback_call(Eldbus_Object *obj, Eldbus_Object_Event_Type
|
|||
_eldbus_object_context_event_cb_del(ce, iter);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Connection *
|
||||
EAPI Eldbus_Connection *
|
||||
eldbus_object_connection_get(const Eldbus_Object *obj)
|
||||
{
|
||||
ELDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
|
||||
return obj->conn;
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_object_bus_name_get(const Eldbus_Object *obj)
|
||||
{
|
||||
ELDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
|
||||
return obj->name;
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_object_path_get(const Eldbus_Object *obj)
|
||||
{
|
||||
ELDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
|
||||
|
@ -571,7 +571,7 @@ _on_object_message_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pen
|
|||
cb(data, msg, pending);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_object_send(Eldbus_Object *obj, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout)
|
||||
{
|
||||
Eldbus_Pending *pending;
|
||||
|
@ -603,7 +603,7 @@ _on_signal_handler_free(void *data, const void *dead_pointer)
|
|||
obj->signal_handlers = eina_list_remove(obj->signal_handlers, dead_pointer);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Signal_Handler *
|
||||
EAPI Eldbus_Signal_Handler *
|
||||
eldbus_object_signal_handler_add(Eldbus_Object *obj, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data)
|
||||
{
|
||||
Eldbus_Signal_Handler *handler;
|
||||
|
@ -621,7 +621,7 @@ eldbus_object_signal_handler_add(Eldbus_Object *obj, const char *interface, cons
|
|||
return handler;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Message *
|
||||
EAPI Eldbus_Message *
|
||||
eldbus_object_method_call_new(Eldbus_Object *obj, const char *interface, const char *member)
|
||||
{
|
||||
ELDBUS_OBJECT_CHECK_RETVAL(obj, NULL);
|
||||
|
@ -649,7 +649,7 @@ eldbus_object_proxy_del(Eldbus_Object *obj, Eldbus_Proxy *proxy, const char *int
|
|||
return eina_hash_del(obj->proxies, interface, proxy);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_object_peer_ping(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data)
|
||||
{
|
||||
Eldbus_Message *msg;
|
||||
|
@ -660,7 +660,7 @@ eldbus_object_peer_ping(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *da
|
|||
return p;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_object_peer_machine_id_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data)
|
||||
{
|
||||
Eldbus_Message *msg;
|
||||
|
@ -672,7 +672,7 @@ eldbus_object_peer_machine_id_get(Eldbus_Object *obj, Eldbus_Message_Cb cb, cons
|
|||
return p;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_object_introspect(Eldbus_Object *obj, Eldbus_Message_Cb cb, const void *data)
|
||||
{
|
||||
Eldbus_Message *msg;
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
* @param path object path of this object
|
||||
* @return The corresponding Eldbus_Object.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Object *eldbus_object_get(Eldbus_Connection *conn, const char *bus, const char *path) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Object *eldbus_object_get(Eldbus_Connection *conn, const char *bus, const char *path) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Increase object reference.
|
||||
|
@ -24,7 +24,7 @@ ELDBUS_API Eldbus_Object *eldbus_object_get(Eldbus_Connection *conn, const char
|
|||
* @param obj An Eldbus_Object.
|
||||
* @return The same Eldbus_Object with an increased refcount.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Object *eldbus_object_ref(Eldbus_Object *obj) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Object *eldbus_object_ref(Eldbus_Object *obj) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Decrease object reference.
|
||||
|
@ -32,7 +32,7 @@ ELDBUS_API Eldbus_Object *eldbus_object_ref(Eldbus_Object *obj) EINA_ARG_NONNULL
|
|||
*
|
||||
* @param obj An Eldbus_Object.
|
||||
*/
|
||||
ELDBUS_API void eldbus_object_unref(Eldbus_Object *obj) EINA_ARG_NONNULL(1);
|
||||
EAPI void eldbus_object_unref(Eldbus_Object *obj) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Add a callback function to be called when object will be freed.
|
||||
|
@ -41,7 +41,7 @@ ELDBUS_API void eldbus_object_unref(Eldbus_Object *obj) EINA_ARG_NONNUL
|
|||
* @param cb callback that will be executed
|
||||
* @param data passed to callback
|
||||
*/
|
||||
ELDBUS_API void eldbus_object_free_cb_add(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void eldbus_object_free_cb_add(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Remove callback registered in eldbus_object_free_cb_add().
|
||||
|
@ -50,7 +50,7 @@ ELDBUS_API void eldbus_object_free_cb_add(Eldbus_Object *obj, Eldbus_Fr
|
|||
* @param cb Callback that was registered.
|
||||
* @param data Data that was passed to callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_object_free_cb_del(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void eldbus_object_free_cb_del(Eldbus_Object *obj, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @typedef Eldbus_Object_Event_Type
|
||||
|
@ -133,7 +133,7 @@ typedef void (*Eldbus_Object_Event_Cb)(void *data, Eldbus_Object *obj, void *eve
|
|||
* @param cb The callback to call.
|
||||
* @param cb_data The data to pass to the callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_object_event_callback_add(Eldbus_Object *obj, Eldbus_Object_Event_Type type, Eldbus_Object_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
EAPI void eldbus_object_event_callback_add(Eldbus_Object *obj, Eldbus_Object_Event_Type type, Eldbus_Object_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
|
||||
/**
|
||||
* @brief Remove callback registered in eldbus_object_event_callback_add().
|
||||
|
@ -143,7 +143,7 @@ ELDBUS_API void eldbus_object_event_callback_add(Eldbus_Object
|
|||
* @param cb The callback to call.
|
||||
* @param cb_data The data to pass to the callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_object_event_callback_del(Eldbus_Object *obj, Eldbus_Object_Event_Type type, Eldbus_Object_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
EAPI void eldbus_object_event_callback_del(Eldbus_Object *obj, Eldbus_Object_Event_Type type, Eldbus_Object_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
|
||||
/**
|
||||
* Get the Eldbus_Connection object associated with a Eldbus_Object.
|
||||
|
@ -151,7 +151,7 @@ ELDBUS_API void eldbus_object_event_callback_del(Eldbus_Object
|
|||
* @param obj The Eldbus_Object.
|
||||
* @return The corresponding Eldbus_Connection object.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Connection *eldbus_object_connection_get(const Eldbus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Connection *eldbus_object_connection_get(const Eldbus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* Get the name associated with a Eldbus_Object.
|
||||
|
@ -159,7 +159,7 @@ ELDBUS_API Eldbus_Connection *eldbus_object_connection_get(const Eldbus_Obje
|
|||
* @param obj The Eldbus_Object.
|
||||
* @return A string corresponding to the Eldbus_Object name.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_object_bus_name_get(const Eldbus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_object_bus_name_get(const Eldbus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* Get the path associated with a Eldbus_Object.
|
||||
|
@ -167,7 +167,7 @@ ELDBUS_API const char *eldbus_object_bus_name_get(const Eldbus_Object
|
|||
* @param obj The Eldbus_Object.
|
||||
* @return A string corresponding to the Eldbus_Object path.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_object_path_get(const Eldbus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_object_path_get(const Eldbus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Send a message.
|
||||
|
@ -181,7 +181,7 @@ ELDBUS_API const char *eldbus_object_path_get(const Eldbus_Object *obj
|
|||
* ELDBUS_TIMEOUT_INFINITE for no timeout
|
||||
* @return A Eldbus_Pending object.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_object_send(Eldbus_Object *obj, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Pending *eldbus_object_send(Eldbus_Object *obj, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Add a signal handler.
|
||||
|
@ -193,7 +193,7 @@ ELDBUS_API Eldbus_Pending *eldbus_object_send(Eldbus_Object *obj, Eldbus_
|
|||
* @param cb_data data that will be passed to callback
|
||||
* @return A listener to the desired signal.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Signal_Handler *eldbus_object_signal_handler_add(Eldbus_Object *obj, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 4);
|
||||
EAPI Eldbus_Signal_Handler *eldbus_object_signal_handler_add(Eldbus_Object *obj, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 4);
|
||||
|
||||
/**
|
||||
* @brief Call a dbus method on the Eldbus_Object.
|
||||
|
@ -204,7 +204,7 @@ ELDBUS_API Eldbus_Signal_Handler *eldbus_object_signal_handler_add(Eldbus_Object
|
|||
*
|
||||
* @return a new Eldbus_Message, free with eldbus_message_unref()
|
||||
*/
|
||||
ELDBUS_API Eldbus_Message *eldbus_object_method_call_new(Eldbus_Object *obj, const char *interface, const char *member) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Message *eldbus_object_method_call_new(Eldbus_Object *obj, const char *interface, const char *member) EINA_ARG_NONNULL(1, 2, 3) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
|
|
@ -90,7 +90,7 @@ _on_conn_message_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pendi
|
|||
cb(data, msg, pending);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_connection_send(Eldbus_Connection *conn, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout)
|
||||
{
|
||||
Eldbus_Pending *pending;
|
||||
|
@ -222,7 +222,7 @@ fail:
|
|||
return reply;
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_pending_data_set(Eldbus_Pending *pending, const char *key, const void *data)
|
||||
{
|
||||
ELDBUS_PENDING_CHECK(pending);
|
||||
|
@ -231,7 +231,7 @@ eldbus_pending_data_set(Eldbus_Pending *pending, const char *key, const void *da
|
|||
eldbus_data_set(&(pending->data), key, data);
|
||||
}
|
||||
|
||||
ELDBUS_API void *
|
||||
EAPI void *
|
||||
eldbus_pending_data_get(const Eldbus_Pending *pending, const char *key)
|
||||
{
|
||||
ELDBUS_PENDING_CHECK_RETVAL(pending, NULL);
|
||||
|
@ -239,7 +239,7 @@ eldbus_pending_data_get(const Eldbus_Pending *pending, const char *key)
|
|||
return eldbus_data_get(&(((Eldbus_Pending *)pending)->data), key);
|
||||
}
|
||||
|
||||
ELDBUS_API void *
|
||||
EAPI void *
|
||||
eldbus_pending_data_del(Eldbus_Pending *pending, const char *key)
|
||||
{
|
||||
ELDBUS_PENDING_CHECK_RETVAL(pending, NULL);
|
||||
|
@ -272,7 +272,7 @@ eldbus_pending_dispatch(Eldbus_Pending *pending, Eldbus_Message *msg)
|
|||
free(pending);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_pending_cancel(Eldbus_Pending *pending)
|
||||
{
|
||||
Eldbus_Message *error_message;
|
||||
|
@ -288,7 +288,7 @@ eldbus_pending_cancel(Eldbus_Pending *pending)
|
|||
eldbus_pending_dispatch(pending, error_message);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_pending_free_cb_add(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const void *data)
|
||||
{
|
||||
ELDBUS_PENDING_CHECK(pending);
|
||||
|
@ -296,7 +296,7 @@ eldbus_pending_free_cb_add(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const voi
|
|||
pending->cbs_free = eldbus_cbs_free_add(pending->cbs_free, cb, data);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_pending_free_cb_del(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const void *data)
|
||||
{
|
||||
ELDBUS_PENDING_CHECK(pending);
|
||||
|
@ -304,28 +304,28 @@ eldbus_pending_free_cb_del(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const voi
|
|||
pending->cbs_free = eldbus_cbs_free_del(pending->cbs_free, cb, data);
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_pending_destination_get(const Eldbus_Pending *pending)
|
||||
{
|
||||
ELDBUS_PENDING_CHECK_RETVAL(pending, NULL);
|
||||
return pending->dest;
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_pending_path_get(const Eldbus_Pending *pending)
|
||||
{
|
||||
ELDBUS_PENDING_CHECK_RETVAL(pending, NULL);
|
||||
return pending->path;
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_pending_interface_get(const Eldbus_Pending *pending)
|
||||
{
|
||||
ELDBUS_PENDING_CHECK_RETVAL(pending, NULL);
|
||||
return pending->interface;
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_pending_method_get(const Eldbus_Pending *pending)
|
||||
{
|
||||
ELDBUS_PENDING_CHECK_RETVAL(pending, NULL);
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
* @param key A string corresponding to the key associated with the data.
|
||||
* @param data The data to set to the Eldbus_Pending object.
|
||||
*/
|
||||
ELDBUS_API void eldbus_pending_data_set(Eldbus_Pending *pending, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI void eldbus_pending_data_set(Eldbus_Pending *pending, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
/**
|
||||
* @brief Get the data set to a Eldbus_Pending object.
|
||||
|
@ -24,7 +24,7 @@ ELDBUS_API void eldbus_pending_data_set(Eldbus_Pending *pending
|
|||
* @param key A string corresponding to the key associated with the data.
|
||||
* @return The data set to the Eldbus_Pending object.
|
||||
*/
|
||||
ELDBUS_API void *eldbus_pending_data_get(const Eldbus_Pending *pending, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void *eldbus_pending_data_get(const Eldbus_Pending *pending, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Delete the data set to a Eldbus_Pending object.
|
||||
|
@ -32,14 +32,14 @@ ELDBUS_API void *eldbus_pending_data_get(const Eldbus_Pending *p
|
|||
* @param pending The Eldbus_Pending object on which the data is set.
|
||||
* @param key A string corresponding to the key associated with the data.
|
||||
*/
|
||||
ELDBUS_API void *eldbus_pending_data_del(Eldbus_Pending *pending, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void *eldbus_pending_data_del(Eldbus_Pending *pending, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Cancel the pending message.
|
||||
*
|
||||
* @param pending The Eldbus_Pending object corresponding to the pending message.
|
||||
*/
|
||||
ELDBUS_API void eldbus_pending_cancel(Eldbus_Pending *pending) EINA_ARG_NONNULL(1);
|
||||
EAPI void eldbus_pending_cancel(Eldbus_Pending *pending) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Get the destination of the pending message.
|
||||
|
@ -47,7 +47,7 @@ ELDBUS_API void eldbus_pending_cancel(Eldbus_Pending *pending)
|
|||
* @param pending The Eldbus_Pending object.
|
||||
* @return A string corresponding to the destination of the message.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_pending_destination_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_pending_destination_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Get the path of the pending message.
|
||||
|
@ -55,7 +55,7 @@ ELDBUS_API const char *eldbus_pending_destination_get(const Eldbus_Pen
|
|||
* @param pending The Eldbus_Pending object.
|
||||
* @return A string corresponding to the path of the message.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_pending_path_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_pending_path_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Get the interface of the pending message.
|
||||
|
@ -63,7 +63,7 @@ ELDBUS_API const char *eldbus_pending_path_get(const Eldbus_Pending *p
|
|||
* @param pending The Eldbus_Pending object.
|
||||
* @return A string corresponding to the interface of the message.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_pending_interface_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_pending_interface_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Get the method of the pending message.
|
||||
|
@ -71,7 +71,7 @@ ELDBUS_API const char *eldbus_pending_interface_get(const Eldbus_Pendi
|
|||
* @param pending The Eldbus_Pending object.
|
||||
* @return A string corresponding to the method of the message.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_pending_method_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_pending_method_get(const Eldbus_Pending *pending) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Add a callback function to be called when pending will be freed.
|
||||
|
@ -80,7 +80,7 @@ ELDBUS_API const char *eldbus_pending_method_get(const Eldbus_Pending
|
|||
* @param cb The callback to register.
|
||||
* @param data The data to pass to the callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_pending_free_cb_add(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void eldbus_pending_free_cb_add(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Remove callback registered in eldbus_pending_free_cb_add().
|
||||
|
@ -89,7 +89,7 @@ ELDBUS_API void eldbus_pending_free_cb_add(Eldbus_Pending *pend
|
|||
* @param cb The callback that was registered.
|
||||
* @param data The data passed to the callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_pending_free_cb_del(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void eldbus_pending_free_cb_del(Eldbus_Pending *pending, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
|
|
@ -204,7 +204,7 @@ _on_object_free(void *data, const void *dead_pointer EINA_UNUSED)
|
|||
_eldbus_proxy_free(proxy);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Proxy *
|
||||
EAPI Eldbus_Proxy *
|
||||
eldbus_proxy_get(Eldbus_Object *obj, const char *interface)
|
||||
{
|
||||
Eldbus_Proxy *proxy;
|
||||
|
@ -249,7 +249,7 @@ _eldbus_proxy_unref(Eldbus_Proxy *proxy)
|
|||
_eldbus_proxy_free(proxy);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Proxy *
|
||||
EAPI Eldbus_Proxy *
|
||||
eldbus_proxy_ref(Eldbus_Proxy *proxy)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
|
||||
|
@ -259,7 +259,7 @@ eldbus_proxy_ref(Eldbus_Proxy *proxy)
|
|||
return proxy;
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_proxy_unref(Eldbus_Proxy *proxy)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK(proxy);
|
||||
|
@ -268,7 +268,7 @@ eldbus_proxy_unref(Eldbus_Proxy *proxy)
|
|||
_eldbus_proxy_unref(proxy);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_proxy_free_cb_add(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *data)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK(proxy);
|
||||
|
@ -276,7 +276,7 @@ eldbus_proxy_free_cb_add(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *dat
|
|||
proxy->cbs_free = eldbus_cbs_free_add(proxy->cbs_free, cb, data);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_proxy_free_cb_del(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *data)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK(proxy);
|
||||
|
@ -284,7 +284,7 @@ eldbus_proxy_free_cb_del(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *dat
|
|||
proxy->cbs_free = eldbus_cbs_free_del(proxy->cbs_free, cb, data);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_proxy_data_set(Eldbus_Proxy *proxy, const char *key, const void *data)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK(proxy);
|
||||
|
@ -293,7 +293,7 @@ eldbus_proxy_data_set(Eldbus_Proxy *proxy, const char *key, const void *data)
|
|||
eldbus_data_set(&(proxy->data), key, data);
|
||||
}
|
||||
|
||||
ELDBUS_API void *
|
||||
EAPI void *
|
||||
eldbus_proxy_data_get(const Eldbus_Proxy *proxy, const char *key)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
|
||||
|
@ -301,7 +301,7 @@ eldbus_proxy_data_get(const Eldbus_Proxy *proxy, const char *key)
|
|||
return eldbus_data_get(&(((Eldbus_Proxy *)proxy)->data), key);
|
||||
}
|
||||
|
||||
ELDBUS_API void *
|
||||
EAPI void *
|
||||
eldbus_proxy_data_del(Eldbus_Proxy *proxy, const char *key)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
|
||||
|
@ -385,7 +385,7 @@ _props_cache_free(void *data)
|
|||
eina_value_free(value);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_proxy_event_callback_add(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type type, Eldbus_Proxy_Event_Cb cb, const void *cb_data)
|
||||
{
|
||||
Eldbus_Proxy_Context_Event *ce;
|
||||
|
@ -431,7 +431,7 @@ _eldbus_proxy_context_event_cb_del(Eldbus_Proxy_Context_Event *ce, Eldbus_Proxy_
|
|||
free(ctx);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_proxy_event_callback_del(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type type, Eldbus_Proxy_Event_Cb cb, const void *cb_data)
|
||||
{
|
||||
Eldbus_Proxy_Context_Event *ce;
|
||||
|
@ -516,14 +516,14 @@ _eldbus_proxy_event_callback_call(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type t
|
|||
_eldbus_proxy_context_event_cb_del(ce, iter);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Object *
|
||||
EAPI Eldbus_Object *
|
||||
eldbus_proxy_object_get(const Eldbus_Proxy *proxy)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
|
||||
return proxy->obj;
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_proxy_interface_get(const Eldbus_Proxy *proxy)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
|
||||
|
@ -570,7 +570,7 @@ _eldbus_proxy_send_and_block(Eldbus_Proxy *proxy, Eldbus_Message *msg, double ti
|
|||
return _eldbus_connection_send_and_block(proxy->obj->conn, msg, timeout);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_proxy_send(Eldbus_Proxy *proxy, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
|
||||
|
@ -579,7 +579,7 @@ eldbus_proxy_send(Eldbus_Proxy *proxy, Eldbus_Message *msg, Eldbus_Message_Cb cb
|
|||
return _eldbus_proxy_send(proxy, msg, cb, cb_data, timeout);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Message *
|
||||
EAPI Eldbus_Message *
|
||||
eldbus_proxy_send_and_block(Eldbus_Proxy *proxy, Eldbus_Message *msg, double timeout)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
|
||||
|
@ -588,7 +588,7 @@ eldbus_proxy_send_and_block(Eldbus_Proxy *proxy, Eldbus_Message *msg, double tim
|
|||
return _eldbus_proxy_send_and_block(proxy, msg, timeout);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Message *
|
||||
EAPI Eldbus_Message *
|
||||
eldbus_proxy_method_call_new(Eldbus_Proxy *proxy, const char *member)
|
||||
{
|
||||
Eldbus_Message *msg;
|
||||
|
@ -617,7 +617,7 @@ _eldbus_proxy_vcall(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb c
|
|||
return _eldbus_proxy_send(proxy, msg, cb, cb_data, timeout);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_proxy_call(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb, const void *cb_data, double timeout, const char *signature, ...)
|
||||
{
|
||||
Eldbus_Pending *pending;
|
||||
|
@ -635,7 +635,7 @@ eldbus_proxy_call(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb,
|
|||
return pending;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_proxy_vcall(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb, const void *cb_data, double timeout, const char *signature, va_list ap)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
|
||||
|
@ -654,7 +654,7 @@ _on_signal_handler_free(void *data, const void *dead_pointer)
|
|||
proxy->handlers = eina_list_remove(proxy->handlers, dead_pointer);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Signal_Handler *
|
||||
EAPI Eldbus_Signal_Handler *
|
||||
eldbus_proxy_signal_handler_add(Eldbus_Proxy *proxy, const char *member, Eldbus_Signal_Cb cb, const void *cb_data)
|
||||
{
|
||||
Eldbus_Signal_Handler *handler;
|
||||
|
@ -677,7 +677,7 @@ eldbus_proxy_signal_handler_add(Eldbus_Proxy *proxy, const char *member, Eldbus_
|
|||
return handler;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_proxy_property_get(Eldbus_Proxy *proxy, const char *name, Eldbus_Message_Cb cb, const void *data)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
|
||||
|
@ -700,7 +700,7 @@ _type_is_number(char sig)
|
|||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_proxy_property_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const void *value, Eldbus_Message_Cb cb, const void *data)
|
||||
{
|
||||
Eldbus_Message *msg;
|
||||
|
@ -732,7 +732,7 @@ eldbus_proxy_property_set(Eldbus_Proxy *proxy, const char *name, const char *sig
|
|||
return eldbus_proxy_send(proxy->obj->properties, msg, cb, data, -1);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_proxy_property_value_set(Eldbus_Proxy *proxy, const char *name, const char *sig, const Eina_Value *value, Eldbus_Message_Cb cb, const void *data)
|
||||
{
|
||||
Eldbus_Message *msg;
|
||||
|
@ -768,7 +768,7 @@ error:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Pending *
|
||||
EAPI Eldbus_Pending *
|
||||
eldbus_proxy_property_get_all(Eldbus_Proxy *proxy, Eldbus_Message_Cb cb, const void *data)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
|
||||
|
@ -776,7 +776,7 @@ eldbus_proxy_property_get_all(Eldbus_Proxy *proxy, Eldbus_Message_Cb cb, const v
|
|||
"s", proxy->interface);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Signal_Handler *
|
||||
EAPI Eldbus_Signal_Handler *
|
||||
eldbus_proxy_properties_changed_callback_add(Eldbus_Proxy *proxy, Eldbus_Signal_Cb cb, const void *data)
|
||||
{
|
||||
Eldbus_Signal_Handler *sh;
|
||||
|
@ -839,7 +839,7 @@ _props_get_all(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending)
|
|||
&event);
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_proxy_properties_monitor(Eldbus_Proxy *proxy, Eina_Bool enable)
|
||||
{
|
||||
Eldbus_Pending *pending;
|
||||
|
@ -883,7 +883,7 @@ eldbus_proxy_properties_monitor(Eldbus_Proxy *proxy, Eina_Bool enable)
|
|||
return !!eina_hash_population(proxy->props);
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Value *
|
||||
EAPI Eina_Value *
|
||||
eldbus_proxy_property_local_get(Eldbus_Proxy *proxy, const char *name)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
|
||||
|
@ -892,7 +892,7 @@ eldbus_proxy_property_local_get(Eldbus_Proxy *proxy, const char *name)
|
|||
return eina_hash_find(proxy->props, name);
|
||||
}
|
||||
|
||||
ELDBUS_API const Eina_Hash *
|
||||
EAPI const Eina_Hash *
|
||||
eldbus_proxy_property_local_get_all(Eldbus_Proxy *proxy)
|
||||
{
|
||||
ELDBUS_PROXY_CHECK_RETVAL(proxy, NULL);
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
* @param interface The interface name of the proxy.
|
||||
* @return The corresponding Eldbus_Proxy object.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Proxy *eldbus_proxy_get(Eldbus_Object *obj, const char *interface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Proxy *eldbus_proxy_get(Eldbus_Object *obj, const char *interface) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Increase proxy reference.
|
||||
|
@ -23,7 +23,7 @@ ELDBUS_API Eldbus_Proxy *eldbus_proxy_get(Eldbus_Object *obj, const cha
|
|||
* @param proxy The Eldbus_Proxy on which to increase the refcount.
|
||||
* @return The Eldbus_Proxy with an increased refcount.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Proxy *eldbus_proxy_ref(Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Proxy *eldbus_proxy_ref(Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Decrease proxy reference.
|
||||
|
@ -31,7 +31,7 @@ ELDBUS_API Eldbus_Proxy *eldbus_proxy_ref(Eldbus_Proxy *proxy) EINA_ARG
|
|||
*
|
||||
* @param proxy The Eldbus_Proxy on which to decrease the refcount.
|
||||
*/
|
||||
ELDBUS_API void eldbus_proxy_unref(Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1);
|
||||
EAPI void eldbus_proxy_unref(Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Get the Eldbus_Object associated with a proxy object.
|
||||
|
@ -39,7 +39,7 @@ ELDBUS_API void eldbus_proxy_unref(Eldbus_Proxy *proxy) EINA_AR
|
|||
* @param proxy The Eldbus_Proxy on which to do the query.
|
||||
* @return The corresponding Eldbus_Object.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Object *eldbus_proxy_object_get(const Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Object *eldbus_proxy_object_get(const Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Get the interface name associated with a proxy object.
|
||||
|
@ -47,7 +47,7 @@ ELDBUS_API Eldbus_Object *eldbus_proxy_object_get(const Eldbus_Proxy *pr
|
|||
* @param proxy The Eldbus_Proxy on which to do the query.
|
||||
* @return The string corresponding to the interface name.
|
||||
*/
|
||||
ELDBUS_API const char *eldbus_proxy_interface_get(const Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_proxy_interface_get(const Eldbus_Proxy *proxy) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Set data to an Eldbus_Proxy object.
|
||||
|
@ -56,7 +56,7 @@ ELDBUS_API const char *eldbus_proxy_interface_get(const Eldbus_Proxy *
|
|||
* @param key A string to which the data will be associated.
|
||||
* @param data The data to set to the proxy object.
|
||||
*/
|
||||
ELDBUS_API void eldbus_proxy_data_set(Eldbus_Proxy *proxy, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI void eldbus_proxy_data_set(Eldbus_Proxy *proxy, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
/**
|
||||
* @brief Get data of an Eldbus_Proxy object.
|
||||
|
@ -65,7 +65,7 @@ ELDBUS_API void eldbus_proxy_data_set(Eldbus_Proxy *proxy, cons
|
|||
* @param key The string to which the data is associated.
|
||||
* @return The data set to the proxy object associated with the provided key.
|
||||
*/
|
||||
ELDBUS_API void *eldbus_proxy_data_get(const Eldbus_Proxy *proxy, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void *eldbus_proxy_data_get(const Eldbus_Proxy *proxy, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Delete data of an Eldbus_Proxy object.
|
||||
|
@ -73,7 +73,7 @@ ELDBUS_API void *eldbus_proxy_data_get(const Eldbus_Proxy *proxy
|
|||
* @param proxy The Eldbus_Proxy on which to delete the data.
|
||||
* @param key The string to which the data is associated.
|
||||
*/
|
||||
ELDBUS_API void *eldbus_proxy_data_del(Eldbus_Proxy *proxy, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void *eldbus_proxy_data_del(Eldbus_Proxy *proxy, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Add a callback function to be called when an event of the
|
||||
|
@ -83,7 +83,7 @@ ELDBUS_API void *eldbus_proxy_data_del(Eldbus_Proxy *proxy, cons
|
|||
* @param cb The callback to add.
|
||||
* @param data The data to pass to the callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_proxy_free_cb_add(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void eldbus_proxy_free_cb_add(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Remove callback registered in eldbus_proxy_free_cb_add().
|
||||
|
@ -92,7 +92,7 @@ ELDBUS_API void eldbus_proxy_free_cb_add(Eldbus_Proxy *proxy, E
|
|||
* @param cb The callback to delete.
|
||||
* @param data The data passed to the callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_proxy_free_cb_del(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void eldbus_proxy_free_cb_del(Eldbus_Proxy *proxy, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Constructs a new message to invoke a method on a remote interface.
|
||||
|
@ -101,7 +101,7 @@ ELDBUS_API void eldbus_proxy_free_cb_del(Eldbus_Proxy *proxy, E
|
|||
* @param member The name of the method to invoke.
|
||||
* @return An Eldbus_Message object.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Message *eldbus_proxy_method_call_new(Eldbus_Proxy *proxy, const char *member) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Message *eldbus_proxy_method_call_new(Eldbus_Proxy *proxy, const char *member) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Send a message.
|
||||
|
@ -114,7 +114,7 @@ ELDBUS_API Eldbus_Message *eldbus_proxy_method_call_new(Eldbus_Proxy *pro
|
|||
* ELDBUS_TIMEOUT_INFINITE for no timeout
|
||||
* @return A Eldbus_Pending object on the sent message.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_proxy_send(Eldbus_Proxy *proxy, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Pending *eldbus_proxy_send(Eldbus_Proxy *proxy, Eldbus_Message *msg, Eldbus_Message_Cb cb, const void *cb_data, double timeout) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Send a message and block while waiting for the reply.
|
||||
|
@ -128,7 +128,7 @@ ELDBUS_API Eldbus_Pending *eldbus_proxy_send(Eldbus_Proxy *proxy, Eldbus_
|
|||
* The returned Eldbus_Message need to be unref after read.
|
||||
* @since 1.13
|
||||
*/
|
||||
ELDBUS_API Eldbus_Message *eldbus_proxy_send_and_block(Eldbus_Proxy *proxy, Eldbus_Message *msg, double timeout) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eldbus_Message *eldbus_proxy_send_and_block(Eldbus_Proxy *proxy, Eldbus_Message *msg, double timeout) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Call a method in proxy.
|
||||
|
@ -148,7 +148,7 @@ ELDBUS_API Eldbus_Message *eldbus_proxy_send_and_block(Eldbus_Proxy *prox
|
|||
* @note This function only support basic type to complex types use
|
||||
* eldbus_message_iter_* functions.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_proxy_call(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb, const void *cb_data, double timeout, const char *signature, ...) EINA_ARG_NONNULL(1, 2, 6);
|
||||
EAPI Eldbus_Pending *eldbus_proxy_call(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb, const void *cb_data, double timeout, const char *signature, ...) EINA_ARG_NONNULL(1, 2, 6);
|
||||
|
||||
/**
|
||||
* @brief Call a method in proxy.
|
||||
|
@ -167,7 +167,7 @@ ELDBUS_API Eldbus_Pending *eldbus_proxy_call(Eldbus_Proxy *proxy, const c
|
|||
* @note This function only support basic type to complex types use
|
||||
* eldbus_message_iter_* functions.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Pending *eldbus_proxy_vcall(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb, const void *cb_data, double timeout, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2, 6);
|
||||
EAPI Eldbus_Pending *eldbus_proxy_vcall(Eldbus_Proxy *proxy, const char *member, Eldbus_Message_Cb cb, const void *cb_data, double timeout, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2, 6);
|
||||
|
||||
/**
|
||||
* @brief Add a signal handler.
|
||||
|
@ -178,7 +178,7 @@ ELDBUS_API Eldbus_Pending *eldbus_proxy_vcall(Eldbus_Proxy *proxy, const
|
|||
* @param cb_data data that will be passed to callback
|
||||
* @return A listener to the desired signal.
|
||||
*/
|
||||
ELDBUS_API Eldbus_Signal_Handler *eldbus_proxy_signal_handler_add(Eldbus_Proxy *proxy, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
EAPI Eldbus_Signal_Handler *eldbus_proxy_signal_handler_add(Eldbus_Proxy *proxy, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
|
||||
/**
|
||||
* @typedef Eldbus_Proxy_Event_Type
|
||||
|
@ -247,7 +247,7 @@ typedef void (*Eldbus_Proxy_Event_Cb)(void *data, Eldbus_Proxy *proxy, void *eve
|
|||
* @param cb The callback function to register.
|
||||
* @param cb_data The data to pass to the callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_proxy_event_callback_add(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type type, Eldbus_Proxy_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
EAPI void eldbus_proxy_event_callback_add(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type type, Eldbus_Proxy_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
|
||||
/**
|
||||
* @brief Remove callback registered in eldbus_proxy_event_callback_add().
|
||||
|
@ -257,7 +257,7 @@ ELDBUS_API void eldbus_proxy_event_callback_add(Eldbus_Proxy *proxy, Eldbus_Prox
|
|||
* @param cb The callback function to delete.
|
||||
* @param cb_data The data passed to the callback.
|
||||
*/
|
||||
ELDBUS_API void eldbus_proxy_event_callback_del(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type type, Eldbus_Proxy_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
EAPI void eldbus_proxy_event_callback_del(Eldbus_Proxy *proxy, Eldbus_Proxy_Event_Type type, Eldbus_Proxy_Event_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 3);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
|
|
@ -994,25 +994,25 @@ fail:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Service_Interface *
|
||||
EAPI Eldbus_Service_Interface *
|
||||
eldbus_service_interface_register(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc *desc)
|
||||
{
|
||||
return _eldbus_service_interface_register(conn, path, desc, EINA_FALSE, 1u);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Service_Interface *
|
||||
EAPI Eldbus_Service_Interface *
|
||||
eldbus_service_interface_register2(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc2 *desc)
|
||||
{
|
||||
return _eldbus_service_interface_register(conn, path, &desc->description, EINA_FALSE, desc->version);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Service_Interface *
|
||||
EAPI Eldbus_Service_Interface *
|
||||
eldbus_service_interface_fallback_register(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc *desc)
|
||||
{
|
||||
return _eldbus_service_interface_register(conn, path, desc, EINA_TRUE, 1u);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Service_Interface *
|
||||
EAPI Eldbus_Service_Interface *
|
||||
eldbus_service_interface_fallback_register2(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc2 *desc)
|
||||
{
|
||||
return _eldbus_service_interface_register(conn, path, &desc->description, EINA_TRUE, desc->version);
|
||||
|
@ -1273,7 +1273,7 @@ _on_connection_free(void *data, const void *dead_pointer EINA_UNUSED)
|
|||
dbus_connection_unregister_object_path(obj->conn->dbus_conn, obj->path);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_service_interface_unregister(Eldbus_Service_Interface *iface)
|
||||
{
|
||||
Eldbus_Service_Object *obj;
|
||||
|
@ -1284,7 +1284,7 @@ eldbus_service_interface_unregister(Eldbus_Service_Interface *iface)
|
|||
obj->introspection_dirty = EINA_TRUE;
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_service_object_unregister(Eldbus_Service_Interface *iface)
|
||||
{
|
||||
ELDBUS_SERVICE_INTERFACE_CHECK(iface);
|
||||
|
@ -1384,21 +1384,21 @@ _object_handler(DBusConnection *dbus_conn EINA_UNUSED, DBusMessage *msg, void *u
|
|||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Connection *
|
||||
EAPI Eldbus_Connection *
|
||||
eldbus_service_connection_get(const Eldbus_Service_Interface *iface)
|
||||
{
|
||||
ELDBUS_SERVICE_INTERFACE_CHECK_RETVAL(iface, NULL);
|
||||
return iface->obj->conn;
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_service_object_path_get(const Eldbus_Service_Interface *iface)
|
||||
{
|
||||
ELDBUS_SERVICE_INTERFACE_CHECK_RETVAL(iface, NULL);
|
||||
return iface->obj->path;
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Message *
|
||||
EAPI Eldbus_Message *
|
||||
eldbus_service_signal_new(const Eldbus_Service_Interface *iface, unsigned int signal_id)
|
||||
{
|
||||
unsigned size;
|
||||
|
@ -1410,7 +1410,7 @@ eldbus_service_signal_new(const Eldbus_Service_Interface *iface, unsigned int si
|
|||
iface->signals[signal_id].name);
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_service_signal_emit(const Eldbus_Service_Interface *iface, unsigned int signal_id, ...)
|
||||
{
|
||||
Eldbus_Message *sig;
|
||||
|
@ -1440,7 +1440,7 @@ eldbus_service_signal_emit(const Eldbus_Service_Interface *iface, unsigned int s
|
|||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_service_signal_send(const Eldbus_Service_Interface *iface, Eldbus_Message *signal_msg)
|
||||
{
|
||||
ELDBUS_SERVICE_INTERFACE_CHECK_RETVAL(iface, EINA_FALSE);
|
||||
|
@ -1449,7 +1449,7 @@ eldbus_service_signal_send(const Eldbus_Service_Interface *iface, Eldbus_Message
|
|||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_service_object_data_set(Eldbus_Service_Interface *iface, const char *key, const void *data)
|
||||
{
|
||||
ELDBUS_SERVICE_INTERFACE_CHECK(iface);
|
||||
|
@ -1458,7 +1458,7 @@ eldbus_service_object_data_set(Eldbus_Service_Interface *iface, const char *key,
|
|||
eldbus_data_set(&(iface->obj->data), key, data);
|
||||
}
|
||||
|
||||
ELDBUS_API void *
|
||||
EAPI void *
|
||||
eldbus_service_object_data_get(const Eldbus_Service_Interface *iface, const char *key)
|
||||
{
|
||||
ELDBUS_SERVICE_INTERFACE_CHECK_RETVAL(iface, NULL);
|
||||
|
@ -1466,7 +1466,7 @@ eldbus_service_object_data_get(const Eldbus_Service_Interface *iface, const char
|
|||
return eldbus_data_get(&(((Eldbus_Service_Object *)iface->obj)->data), key);
|
||||
}
|
||||
|
||||
ELDBUS_API void *
|
||||
EAPI void *
|
||||
eldbus_service_object_data_del(Eldbus_Service_Interface *iface, const char *key)
|
||||
{
|
||||
ELDBUS_SERVICE_INTERFACE_CHECK_RETVAL(iface, NULL);
|
||||
|
@ -1474,7 +1474,7 @@ eldbus_service_object_data_del(Eldbus_Service_Interface *iface, const char *key)
|
|||
return eldbus_data_del(&(((Eldbus_Service_Object *)iface->obj)->data), key);
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_service_property_changed(const Eldbus_Service_Interface *interface, const char *name)
|
||||
{
|
||||
Property *prop;
|
||||
|
@ -1493,7 +1493,7 @@ eldbus_service_property_changed(const Eldbus_Service_Interface *interface, const
|
|||
return eina_array_push(iface->props_changed, prop);
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_service_property_invalidate_set(const Eldbus_Service_Interface *interface, const char *name, Eina_Bool is_invalidate)
|
||||
{
|
||||
Property *prop;
|
||||
|
@ -1525,7 +1525,7 @@ eldbus_service_property_invalidate_set(const Eldbus_Service_Interface *interface
|
|||
return eina_array_push(iface->prop_invalidated, prop);
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_service_object_manager_attach(Eldbus_Service_Interface *iface)
|
||||
{
|
||||
Eldbus_Service_Object *obj;
|
||||
|
@ -1558,7 +1558,7 @@ eldbus_service_object_manager_attach(Eldbus_Service_Interface *iface)
|
|||
return EINA_TRUE;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_service_object_manager_detach(Eldbus_Service_Interface *iface)
|
||||
{
|
||||
Eldbus_Service_Object *obj, *children;
|
||||
|
|
|
@ -125,7 +125,7 @@ typedef struct _Eldbus_Service_Interface_Desc2
|
|||
*
|
||||
* @return Interface
|
||||
*/
|
||||
ELDBUS_API Eldbus_Service_Interface *eldbus_service_interface_register(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc *desc) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI Eldbus_Service_Interface *eldbus_service_interface_register(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc *desc) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
/**
|
||||
* @brief Register a fallback interface handler for a given subsection of the object hierarchy.
|
||||
|
@ -139,7 +139,7 @@ ELDBUS_API Eldbus_Service_Interface *eldbus_service_interface_register(Eldbus_Co
|
|||
*
|
||||
* @return Interface
|
||||
*/
|
||||
ELDBUS_API Eldbus_Service_Interface *
|
||||
EAPI Eldbus_Service_Interface *
|
||||
eldbus_service_interface_fallback_register(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc *desc) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
/**
|
||||
|
@ -156,7 +156,7 @@ eldbus_service_interface_fallback_register(Eldbus_Connection *conn, const char *
|
|||
*
|
||||
* @return Interface
|
||||
*/
|
||||
ELDBUS_API Eldbus_Service_Interface *eldbus_service_interface_register2(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc2 *desc) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI Eldbus_Service_Interface *eldbus_service_interface_register2(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc2 *desc) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
/**
|
||||
* @brief Register a fallback interface handler for a given subsection
|
||||
|
@ -174,7 +174,7 @@ ELDBUS_API Eldbus_Service_Interface *eldbus_service_interface_register2(Eldbus_C
|
|||
*
|
||||
* @return Interface
|
||||
*/
|
||||
ELDBUS_API Eldbus_Service_Interface *
|
||||
EAPI Eldbus_Service_Interface *
|
||||
eldbus_service_interface_fallback_register2(Eldbus_Connection *conn, const char *path, const Eldbus_Service_Interface_Desc2 *desc) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
|
||||
|
@ -185,7 +185,7 @@ eldbus_service_interface_fallback_register2(Eldbus_Connection *conn, const char
|
|||
*
|
||||
* @param iface interface to unregister
|
||||
*/
|
||||
ELDBUS_API void eldbus_service_interface_unregister(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
|
||||
EAPI void eldbus_service_interface_unregister(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Unregister all interfaces of the object path that this interface belongs
|
||||
|
@ -193,9 +193,9 @@ ELDBUS_API void eldbus_service_interface_unregister(Eldbus_Service_Interface *if
|
|||
*
|
||||
* @param iface interface to unregister
|
||||
*/
|
||||
ELDBUS_API void eldbus_service_object_unregister(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
|
||||
ELDBUS_API Eldbus_Connection *eldbus_service_connection_get(const Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
ELDBUS_API const char *eldbus_service_object_path_get(const Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI void eldbus_service_object_unregister(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Connection *eldbus_service_connection_get(const Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_service_object_path_get(const Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Emit a signal handler of the interface with non-complex types.
|
||||
|
@ -208,7 +208,7 @@ ELDBUS_API const char *eldbus_service_object_path_get(const Eldbus_Service_Inter
|
|||
*
|
||||
* @return EINA_TRUE if success
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_service_signal_emit(const Eldbus_Service_Interface *iface, unsigned int signal_id, ...) EINA_ARG_NONNULL(1);
|
||||
EAPI Eina_Bool eldbus_service_signal_emit(const Eldbus_Service_Interface *iface, unsigned int signal_id, ...) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Create signal message.
|
||||
|
@ -221,7 +221,7 @@ ELDBUS_API Eina_Bool eldbus_service_signal_emit(const Eldbus_Service_Interface *
|
|||
*
|
||||
* @return EINA_TRUE if success
|
||||
*/
|
||||
ELDBUS_API Eldbus_Message *eldbus_service_signal_new(const Eldbus_Service_Interface *iface, unsigned int signal_id) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Message *eldbus_service_signal_new(const Eldbus_Service_Interface *iface, unsigned int signal_id) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Send a signal message.
|
||||
|
@ -235,7 +235,7 @@ ELDBUS_API Eldbus_Message *eldbus_service_signal_new(const Eldbus_Service_Interf
|
|||
*
|
||||
* @return EINA_TRUE if success
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_service_signal_send(const Eldbus_Service_Interface *iface, Eldbus_Message *signal_msg) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eina_Bool eldbus_service_signal_send(const Eldbus_Service_Interface *iface, Eldbus_Message *signal_msg) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Store data at object path, this data can be obtained from all interfaces
|
||||
|
@ -246,7 +246,7 @@ ELDBUS_API Eina_Bool eldbus_service_signal_send(const Eldbus_Service_Interface *
|
|||
* @param key to identify data
|
||||
* @param data
|
||||
*/
|
||||
ELDBUS_API void eldbus_service_object_data_set(Eldbus_Service_Interface *iface, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
EAPI void eldbus_service_object_data_set(Eldbus_Service_Interface *iface, const char *key, const void *data) EINA_ARG_NONNULL(1, 2, 3);
|
||||
|
||||
/**
|
||||
* @brief Get data stored in object path.
|
||||
|
@ -256,7 +256,7 @@ ELDBUS_API void eldbus_service_object_data_set(Eldbus_Service_Interface *iface,
|
|||
*
|
||||
* @return pointer to data if found otherwise NULL
|
||||
*/
|
||||
ELDBUS_API void *eldbus_service_object_data_get(const Eldbus_Service_Interface *iface, const char *key) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI void *eldbus_service_object_data_get(const Eldbus_Service_Interface *iface, const char *key) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @brief Del data stored in object path.
|
||||
|
@ -266,7 +266,7 @@ ELDBUS_API void *eldbus_service_object_data_get(const Eldbus_Service_Interface *
|
|||
*
|
||||
* @return pointer to data if found otherwise NULL
|
||||
*/
|
||||
ELDBUS_API void *eldbus_service_object_data_del(Eldbus_Service_Interface *iface, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void *eldbus_service_object_data_del(Eldbus_Service_Interface *iface, const char *key) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Add property to list of changed properties
|
||||
|
@ -278,9 +278,9 @@ ELDBUS_API void *eldbus_service_object_data_del(Eldbus_Service_Interface *iface,
|
|||
*
|
||||
* @return EINA_TRUE if success
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_service_property_changed(const Eldbus_Service_Interface *iface, const char *name) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eina_Bool eldbus_service_property_changed(const Eldbus_Service_Interface *iface, const char *name) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
ELDBUS_API Eina_Bool eldbus_service_property_invalidate_set(const Eldbus_Service_Interface *iface, const char *name, Eina_Bool is_invalidate) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI Eina_Bool eldbus_service_property_invalidate_set(const Eldbus_Service_Interface *iface, const char *name, Eina_Bool is_invalidate) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* Attach ObjectManager interface.
|
||||
|
@ -288,7 +288,7 @@ ELDBUS_API Eina_Bool eldbus_service_property_invalidate_set(const Eldbus_Service
|
|||
* @param iface ObjectManager will be attach in object path of this interface.
|
||||
* @return EINA_TRUE if success
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_service_object_manager_attach(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
|
||||
EAPI Eina_Bool eldbus_service_object_manager_attach(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* Detach ObjectManager interface.
|
||||
|
@ -296,7 +296,7 @@ ELDBUS_API Eina_Bool eldbus_service_object_manager_attach(Eldbus_Service_Interfa
|
|||
* @param iface ObjectManager of object path of this interface will be detach.
|
||||
* @return EINA_TRUE if success
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_service_object_manager_detach(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
|
||||
EAPI Eina_Bool eldbus_service_object_manager_detach(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
|
|
@ -68,7 +68,7 @@ _sort_arg(const void *d1, const void *d2)
|
|||
}
|
||||
|
||||
#define ARGX "arg"
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_signal_handler_match_extra_vset(Eldbus_Signal_Handler *sh, va_list ap)
|
||||
{
|
||||
const char *key = NULL, *read;
|
||||
|
@ -120,7 +120,7 @@ error:
|
|||
return EINA_FALSE;
|
||||
}
|
||||
|
||||
ELDBUS_API Eina_Bool
|
||||
EAPI Eina_Bool
|
||||
eldbus_signal_handler_match_extra_set(Eldbus_Signal_Handler *sh, ...)
|
||||
{
|
||||
Eina_Bool ret;
|
||||
|
@ -149,7 +149,7 @@ _on_handler_of_conn_free(void *data, const void *dead_pointer)
|
|||
eldbus_connection_free_cb_del(conn, _on_connection_free, dead_pointer);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Signal_Handler *
|
||||
EAPI Eldbus_Signal_Handler *
|
||||
eldbus_signal_handler_add(Eldbus_Connection *conn, const char *sender, const char *path, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data)
|
||||
{
|
||||
Eldbus_Signal_Handler *sh;
|
||||
|
@ -258,7 +258,7 @@ _eldbus_signal_handler_del(Eldbus_Signal_Handler *handler)
|
|||
free(handler);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Signal_Handler *
|
||||
EAPI Eldbus_Signal_Handler *
|
||||
eldbus_signal_handler_ref(Eldbus_Signal_Handler *handler)
|
||||
{
|
||||
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
|
||||
|
@ -268,7 +268,7 @@ eldbus_signal_handler_ref(Eldbus_Signal_Handler *handler)
|
|||
return handler;
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_signal_handler_unref(Eldbus_Signal_Handler *handler)
|
||||
{
|
||||
ELDBUS_SIGNAL_HANDLER_CHECK(handler);
|
||||
|
@ -281,7 +281,7 @@ eldbus_signal_handler_unref(Eldbus_Signal_Handler *handler)
|
|||
_eldbus_signal_handler_del(handler);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_signal_handler_del(Eldbus_Signal_Handler *handler)
|
||||
{
|
||||
ELDBUS_SIGNAL_HANDLER_CHECK(handler);
|
||||
|
@ -289,7 +289,7 @@ eldbus_signal_handler_del(Eldbus_Signal_Handler *handler)
|
|||
eldbus_signal_handler_unref(handler);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_signal_handler_free_cb_add(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data)
|
||||
{
|
||||
ELDBUS_SIGNAL_HANDLER_CHECK(handler);
|
||||
|
@ -297,7 +297,7 @@ eldbus_signal_handler_free_cb_add(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb
|
|||
handler->cbs_free = eldbus_cbs_free_add(handler->cbs_free, cb, data);
|
||||
}
|
||||
|
||||
ELDBUS_API void
|
||||
EAPI void
|
||||
eldbus_signal_handler_free_cb_del(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data)
|
||||
{
|
||||
ELDBUS_SIGNAL_HANDLER_CHECK(handler);
|
||||
|
@ -305,42 +305,42 @@ eldbus_signal_handler_free_cb_del(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb
|
|||
handler->cbs_free = eldbus_cbs_free_del(handler->cbs_free, cb, data);
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_signal_handler_sender_get(const Eldbus_Signal_Handler *handler)
|
||||
{
|
||||
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
|
||||
return handler->sender;
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_signal_handler_path_get(const Eldbus_Signal_Handler *handler)
|
||||
{
|
||||
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
|
||||
return handler->path;
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_signal_handler_interface_get(const Eldbus_Signal_Handler *handler)
|
||||
{
|
||||
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
|
||||
return handler->interface;
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_signal_handler_member_get(const Eldbus_Signal_Handler *handler)
|
||||
{
|
||||
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
|
||||
return handler->member;
|
||||
}
|
||||
|
||||
ELDBUS_API const char *
|
||||
EAPI const char *
|
||||
eldbus_signal_handler_match_get(const Eldbus_Signal_Handler *handler)
|
||||
{
|
||||
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
|
||||
return eina_strbuf_string_get(handler->match);
|
||||
}
|
||||
|
||||
ELDBUS_API Eldbus_Connection *
|
||||
EAPI Eldbus_Connection *
|
||||
eldbus_signal_handler_connection_get(const Eldbus_Signal_Handler *handler)
|
||||
{
|
||||
ELDBUS_SIGNAL_HANDLER_CHECK_RETVAL(handler, NULL);
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
*
|
||||
* @return signal handler
|
||||
*/
|
||||
ELDBUS_API Eldbus_Signal_Handler *eldbus_signal_handler_add(Eldbus_Connection *conn, const char *sender, const char *path, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 6);
|
||||
EAPI Eldbus_Signal_Handler *eldbus_signal_handler_add(Eldbus_Connection *conn, const char *sender, const char *path, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 6);
|
||||
|
||||
/**
|
||||
* @brief Increase signal handler reference.
|
||||
|
@ -30,7 +30,7 @@ ELDBUS_API Eldbus_Signal_Handler *eldbus_signal_handler_add(Eldbus_Connection *c
|
|||
*
|
||||
* @return the same signal handler, @p handler
|
||||
*/
|
||||
ELDBUS_API Eldbus_Signal_Handler *eldbus_signal_handler_ref(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1);
|
||||
EAPI Eldbus_Signal_Handler *eldbus_signal_handler_ref(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Decrease signal handler reference.
|
||||
|
@ -38,7 +38,7 @@ ELDBUS_API Eldbus_Signal_Handler *eldbus_signal_handler_ref(Eldbus_Signal_Handle
|
|||
*
|
||||
* @param handler signal handler
|
||||
*/
|
||||
ELDBUS_API void eldbus_signal_handler_unref(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1);
|
||||
EAPI void eldbus_signal_handler_unref(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Decrease signal handler reference like eldbus_signal_handler_unref()
|
||||
|
@ -47,7 +47,7 @@ ELDBUS_API void eldbus_signal_handler_unref(Eldbus_Signal_Handl
|
|||
*
|
||||
* @param handler signal handler to delete
|
||||
*/
|
||||
ELDBUS_API void eldbus_signal_handler_del(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1);
|
||||
EAPI void eldbus_signal_handler_del(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Add extra argument in match of signal handler to obtain specifics signals.
|
||||
|
@ -67,7 +67,7 @@ ELDBUS_API void eldbus_signal_handler_del(Eldbus_Signal_Handler
|
|||
* @note For more information:
|
||||
* http://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-routing-match-rules
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_signal_handler_match_extra_set(Eldbus_Signal_Handler *sh, ...) EINA_ARG_NONNULL(1) EINA_SENTINEL;
|
||||
EAPI Eina_Bool eldbus_signal_handler_match_extra_set(Eldbus_Signal_Handler *sh, ...) EINA_ARG_NONNULL(1) EINA_SENTINEL;
|
||||
|
||||
/**
|
||||
* @brief Add extra argument in match of signal handler to obtain specifics signals.
|
||||
|
@ -87,7 +87,7 @@ ELDBUS_API Eina_Bool eldbus_signal_handler_match_extra_set(Eldbus_Si
|
|||
* @note To information:
|
||||
* http://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-routing-match-rules
|
||||
*/
|
||||
ELDBUS_API Eina_Bool eldbus_signal_handler_match_extra_vset(Eldbus_Signal_Handler *sh, va_list ap) EINA_ARG_NONNULL(1);
|
||||
EAPI Eina_Bool eldbus_signal_handler_match_extra_vset(Eldbus_Signal_Handler *sh, va_list ap) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* @brief Add a callback function to be called when signal handler will be freed.
|
||||
|
@ -96,7 +96,7 @@ ELDBUS_API Eina_Bool eldbus_signal_handler_match_extra_vset(Eldbus_S
|
|||
* @param cb callback that will be called when this signal handler is freed
|
||||
* @param data data that will be passed to callback
|
||||
*/
|
||||
ELDBUS_API void eldbus_signal_handler_free_cb_add(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void eldbus_signal_handler_free_cb_add(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
/**
|
||||
* @brief Remove callback registered in eldbus_signal_handler_free_cb_add().
|
||||
|
@ -105,15 +105,15 @@ ELDBUS_API void eldbus_signal_handler_free_cb_add(Eldbus_Signal
|
|||
* @param cb registered callback to remove
|
||||
* @param data data that will be passed to callback
|
||||
*/
|
||||
ELDBUS_API void eldbus_signal_handler_free_cb_del(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
EAPI void eldbus_signal_handler_free_cb_del(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2);
|
||||
|
||||
ELDBUS_API const char *eldbus_signal_handler_sender_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
ELDBUS_API const char *eldbus_signal_handler_path_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
ELDBUS_API const char *eldbus_signal_handler_interface_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
ELDBUS_API const char *eldbus_signal_handler_member_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
ELDBUS_API const char *eldbus_signal_handler_match_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_signal_handler_sender_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_signal_handler_path_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_signal_handler_interface_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_signal_handler_member_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI const char *eldbus_signal_handler_match_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
ELDBUS_API Eldbus_Connection *eldbus_signal_handler_connection_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
EAPI Eldbus_Connection *eldbus_signal_handler_connection_get(const Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
|
||||
|
||||
/**
|
||||
* @}
|
||||
|
|
|
@ -23,7 +23,6 @@ foreach eo_file : pub_eo_files
|
|||
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
||||
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
||||
'-e', 'ELDBUS_API',
|
||||
'-gchd', '@INPUT@'])
|
||||
endforeach
|
||||
|
||||
|
@ -42,7 +41,6 @@ foreach eo_file : pub_eo_types_files
|
|||
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
|
||||
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
||||
'-e', 'ELDBUS_API',
|
||||
'-ghd', '@INPUT@'])
|
||||
endforeach
|
||||
|
||||
|
@ -50,7 +48,6 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
|
|||
|
||||
eldbus_header_src = [
|
||||
'Eldbus.h',
|
||||
'eldbus_api.h',
|
||||
'eldbus_connection.h',
|
||||
'eldbus_freedesktop.h',
|
||||
'eldbus_message.h',
|
||||
|
@ -100,7 +97,7 @@ eldbus_ext_deps += dependency('dbus-1')
|
|||
|
||||
eldbus_lib = library('eldbus',
|
||||
eldbus_src, pub_eo_file_target,
|
||||
c_args : [package_c_args, '-DELDBUS_BUILD'],
|
||||
c_args : package_c_args,
|
||||
dependencies: eldbus_pub_deps + eldbus_deps + eldbus_ext_deps,
|
||||
include_directories : config_dir,
|
||||
install: true,
|
||||
|
|
|
@ -88,9 +88,6 @@
|
|||
#ifdef EAPI_WEAK
|
||||
# undef EAPI_WEAK
|
||||
#endif
|
||||
#ifdef EOAPI
|
||||
# undef EOAPI
|
||||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
# ifdef EFL_BUILD
|
||||
|
@ -119,7 +116,7 @@
|
|||
#endif
|
||||
|
||||
#define EWAPI EAPI EAPI_WEAK
|
||||
#define EOAPI EAPI
|
||||
|
||||
|
||||
/* allow usage from c++ */
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -25,7 +25,4 @@ void ecore_test_ecore_args(TCase *tc);
|
|||
void ecore_test_ecore_pipe(TCase *tc);
|
||||
void ecore_test_ecore_evas_selection(TCase *tc);
|
||||
|
||||
#define ECORETEST_API
|
||||
#define ECORETEST_API_WEAK
|
||||
|
||||
#endif /* _ECORE_SUITE_H */
|
||||
|
|
|
@ -15,9 +15,6 @@ typedef struct {
|
|||
|
||||
} Efl_App_Test_CML_Data;
|
||||
|
||||
#define ECORETEST_API
|
||||
#define ECORETEST_API_WEAK
|
||||
|
||||
#include "efl_app_test_cml.eo.h"
|
||||
#include "efl_app_test_cml.eo.c"
|
||||
|
||||
|
|
|
@ -39,7 +39,6 @@ foreach eo_file : test_eo_files
|
|||
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
||||
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
||||
'-e', 'ECORETEST_API',
|
||||
'-gchd', '@INPUT@'])
|
||||
endforeach
|
||||
|
||||
|
@ -96,7 +95,6 @@ foreach eo_file : priv_eo_files
|
|||
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
||||
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
||||
'-e', 'ECORETEST_API',
|
||||
'-gchd', '@INPUT@'])
|
||||
endforeach
|
||||
|
||||
|
|
Loading…
Reference in New Issue