Move some variables around

[mapper] / src / cb.h

diff --git a/src/cb.h b/src/cb.h
index 126e33d48cb0e7b6a881e59fb74fd18fcc21c87e..00e7d3ad042a681656b271d9fe9840a96c806f2b 100644 (file)
--- a/src/cb.h
+++ b/src/cb.h
@@ -3,20 +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 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);
@@ -77,6 +69,9 @@ 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_help(GtkAction * action);
 gboolean menu_cb_about(GtkAction * action);
 
@@ -92,7 +87,9 @@ 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);