callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Take a void object arg. (camel_object_remove_event): "

Browse Source 
2002-06-27  Not Zed  <NotZed@Ximian.com>

        * camel-object.c (camel_object_hook_event): Take a void object arg.
        (camel_object_remove_event): "
        (camel_object_unhook_event): "
        (camel_object_trigger_event): ", also, execute events in the same
        order they were added, i.e. reverse hook-list order.

svn path=/trunk/; revision=17359
This commit is contained in:
Not Zed
2002-07-03 01:42:50 +00:00
committed by Michael Zucci
parent df61377255
commit d49a387afc
3 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
camel/ChangeLog
View File

@ -1,3 +1,11 @@
2002-06-27 Not Zed <NotZed@Ximian.com>
* camel-object.c (camel_object_hook_event): Take a void object arg.
(camel_object_remove_event): "
(camel_object_unhook_event): "
(camel_object_trigger_event): ", also, execute events in the same
order they were added, i.e. reverse hook-list order.
2002-06-28 Jeffrey Stedfast <fejj@ximian.com>
* camel-gpg-context.c (gpg_ctx_get_argv): Don't use
@ -62,6 +70,7 @@
* providers/local/camel-local-provider.c
(camel_provider_module_init): Removed spoold provider. The spool
provider does it now.
(): Spoold doesn't exist anymore, remove its header.
2002-06-25 Not Zed <NotZed@Ximian.com>

20
camel/camel-object.c
View File

@ -694,15 +694,16 @@ static CamelHookList *camel_object_get_hooks(CamelObject *o)
#endif
unsigned int
camel_object_hook_event(CamelObject * obj, const char * name, CamelObjectEventHookFunc func, void *data)
camel_object_hook_event(void *vo, const char * name, CamelObjectEventHookFunc func, void *data)
{
CamelObject *obj = vo;
CamelHookPair *pair, *hook;
CamelHookList *hooks;
int id;
g_return_val_if_fail (CAMEL_IS_OBJECT (obj), 0);
g_return_val_if_fail (name != NULL, 0);
g_return_val_if_fail (func != NULL, 0);
g_return_val_if_fail(CAMEL_IS_OBJECT (obj), 0);
g_return_val_if_fail(name != NULL, 0);
g_return_val_if_fail(func != NULL, 0);
hook = obj->klass->hooks;
while (hook) {
@ -736,8 +737,9 @@ setup:
}
void
camel_object_remove_event(CamelObject * obj, unsigned int id)
camel_object_remove_event(void *vo, unsigned int id)
{
CamelObject *obj = vo;
CamelHookList *hooks;
CamelHookPair *pair, *parent;
@ -778,8 +780,9 @@ camel_object_remove_event(CamelObject * obj, unsigned int id)
}
void
camel_object_unhook_event(CamelObject * obj, const char * name, CamelObjectEventHookFunc func, void *data)
camel_object_unhook_event(void *vo, const char * name, CamelObjectEventHookFunc func, void *data)
{
CamelObject *obj = vo;
CamelHookList *hooks;
CamelHookPair *pair, *parent;
@ -823,8 +826,9 @@ camel_object_unhook_event(CamelObject * obj, const char * name, CamelObjectEvent
}
void
camel_object_trigger_event (CamelObject * obj, const char * name, void *event_data)
camel_object_trigger_event(void *vo, const char * name, void *event_data)
{
CamelObject *obj = vo;
CamelHookList *hooks;
CamelHookPair *pair, **pairs, *parent, *hook;
int i, size;
@ -872,7 +876,7 @@ trigger:
}
/* now execute the events we have, if they haven't been removed during our calls */
for (i=0;i<size;i++) {
for (i=size-1;i>=0;i--) {
pair = pairs[i];
if ((pair->flags & CAMEL_HOOK_PAIR_REMOVED) == 0)
(pair->func.event) (obj, event_data, pair->data);

8
camel/camel-object.h
View File

@ -201,10 +201,10 @@ void camel_object_unref(void *);
#endif
/* hooks */
CamelObjectHookID camel_object_hook_event(CamelObject *obj, const char *name, CamelObjectEventHookFunc hook, void *data);
void camel_object_remove_event(CamelObject *obj, CamelObjectHookID id);
void camel_object_unhook_event(CamelObject *obj, const char *name, CamelObjectEventHookFunc hook, void *data);
void camel_object_trigger_event(CamelObject *obj, const char *name, void *event_data);
CamelObjectHookID camel_object_hook_event(void *obj, const char *name, CamelObjectEventHookFunc hook, void *data);
void camel_object_remove_event(void *obj, CamelObjectHookID id);
void camel_object_unhook_event(void *obj, const char *name, CamelObjectEventHookFunc hook, void *data);
void camel_object_trigger_event(void *obj, const char *name, void *event_data);
/* get/set methods */
int camel_object_set(void *obj, struct _CamelException *ex, ...);