[cairo-commit] roadster/include databasewindow.h, 1.1.1.1, 1.2 datasetwindow.h, 1.1.1.1, 1.2 db.h, 1.2, 1.3 geometryset.h, 1.1.1.1, 1.2 gotowindow.h, 1.1.1.1, 1.2 gpsclient.h, 1.1.1.1, 1.2 gui.h, 1.1.1.1, 1.2 import.h, 1.1.1.1, 1.2 importwindow.h, 1.1.1.1, 1.2 layers.h, 1.2, 1.3 locationset.h, 1.1.1.1, 1.2 mainwindow.h, 1.1.1.1, 1.2 map.h, 1.2, 1.3 scenemanager.h, 1.2, 1.3 searchwindow.h, 1.1.1.1, 1.2 util.h, 1.2, 1.3 welcomewindow.h, 1.1.1.1, 1.2

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/roadster/include
In directory gabe:/tmp/cvs-serv31527/include

Modified Files:
	databasewindow.h datasetwindow.h db.h geometryset.h 
	gotowindow.h gpsclient.h gui.h import.h importwindow.h 
	layers.h locationset.h mainwindow.h map.h scenemanager.h 
	searchwindow.h util.h welcomewindow.h 
Log Message:

        * configure.in:
        * include/databasewindow.h:
        * include/datasetwindow.h:
        * include/db.h:
        * include/geometryset.h:
        * include/gotowindow.h:
        * include/gpsclient.h:
        * include/gui.h:
        * include/import.h:
        * include/importwindow.h:
        * include/layers.h:
        * include/locationset.h:
        * include/mainwindow.h:
        * include/map.h:
        * include/scenemanager.h:
        * include/searchwindow.h:
        * include/util.h:
        * include/welcomewindow.h:
        * src/Makefile.am:
        * src/databasewindow.c: (databasewindow_connect),
        (databasewindow_on_connectbutton_clicked):
        * src/datasetwindow.c: (datasetwindow_show),
        (datasetwindow_confirm_delete):
        * src/db.c: (db_insert), (db_is_connected), (db_count_table_rows),
        (db_disconnect), (db_roadname_get_id):
        * src/geometryset.c:
        * src/gotowindow.c: (gotowindow_show), (gotowindow_hide),
        (util_string_to_double), (gotowindow_go):
        * src/gpsclient.c: (gpsclient_callback_update),
        (gpsclient_connect), (gpsclient_debug_print):
        * src/import.c: (import_progress_pulse):
        * src/import_tiger.c: (import_tiger_read_lat),
        (import_tiger_read_lon), (import_tiger_read_int),
        (import_tiger_read_address), (import_tiger_read_string),
        (import_tiger_read_layer_type), (debug_print_string),
        (import_tiger_copy_line), (import_tiger_parse_MET),
        (import_tiger_parse_table_1), (import_tiger_parse_table_2),
        (import_tiger_parse_table_7), (import_tiger_parse_table_8),
        (import_tiger_parse_table_i), (callback_save_rt1_chains),
        (tiger_util_add_RT1_points_to_array), (callback_save_rti_polygons):
        * src/importwindow.c: (importwindow_show),
        (importwindow_progress_pulse), (importwindow_begin):
        * src/locationset.c: (locationset_util_new_locationset),
        (locationset_clear_all_locations), (locationset_find_by_id):
        * src/mainwindow.c: (util_set_image_to_stock),
        (mainwindow_set_statusbar_position),
        (mainwindow_set_statusbar_zoomscale), (mainwindow_set_busy),
        (mainwindow_load_locationset_list), (mainwindow_show),
        (mainwindow_hide), (mainwindow_get_toolbar_visible),
        (mainwindow_get_statusbar_visible),
        (mainwindow_statusbar_update_zoomscale),
        (mainwindow_statusbar_update_position),
        (mainwindow_get_sidebox_visible), (mainwindow_get_window),
        (mainwindow_toggle_fullscreen), (on_searchbox_key_press_event),
        (on_searchbox_editing_done), (zoom_in_one), (zoom_out_one),
        (gui_set_tool), (on_preferencesmenuitem_activate),
        (on_gotodialoggobutton_activate),
        (mainwindow_begin_import_geography_data),
        (mainwindow_setup_selected_tool), (mainwindow_draw_map),
        (mainwindow_show_on_startup):
        * src/map.c: (map_pixels_to_degrees), (map_degrees_to_pixels),
        (map_get_distance_in_meters), (map_draw_line_label):
        * src/scenemanager.c: (scenemanager_init),
        (scenemanager_add_label_line), (scenemanager_add_label_polygon),
        (scenemanager_draw), (scenemanager_clear):
        * src/search.c:
        * src/search_location.c: (search_location_execute):
        * src/search_road.c: (search_road_on_words), (point_calc_distance),
        (pointstring_walk_percentage), (min4), (max4):
        * src/searchwindow.c: (fill_combobox_with_distance_unit_names),
        (searchwindow_get_selected_locationset),
        (searchwindow_clear_results), (searchwindow_go_to_selected_result):
        * src/util.c: (util_random_color):
        * src/welcomewindow.c: (welcomewindow_show), (welcomewindow_hide):
        Enable lots of warning flags when compiling with gcc. Fix things
        to silence all the warnings, (missing #include, missing void in
        prototype, missing prototypes, missing static, etc.).

        * src/search_road.c: Fix glib version check logic for checking for
        glib < 2.6.

        * src/importwindow.c: (importwindow_progress_pulse): Fix to call
        import_from_uri correctly with only one argument.


