diff options
author | zaxl <zaxl@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-11-07 12:38:12 +0000 |
---|---|---|
committer | zaxl <zaxl@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2008-11-07 12:38:12 +0000 |
commit | 8510a91c3f9af8b007f0d6ba44871746586d9d33 (patch) | |
tree | 183431e69d7a682c4ac78c93b25961d9adeb451c | |
parent | 8e6171f90d4fbdcba7e0b47f130609f9c912d0bc (diff) | |
download | navit-svn-8510a91c3f9af8b007f0d6ba44871746586d9d33.tar.gz |
Fix:core: Want to call callback_list, not callback
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@1675 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r-- | navit/event.c | 2 | ||||
-rw-r--r-- | navit/event.h | 5 | ||||
-rw-r--r-- | navit/event_glib.c | 2 | ||||
-rw-r--r-- | navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp | 2 | ||||
-rw-r--r-- | navit/graphics/win32/graphics_win32.c | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/navit/event.c b/navit/event.c index 42929d5c..7635d01c 100644 --- a/navit/event.c +++ b/navit/event.c @@ -79,7 +79,7 @@ event_remove_idle(struct event_idle *ev) } void -event_call_callback(struct callback *cb) +event_call_callback(struct callback_list *cb) { event_methods.call_callback(cb); } diff --git a/navit/event.h b/navit/event.h index fb0c37d4..db6675ae 100644 --- a/navit/event.h +++ b/navit/event.h @@ -25,6 +25,7 @@ struct event_idle; struct event_timeout; struct event_watch; struct callback; +struct callback_list; struct file; enum event_watch_cond { @@ -42,7 +43,7 @@ struct event_methods { void (*remove_timeout)(struct event_timeout *ev); struct event_idle *(*add_idle)(struct callback *cb); void (*remove_idle)(struct event_idle *ev); - void (*call_callback)(struct callback *cb); + void (*call_callback)(struct callback_list *cb); }; @@ -56,7 +57,7 @@ void event_remove_timeout(struct event_timeout *ev); struct event_idle *event_add_idle(struct callback *cb); void event_remove_idle(struct event_idle *ev); int event_request_system(char *system, char *requestor); -void event_call_callback(struct callback *cb); +void event_call_callback(struct callback_list *cb); /* end of prototypes */ #ifdef __cplusplus } diff --git a/navit/event_glib.c b/navit/event_glib.c index 7fc0bbbf..ec7c373e 100644 --- a/navit/event_glib.c +++ b/navit/event_glib.c @@ -137,7 +137,7 @@ event_glib_remove_idle(struct event_idle *ev) } static void -event_glib_call_callback(struct callback *cb) +event_glib_call_callback(struct callback_list *cb) { /* Idea for implementation: diff --git a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp index 374279f2..0697a85a 100644 --- a/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp +++ b/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp @@ -760,7 +760,7 @@ event_qt_remove_idle(struct event_idle *ev) } static void -event_qt_call_callback(struct callback *cb) +event_qt_call_callback(struct callback_list *cb) { dbg(0,"enter\n"); } diff --git a/navit/graphics/win32/graphics_win32.c b/navit/graphics/win32/graphics_win32.c index 7295809c..b2c05a8c 100644 --- a/navit/graphics/win32/graphics_win32.c +++ b/navit/graphics/win32/graphics_win32.c @@ -924,7 +924,7 @@ event_win32_remove_idle(struct event_idle *ev) } static void -event_win32_call_callback(struct callback *cb) +event_win32_call_callback(struct callback_list *cb) { dbg(0,"enter\n"); } |