Include settings.h so the banner macro hildon version works.

[mapper] / src / cb.h

diff --git a/src/cb.h b/src/cb.h
index 9ec84cf35f5f89d56f61c5d987c2b8b023f44505..8a2ebaaed22f79c82dd70e7f7438ed424907c035 100644 (file)
--- a/src/cb.h
+++ b/src/cb.h
@@ -3,26 +3,12 @@
 
 #include <config.h>
 
-#define _GNU_SOURCE
-
 #include <gtk/gtk.h>
 
 gboolean window_cb_key_press(GtkWidget * widget, GdkEventKey * event);
 gboolean window_cb_key_release(GtkWidget * widget, GdkEventKey * event);
 
-gboolean map_cb_configure(GtkWidget * widget, GdkEventConfigure * event);
-gboolean map_cb_expose(GtkWidget * widget, GdkEventExpose * event);
-gboolean map_cb_button_press(GtkWidget * widget, GdkEventButton * event);
-gboolean map_cb_button_release(GtkWidget * widget, GdkEventButton * event);
-gboolean map_cb_scroll_event(GtkWidget * widget, GdkEventScroll * event);
-
-gboolean heading_panel_expose(GtkWidget * widget, GdkEventExpose * event);
 gboolean sat_panel_expose(GtkWidget * widget, GdkEventExpose * event);
-gboolean sat_details_panel_expose(GtkWidget * widget, GdkEventExpose * event);
-
-gboolean channel_cb_error(GIOChannel * src, GIOCondition condition, gpointer data);
-gboolean channel_cb_connect(GIOChannel * src, GIOCondition condition, gpointer data);
-gboolean channel_cb_input(GIOChannel * src, GIOCondition condition, gpointer data);
 
 /* Callbacks for the "Route" submenu. */
 gboolean menu_cb_route_download(GtkAction * action);
@@ -51,7 +37,7 @@ gboolean menu_cb_maps_repoman(GtkAction * action);
 gboolean menu_cb_auto_download(GtkAction * action);
 
 /* Callbacks for the "View" submenu. */
-gboolean cb_zoom_autozoom(GtkAction * action);
+gboolean cb_zoom_auto(GtkAction * action);
 gboolean cb_zoom_base(GtkAction * action);
 gboolean cb_zoomin(GtkAction * action);
 gboolean cb_zoomout(GtkAction * action);
@@ -65,14 +51,13 @@ gboolean menu_cb_show_poi(GtkAction * action);
 gboolean menu_cb_category(GtkAction * action);
 
 /* Callbacks for the "Auto-Center" submenu. */
-gboolean menu_cb_ac_latlon(GtkAction * action);
-gboolean menu_cb_ac_lead(GtkAction * action);
-gboolean menu_cb_ac_none(GtkAction * action);
+gboolean menu_cb_autocenter(GtkAction *action, GtkRadioAction *current);
 
 /* Callbacks for the "Go to" submenu. */
 gboolean menu_cb_goto_latlon(GtkAction * action);
 gboolean menu_cb_goto_gps(GtkAction * action);
 gboolean menu_cb_goto_home(GtkAction * action);
+gboolean menu_cb_goto_destination(GtkAction *action);
 gboolean menu_cb_goto_nextway(GtkAction * action);
 gboolean menu_cb_goto_nearpoi(GtkAction * action);
 
@@ -84,6 +69,10 @@ gboolean menu_cb_gps_reset(GtkAction * action);
 
 /* Callbacks for the other menu items. */
 gboolean menu_cb_settings(GtkAction * action);
+gboolean menu_cb_settings_gps(GtkAction * action);
+gboolean menu_cb_settings_osm(GtkAction * action);
+gboolean menu_cb_settings_colors(GtkAction * action);
+gboolean menu_cb_import_osm(GtkAction * action);
 gboolean menu_cb_help(GtkAction * action);
 gboolean menu_cb_about(GtkAction * action);
 
@@ -97,8 +86,11 @@ gboolean cmenu_cb_loc_add_way(GtkAction * action);
 gboolean cmenu_cb_loc_add_poi(GtkAction * action);
 gboolean cmenu_cb_loc_set_gps(GtkAction * action);
 gboolean cmenu_cb_loc_set_home(GtkAction * action);
+gboolean cmenu_cb_loc_set_destination(GtkAction *action);
 
-gboolean cb_add_poi(GtkAction * action);
+gboolean cb_poi_add(GtkAction * action);
+gboolean cb_poi_search(GtkAction *action);
+gboolean menu_cb_search_address(GtkAction *action);
 
 /* Callbacks for the "Waypoint" context menu. */
 gboolean cmenu_cb_way_show_latlon(GtkAction * action);