Allow 'emit' to accept event arguments

1 files changed, 3 insertions, 14 deletions

diff --git a/event.cpp b/event.cpp
index e4f452e0..8c61ebd0 100644
--- a/event.cpp
+++ b/event.cpp
@@ -689,26 +689,15 @@ void event_free(event_t *e)
     delete e;
 }
 
-
-void event_fire_generic_internal(const wchar_t *name, ...)
+void event_fire_generic(const wchar_t *name, wcstring_list_t *args)
 {
-    va_list va;
-    wchar_t *arg;
-
     CHECK(name,);
 
     event_t ev(EVENT_GENERIC);
     ev.str_param1 = name;
-    ev.arguments.reset(new wcstring_list_t);
-    va_start(va, name);
-    while ((arg=va_arg(va, wchar_t *))!= 0)
-    {
-        ev.arguments->push_back(arg);
-    }
-    va_end(va);
-
+    if (args)
+        ev.arguments.reset(new wcstring_list_t(*args));
     event_fire(&ev);
-    ev.arguments.reset(NULL);
 }
 
 event_t event_t::signal_event(int sig)