Index: databasewindow.h
===================================================================
RCS file: /cvs/cairo/roadster/include/databasewindow.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- databasewindow.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ databasewindow.h	22 Feb 2005 17:12:25 -0000	1.2
@@ -30,7 +30,14 @@
 #endif
 
 void databasewindow_init(GladeXML* pGladeXML);
-gboolean databasewindow_connect();
+gboolean databasewindow_connect(void);
+
+/* Funky, auto-lookup glade signal handlers.
+
+   XXX: Better would be to hook these up manually, remove these
+   declarations, and make the functions static.
+*/
+void databasewindow_on_connectbutton_clicked(void);
 
 #ifdef __cplusplus
 }

Index: datasetwindow.h
===================================================================
RCS file: /cvs/cairo/roadster/include/datasetwindow.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- datasetwindow.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ datasetwindow.h	22 Feb 2005 17:12:25 -0000	1.2
@@ -24,14 +24,23 @@
 #ifndef _DATASETWINDOW_H
 #define _DATASETWINDOW_H
 
+#include <glade/glade.h>
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
 void datasetwindow_init(GladeXML* pGladeXML);
-void datasetwindow_show();
+void datasetwindow_show(void);
+
+/* Funky, auto-lookup glade signal handlers.
 
+   XXX: Better would be to hook these up manually, remove these
+   declarations, and make the functions static.
+*/
+void datasetwindow_on_datasetdeletebutton_clicked(GtkWidget *widget, gpointer user_data);
+void datasetwindow_on_datasetimportbutton_clicked(GtkWidget *widget, gpointer user_data);
 
 #ifdef __cplusplus
 }

Index: db.h
===================================================================
RCS file: /cvs/cairo/roadster/include/db.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db.h	20 Feb 2005 14:58:46 -0000	1.2
+++ db.h	22 Feb 2005 17:12:25 -0000	1.3
@@ -43,20 +43,22 @@
 #include "map.h"
 #include "layers.h"
 
-void db_create_tables();
+void db_create_tables(void);
 
-void db_init();
-void db_deinit();
+void db_init(void);
+void db_deinit(void);
 
 // connect
 gboolean db_connect(const gchar* pzHost, const gchar* pzUserName, const gchar* pzPassword, const gchar* pzDatabase);
-const gchar* db_get_connection_info();
+const gchar* db_get_connection_info(void);
 
 // utility
-gboolean db_is_empty();
+gboolean db_is_empty(void);
 
 gboolean db_insert_road(gint nLayerType, gint nAddressLeftStart, gint nAddressLeftEnd, gint nAddressRightStart, gint nAddressRightEnd, GPtrArray* pPointsArray, gint* pReturnID);
 
+gboolean db_insert_roadname(gint nRoadID, const gchar* pszName, gint nSuffixID);
+
 //~ gboolean db_create_points_db(const gchar* name);
 
 //~ // insert
@@ -70,7 +72,7 @@
 gboolean db_query(const gchar* pszSQL, db_resultset_t** ppResultSet);
 db_row_t db_fetch_row(db_resultset_t* pResultSet);
 void db_free_result(db_resultset_t* pResultSet);
-gint db_get_last_insert_id();
+gint db_get_last_insert_id(void);
 
 gchar* db_make_escaped_string(const gchar* pszString);
 void db_free_escaped_string(gchar* pszString);

Index: geometryset.h
===================================================================
RCS file: /cvs/cairo/roadster/include/geometryset.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- geometryset.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ geometryset.h	22 Feb 2005 17:12:25 -0000	1.2
@@ -37,7 +37,7 @@
 
 #include "map.h"
 
-void geometryset_init();
+void geometryset_init(void);
 void geometryset_free(geometryset_t* pGeometrySet);
 void geometryset_clear(geometryset_t* pGeometrySet);
 

