Fix:core: Want to call callback_list, not callback

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@1675 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/event.c b/navit/navit/event.c
index 42929d5..7635d01 100644 (file)
--- a/navit/navit/event.c
+++ b/navit/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/navit/event.h b/navit/navit/event.h
index fb0c37d..db6675a 100644 (file)
--- a/navit/navit/event.h
+++ b/navit/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/navit/event_glib.c b/navit/navit/event_glib.c
index 7fc0bbb..ec7c373 100644 (file)
--- a/navit/navit/event_glib.c
+++ b/navit/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/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp b/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
index 374279f..0697a85 100644 (file)
--- a/navit/navit/graphics/qt_qpainter/graphics_qt_qpainter.cpp
+++ b/navit/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/navit/graphics/win32/graphics_win32.c b/navit/navit/graphics/win32/graphics_win32.c
index 7295809..b2c05a8 100644 (file)
--- a/navit/navit/graphics/win32/graphics_win32.c
+++ b/navit/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");
 }