projects
/
runtime.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merges from Irssi CVS.
[runtime.git]
/
apps
/
irssi
/
src
/
core
/
expandos.c
diff --git
a/apps/irssi/src/core/expandos.c
b/apps/irssi/src/core/expandos.c
index 130d6025d3e2ad1bb023f9221401a8df471c02e1..5cec556185dbf64b6356b5c6545806c7fcd8fca1 100644
(file)
--- a/
apps/irssi/src/core/expandos.c
+++ b/
apps/irssi/src/core/expandos.c
@@
-179,7
+179,8
@@
void expando_bind(const char *key, int funccount, SIGNAL_FUNC *funcs)
func = arg < funccount ? funcs[arg] : NULL;
if (func == NULL) func = funcs[EXPANDO_ARG_NONE];
func = arg < funccount ? funcs[arg] : NULL;
if (func == NULL) func = funcs[EXPANDO_ARG_NONE];
- signal_add_to_id(MODULE_NAME, 1, rec->signal_ids[n], func);
+ signal_add_full_id(MODULE_NAME, SIGNAL_PRIORITY_DEFAULT,
+ rec->signal_ids[n], func, NULL);
}
}
}
}
@@
-208,7
+209,7
@@
void expando_unbind(const char *key, int funccount, SIGNAL_FUNC *funcs)
func = arg < funccount ? funcs[arg] : NULL;
if (func == NULL) func = funcs[EXPANDO_ARG_NONE];
func = arg < funccount ? funcs[arg] : NULL;
if (func == NULL) func = funcs[EXPANDO_ARG_NONE];
- signal_remove_id(rec->signal_ids[n], func);
+ signal_remove_id(rec->signal_ids[n], func
, NULL
);
}
}
}
}