Index: gotowindow.h
===================================================================
RCS file: /cvs/cairo/roadster/include/gotowindow.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gotowindow.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ gotowindow.h	22 Feb 2005 17:12:25 -0000	1.2
@@ -20,7 +20,18 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+
+#include <glade/glade.h>
  
-void gotowindow_init(void* pGladeXML);
-void gotowindow_show();
-void gotowindow_hide();
+void gotowindow_init(GladeXML* pGladeXML);
+void gotowindow_show(void);
+void gotowindow_hide(void);
+
+/* Funky, auto-lookup glade signal handlers.
+
+   XXX: Better would be to hook these up manually, remove these
+   declarations, and make the functions static.
+*/
+void gotowindow_on_knownlocationtreeview_row_activated(GtkTreeView *treeview, GtkTreePath *arg1, GtkTreeViewColumn *arg2, gpointer user_data);
+void gotowindow_on_gobutton_clicked(GtkButton *button, gpointer user_data);
+

Index: gpsclient.h
===================================================================
RCS file: /cvs/cairo/roadster/include/gpsclient.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gpsclient.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ gpsclient.h	22 Feb 2005 17:12:25 -0000	1.2
@@ -63,8 +63,8 @@
 	gdouble m_fSpeedInMilesPerHour;
 } gpsdata_t;
 
-void gpsclient_init();
-gpsdata_t* gpsclient_getdata();
+void gpsclient_init(void);
+gpsdata_t* gpsclient_getdata(void);
 
 #ifdef __cplusplus
 }

Index: gui.h
===================================================================
RCS file: /cvs/cairo/roadster/include/gui.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gui.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ gui.h	22 Feb 2005 17:12:25 -0000	1.2
@@ -39,12 +39,12 @@
 //
 // prototypes
 //
-void gui_init();
-void gui_run();
-extern gboolean gui_redraw_map_if_needed();
+void gui_init(void);
+void gui_run(void);
+extern gboolean gui_redraw_map_if_needed(void);
 extern void gui_set_tool_label(gchar* pMessage);
-extern void gui_exit();
-extern GtkWidget* gui_get_top_window();
+extern void gui_exit(void);
+extern GtkWidget* gui_get_top_window(void);
 
 //~ void gui_show_goto_window();
 //~ void gui_hide_goto_window();
@@ -58,7 +58,7 @@
 //~ void gui_show_preferences_window();
 //~ void gui_hide_preferences_window();
 
-void cursor_init();
+void cursor_init(void);
 //~ void gui_statusbar_update_zoomscale();
 //~ void gui_statusbar_update_position();
 //~ void gui_statusbar_set_position(gchar* pMessage);

Index: import.h
===================================================================
RCS file: /cvs/cairo/roadster/include/import.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- import.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ import.h	22 Feb 2005 17:12:25 -0000	1.2
@@ -29,7 +29,7 @@
 {
 #endif
 
-gboolean import_from_uri(const gchar* pszURI, void (*func_progress_callback)());
+gboolean import_from_uri(const gchar* pszURI);
 
 #ifdef __cplusplus
 }

Index: importwindow.h
===================================================================
RCS file: /cvs/cairo/roadster/include/importwindow.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- importwindow.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ importwindow.h	22 Feb 2005 17:12:25 -0000	1.2
@@ -24,17 +24,19 @@
 #ifndef _IMPORTWINDOW_H
 #define _IMPORTWINDOW_H
 
+#include <glade/glade.h>
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-void importwindow_init(void* pGladeXML);
-void importwindow_show();
+void importwindow_init(GladeXML* pGladeXML);
+void importwindow_show(void);
 
 void importwindow_begin(GSList* pSelectedFileList);
 void importwindow_log_append(const gchar* pszText, ...);
-void importwindow_progress_pulse();
+void importwindow_progress_pulse(void);
 
 // void importwindow_progress_callback(gdouble fPercent, gpointer pData);
 	

Index: layers.h
===================================================================
RCS file: /cvs/cairo/roadster/include/layers.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- layers.h	22 Feb 2005 04:47:24 -0000	1.2
+++ layers.h	22 Feb 2005 17:12:25 -0000	1.3
@@ -106,8 +106,8 @@
 
 extern layer_t g_aLayers[NUM_LAYERS+1];
 
-void layers_init();
-void layers_clear();
+void layers_init(void);
+void layers_clear(void);
 
 #ifdef __cplusplus
 }

Index: locationset.h
===================================================================
RCS file: /cvs/cairo/roadster/include/locationset.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- locationset.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ locationset.h	22 Feb 2005 17:12:25 -0000	1.2
@@ -53,11 +53,11 @@
 	GPtrArray* m_pLocationsArray;
 } locationset_t;
 
-void locationset_init();
-void locationset_load_locationsets();
+void locationset_init(void);
+void locationset_load_locationsets(void);
 gboolean locationset_load_locations(maprect_t* pRect);
 gboolean locationset_add_location(gint nLocationSetID, mappoint_t* pPoint, gint* pReturnID);
-const GPtrArray* locationset_get_set_array();
+const GPtrArray* locationset_get_set_array(void);
 
 #ifdef __cplusplus
 }

Index: mainwindow.h
===================================================================
RCS file: /cvs/cairo/roadster/include/mainwindow.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- mainwindow.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ mainwindow.h	22 Feb 2005 17:12:25 -0000	1.2
@@ -24,43 +24,69 @@
 #ifndef _MAINWINDOW_H
 #define _MAINWINDOW_H
 
+#include <glade/glade.h>
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 	
-void mainwindow_init(void* pGladeXML);
-void mainwindow_draw_map();
+void mainwindow_init(GladeXML* pGladeXML);
+void mainwindow_draw_map(void);
 
-void mainwindow_show();
-void mainwindow_show_on_startup();
-void mainwindow_hide();
+void mainwindow_show(void);
+void mainwindow_show_on_startup(void);
+void mainwindow_hide(void);
 
 void mainwindow_set_sensitive(gboolean bSensitive);
 
-void mainwindow_toggle_fullscreen();
+void mainwindow_toggle_fullscreen(void);
 
 void mainwindow_set_toolbar_visible(gboolean);
-gboolean mainwindow_get_toolbar_visible();
+gboolean mainwindow_get_toolbar_visible(void);
 
 void mainwindow_set_statusbar_visible(gboolean);
-gboolean mainwindow_get_statusbar_visible();
+gboolean mainwindow_get_statusbar_visible(void);
 
 void mainwindow_set_sidebox_visible(gboolean);
-gboolean mainwindow_get_sidebox_visible();
+gboolean mainwindow_get_sidebox_visible(void);
 
-void mainwindow_statusbar_update_zoomscale();
-void mainwindow_statusbar_update_position();
+GtkWidget* mainwindow_get_window(void);
+
+void mainwindow_statusbar_update_zoomscale(void);
+void mainwindow_statusbar_update_position(void);
 
 void mainwindow_statusbar_progressbar_set_text(const gchar* pszText);
-void mainwindow_statusbar_progressbar_pulse();
-void mainwindow_statusbar_progressbar_clear();
+void mainwindow_statusbar_progressbar_pulse(void);
+void mainwindow_statusbar_progressbar_clear(void);
 
-void mainwindow_begin_import_geography_data();
+void mainwindow_begin_import_geography_data(void);
 
-void* mainwindow_set_busy();
+void* mainwindow_set_busy(void);
 void mainwindow_set_not_busy(void** pCursor);
 
+/* Funky, auto-lookup glade signal handlers.
+
+   XXX: Better would be to hook these up manually, remove these
+   declarations, and make the functions static.
+*/
+void on_import_maps_activate(GtkWidget *widget, gpointer user_data);
+void on_quitmenuitem_activate(GtkMenuItem *menuitem, gpointer user_data);
+gboolean on_application_delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data);
+void on_zoomscale_value_changed(GtkRange *range, gpointer user_data);
+void on_aboutmenuitem_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_toolbarmenuitem_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_statusbarmenuitem_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_sidebarmenuitem_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_zoomin_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_zoomout_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_fullscreenmenuitem_activate(GtkMenuItem *menuitem, gpointer user_data);
+void mainwindow_on_gotomenuitem_activate(GtkMenuItem     *menuitem, gpointer user_data);
+void on_importmenuitem_activate(GtkMenuItem *menuitem, gpointer user_data);
+void on_gotobutton_clicked(GtkToolButton *toolbutton,  gpointer user_data);
+void on_toolbutton_clicked(GtkToolButton *toolbutton, gpointer user_data);
+void mainwindow_on_addpointmenuitem_activate(GtkWidget *_unused, gpointer* __unused);
+void mainwindow_on_datasetmenuitem_activate(GtkWidget *pWidget, gpointer* p);
 
 #ifdef __cplusplus
 }

Index: map.h
===================================================================
RCS file: /cvs/cairo/roadster/include/map.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- map.h	20 Feb 2005 14:58:46 -0000	1.2
+++ map.h	22 Feb 2005 17:12:25 -0000	1.3
@@ -139,15 +139,15 @@
 
 #include "db.h"
 
-GtkWidget* map_create_canvas();
+GtkWidget* map_create_canvas(void);
 
 void map_set_zoomlevel(guint16 uZoomLevel);
-guint16 map_get_zoomlevel();
-guint32 map_get_zoomlevel_scale();
+guint16 map_get_zoomlevel(void);
+guint32 map_get_zoomlevel_scale(void);
 
 void map_set_redraw_needed(gboolean bNeeded);
-gboolean map_is_redraw_needed();
-guint32 map_get_scale();
+gboolean map_is_redraw_needed(void);
+guint32 map_get_scale(void);
 //void map_draw(void* pDBConnection, cairo_t * cr);
 
 void map_get_world_coordinates(float* pLongitude, float* pLatitude);
@@ -157,7 +157,7 @@
 void map_center_on_windowpoint(guint16 uX, guint16 uY);
 void map_set_window_dimensions(guint16 uWidth, guint16 uHeight);
 
-gboolean map_redraw_if_needed();
+gboolean map_redraw_if_needed(void);
 
 void map_set_view_dimensions(guint16 uWidth, guint16 uHeight);
 void map_windowpoint_to_mappoint(screenpoint_t* pScreenPoint, mappoint_t* pMapPoint);

Index: scenemanager.h
===================================================================
RCS file: /cvs/cairo/roadster/include/scenemanager.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scenemanager.h	22 Feb 2005 04:47:24 -0000	1.2
+++ scenemanager.h	22 Feb 2005 17:12:25 -0000	1.3
@@ -21,4 +21,4 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-void scenemanager_init();
+void scenemanager_init(void);

Index: searchwindow.h
===================================================================
RCS file: /cvs/cairo/roadster/include/searchwindow.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- searchwindow.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ searchwindow.h	22 Feb 2005 17:12:25 -0000	1.2
@@ -30,12 +30,25 @@
 #endif
 
 #include <glade/glade.h>
+#include "gpsclient.h"
 	
 void searchwindow_init(GladeXML* pGladeXML);
 
 void searchwindow_add_result(gint nRoadID, const gchar* pszText, mappoint_t* pPoint);
 
-void searchwindow_clear_results();
+void searchwindow_go_to_selected_result(void);
+
+void searchwindow_clear_results(void);
+
+/* Funky, auto-lookup glade signal handlers.
+
+   XXX: Better would be to hook these up manually, remove these
+   declarations, and make the functions static.
+*/
+void searchwindow_on_findbutton_clicked(GtkWidget *pWidget, gpointer* p);
+void searchwindow_on_searchtypecombo_changed(GtkWidget *pWidget, gpointer* p);
+void searchwindow_on_addressresultstreeview_row_activated(GtkWidget *pWidget, gpointer* p);
+void searchwindow_on_gobutton_clicked(GtkWidget *pWidget, gpointer* p);
 
 #ifdef __cplusplus
 }

Index: util.h
===================================================================
RCS file: /cvs/cairo/roadster/include/util.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- util.h	22 Feb 2005 04:47:24 -0000	1.2
+++ util.h	22 Feb 2005 17:12:25 -0000	1.3
@@ -24,6 +24,8 @@
 #ifndef _UTIL_H_
 #define _UTIL_H_
 
+#include <gtk/gtk.h>
+
 #define NUM_ELEMS(a) (sizeof(a) / sizeof(a[0]))
 
 void util_random_color(void* pColor);
@@ -44,4 +46,11 @@
 #define is_even(x)		(((x) & 1) == 0)
 #define is_odd(x)		(((x) & 1) == 1)
 
+/* Funky, auto-lookup glade signal handlers.
+
+   XXX: Better would be to hook these up manually, remove these
+   declarations, and make the functions static.
+*/
+void util_close_parent_window(GtkWidget* pWidget, gpointer data);
+
 #endif

Index: welcomewindow.h
===================================================================
RCS file: /cvs/cairo/roadster/include/welcomewindow.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- welcomewindow.h	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ welcomewindow.h	22 Feb 2005 17:12:25 -0000	1.2
@@ -30,7 +30,15 @@
 #endif
 
 void welcomewindow_init(GladeXML* pGladeXML);
-void welcomewindow_show();
+void welcomewindow_show(void);
+
+/* Funky, auto-lookup glade signal handlers.
+
+   XXX: Better would be to hook these up manually, remove these
+   declarations, and make the functions static.
+*/
+void welcomewindow_on_url_clicked(GtkWidget* pButton, gpointer data);
+void welcomewindow_on_okbutton_clicked(GtkWidget* pButton, gpointer data);
 
 #ifdef __cplusplus
 }