Tue Feb 22 09:12:29 PST 2005

Committed by: cworth

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

Modified Files:
	Makefile.am databasewindow.c datasetwindow.c db.c 
	geometryset.c gotowindow.c gpsclient.c import.c import_tiger.c 
	importwindow.c locationset.c mainwindow.c map.c scenemanager.c 
	search.c search_location.c search_road.c searchwindow.c util.c 
	welcomewindow.c 
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: Makefile.am
===================================================================
RCS file: /cvs/cairo/roadster/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3

--- Makefile.am	18 Feb 2005 21:42:28 -0000	1.2
+++ Makefile.am	22 Feb 2005 17:12:27 -0000	1.3
@@ -8,9 +8,7 @@
 	$(GNOME_CFLAGS)\
 	 -I/usr/include/mysql
 
-AM_CFLAGS =\
-	 -Wall\
-	 -g
+AM_CFLAGS = $(WARN_CFLAGS)
 
 bin_PROGRAMS = roadster
 

Index: databasewindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/databasewindow.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- databasewindow.c	18 Feb 2005 04:22:51 -0000	1.1.1.1
+++ databasewindow.c	22 Feb 2005 17:12:27 -0000	1.2
@@ -26,6 +26,7 @@
 
 #include "../include/db.h"
 #include "../include/gui.h"
+#include "../include/databasewindow.h"
 
 struct {
 	GtkDialog* m_pWindow;	
@@ -44,7 +45,7 @@
 	g_DatabaseWindow.m_pPasswordEntry = GTK_ENTRY(glade_xml_get_widget(pGladeXML, "databasewindowpasswordentry")); g_return_if_fail(g_DatabaseWindow.m_pPasswordEntry != NULL);	
 }
 
-gboolean databasewindow_connect()
+gboolean databasewindow_connect(void)
 {
 	while(TRUE) {
 		gint nResponse = gtk_dialog_run(g_DatabaseWindow.m_pWindow);
@@ -78,6 +79,6 @@
 	}
 }
 
-void databasewindow_on_connectbutton_clicked()
+void databasewindow_on_connectbutton_clicked(void)
 {
 }

Index: datasetwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/datasetwindow.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- datasetwindow.c	18 Feb 2005 04:22:51 -0000	1.1.1.1
+++ datasetwindow.c	22 Feb 2005 17:12:27 -0000	1.2
@@ -30,6 +30,7 @@
 #include <gnome.h>
 
 #include "../include/util.h"
+#include "../include/datasetwindow.h"
 #include "../include/mainwindow.h"
 
 #define DATASETLIST_COLUMN_ID			(0)
@@ -104,7 +105,7 @@
 	}
 }
 
-void datasetwindow_show()
+void datasetwindow_show(void)
 {
 	gtk_widget_show(GTK_WIDGET(g_DataSetWindow.m_pWindow));
 	gtk_window_present(g_DataSetWindow.m_pWindow);
@@ -116,7 +117,7 @@
 	gtk_widget_set_sensitive(GTK_WIDGET(g_DataSetWindow.m_pDeleteButton), gtk_tree_selection_count_selected_rows(treeselection) > 0);	
 }
 
-gboolean datasetwindow_confirm_delete(const gchar* pszName)
+static gboolean datasetwindow_confirm_delete(const gchar* pszName)
 {
 	/* Create confirmation dialog */
 	GtkWidget* pDialog = gtk_message_dialog_new(g_DataSetWindow.m_pWindow,

Index: db.c
===================================================================
RCS file: /cvs/cairo/roadster/src/db.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- db.c	20 Feb 2005 14:58:46 -0000	1.4
+++ db.c	22 Feb 2005 17:12:27 -0000	1.5
@@ -89,7 +89,7 @@
 	return TRUE;
 }
 
-gboolean db_insert(const gchar* pszSQL, gint* pnReturnRowsInserted)
+static gboolean db_insert(const gchar* pszSQL, gint* pnReturnRowsInserted)
 {
 	g_assert(pszSQL != NULL);
 	if(g_pDB == NULL) return FALSE;
@@ -129,7 +129,7 @@
 ** database utility functions
 ******************************************************/
 
-gboolean db_is_connected()
+static gboolean db_is_connected(void)
 {
 	// 'mysql_ping' will also attempt a re-connect if necessary
 	return (g_pDB != NULL && mysql_ping(g_pDB->m_pMySQLConnection) == MYSQL_RESULT_SUCCESS);
@@ -166,7 +166,7 @@
 	g_free(pszString);
 }
 
-guint db_count_table_rows(const gchar* pszTable)
+static guint db_count_table_rows(const gchar* pszTable)
 {
 	if(!db_is_connected()) return 0;
 
@@ -253,7 +253,8 @@
 	return TRUE;
 }
 
-void db_disconnect()
+#if 0
+static void db_disconnect(void)
 {
 	g_return_if_fail(g_pDB != NULL);
 
@@ -268,6 +269,7 @@
 	g_free(g_pDB);
 	g_pDB = NULL;
 }
+#endif
 
 /******************************************************
 ** data inserting
@@ -310,7 +312,7 @@
 	return TRUE;
 }
 
-gboolean db_roadname_get_id(const gchar* pszName, gint nSuffixID, gint* pnReturnID)
+static gboolean db_roadname_get_id(const gchar* pszName, gint nSuffixID, gint* pnReturnID)
 {
 	gint nReturnID = 0;
 

Index: geometryset.c
===================================================================
RCS file: /cvs/cairo/roadster/src/geometryset.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- geometryset.c	22 Feb 2005 04:47:24 -0000	1.3
+++ geometryset.c	22 Feb 2005 17:12:27 -0000	1.4
@@ -27,6 +27,7 @@
 
 #include <gtk/gtk.h>
 #include <string.h>
+#include <stdlib.h>
 #include "../include/geometryset.h"
 #include "../include/map.h"
 #include "../include/util.h"

Index: gotowindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/gotowindow.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gotowindow.c	18 Feb 2005 04:22:52 -0000	1.1.1.1
+++ gotowindow.c	22 Feb 2005 17:12:27 -0000	1.2
@@ -26,6 +26,7 @@
 #include "../include/util.h"
 #include "../include/map.h"
 #include "../include/mainwindow.h"
+#include "../include/gotowindow.h"
 
 #define LOCATIONLIST_COLUMN_NAME 		(0)
 #define LOCATIONLIST_COLUMN_LOCATION 	(1)
@@ -104,7 +105,7 @@
 	}
 }
 
-void gotowindow_show()
+void gotowindow_show(void)
 {
 	if(!GTK_WIDGET_VISIBLE(g_GotoWindow.m_pWindow)) {
 //		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g_GotoWindow.m_pKnownLocationRadioButton), TRUE);
@@ -118,12 +119,12 @@
 	gtk_window_present(g_GotoWindow.m_pWindow);
 }
 
-void gotowindow_hide()
+void gotowindow_hide(void)
 {
 	gtk_widget_hide(GTK_WIDGET(g_GotoWindow.m_pWindow));
 }
 
-gboolean util_string_to_double(const gchar* psz, gdouble* pReturn)
+static gboolean util_string_to_double(const gchar* psz, gdouble* pReturn)
 {
 	gdouble d = g_strtod(psz, NULL);
 	if(d == 0.0) {
@@ -141,7 +142,7 @@
 	return TRUE;
 }
 
-gboolean gotowindow_go()
+static gboolean gotowindow_go(void)
 {
 	const gchar* pszLatitude = gtk_entry_get_text(g_GotoWindow.m_pLatitudeEntry);
 	const gchar* pszLongitude = gtk_entry_get_text(g_GotoWindow.m_pLongitudeEntry);

Index: gpsclient.c
===================================================================
RCS file: /cvs/cairo/roadster/src/gpsclient.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- gpsclient.c	18 Feb 2005 04:22:56 -0000	1.1.1.1
+++ gpsclient.c	22 Feb 2005 17:12:27 -0000	1.2
@@ -33,13 +33,13 @@
 gboolean gpsclient_callback_data_waiting(GIOChannel *source, GIOCondition condition, gpointer data);
 //~ static void update_display(char *buf);
 
-void gpsclient_callback_update(char* p)
+static void gpsclient_callback_update(char* p)
 {
 //	g_print("gpsclient_callback_update(%s)\n", p);
 }
-void gpsclient_debug_print();
+void gpsclient_debug_print(void);
 
-void gpsclient_connect()
+static void gpsclient_connect(void)
 {
 	// don't do anything if already connected
 	if(g_GPSClient.m_pPublicGPSData->m_eStatus != GPS_STATUS_NO_GPSD) return;	// already connected
@@ -168,7 +168,7 @@
 	//~ g_print("********************* what the hell does this do?\n");	
 //~ }
 
-void gpsclient_debug_print()
+void gpsclient_debug_print(void)
 {
 	struct gps_data_t* d = g_GPSClient.m_pGPSConnection;	// gpsd data
 

Index: import.c
===================================================================
RCS file: /cvs/cairo/roadster/src/import.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- import.c	22 Feb 2005 04:47:24 -0000	1.3
+++ import.c	22 Feb 2005 17:12:27 -0000	1.4
@@ -23,17 +23,21 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <gtk/gtk.h>
+#include "../include/import.h"
 #include "../include/importwindow.h"
 #include "../include/import_tiger.h"
 #include "../include/db.h"
 
 #include <gnome-vfs-2.0/libgnomevfs/gnome-vfs.h>
 
-void import_progress_pulse()
+#if ROADSTER_DEAD_CODE
+static void import_progress_pulse(void)
 {
 	importwindow_progress_pulse();
 }
+#endif /* ROADSTER_DEAD_CODE */
 
 gboolean import_from_uri(const gchar* pszURI)
 {

Index: import_tiger.c
===================================================================
RCS file: /cvs/cairo/roadster/src/import_tiger.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- import_tiger.c	22 Feb 2005 04:47:24 -0000	1.4
+++ import_tiger.c	22 Feb 2005 17:12:27 -0000	1.5
@@ -124,7 +124,7 @@
 	GPtrArray* m_pRT1LinksArray;
 } tiger_record_rti_t;
 
-gboolean import_tiger_read_lat(gint8* pBuffer, gdouble* pValue)
+static gboolean import_tiger_read_lat(gint8* pBuffer, gdouble* pValue)
 {
 	// 0,1,2,3
 	// - 1 2 . 1 2 3 4 5 6
@@ -144,7 +144,7 @@
 	return TRUE;
 }
 
-gboolean import_tiger_read_lon(char* pBuffer, gdouble* pValue)
+static gboolean import_tiger_read_lon(char* pBuffer, gdouble* pValue)
 {
 	char buffer[12];
 	memcpy(&buffer[0], &pBuffer[0], 4);	// copy first 4 bytes (yes, this is different than lat, TIGER!!)
@@ -166,7 +166,7 @@
 }
 
 
-gboolean import_tiger_read_int(gint8* pBuffer, gint nLen, gint32* pValue)
+static gboolean import_tiger_read_int(gint8* pBuffer, gint nLen, gint32* pValue)
 {
 	gint8 buffer[11];
 	g_assert(nLen <= 10);
@@ -177,7 +177,7 @@
 	return TRUE;
 }
 
-gboolean import_tiger_read_address(gint8* pBuffer, gint nLen, gint32* pValue)
+static gboolean import_tiger_read_address(gint8* pBuffer, gint nLen, gint32* pValue)
 {
 	gint8 buffer[15];
 	g_assert(nLen <= 14);
@@ -188,7 +188,7 @@
 	return TRUE;
 }
 
-gboolean import_tiger_read_string(char* pBuffer, gint nLen, char* pValue)
+static gboolean import_tiger_read_string(char* pBuffer, gint nLen, char* pValue)
 {
 	g_assert(pBuffer != NULL);
 	g_assert(nLen > 0);
@@ -222,7 +222,7 @@
 	return TRUE;
 }
 
-gboolean import_tiger_read_layer_type(gint8* pBuffer, gint* pValue)
+static gboolean import_tiger_read_layer_type(gint8* pBuffer, gint* pValue)
 {
 	//g_print("%c%c%c\n", *(pBuffer), *(pBuffer+1), *(pBuffer+2));
 	gchar chFeatureClass 	= *(pBuffer+0);
@@ -391,7 +391,8 @@
 	return FALSE;
 }
 
-void debug_print_string(char* str, gint len)
+#if 0
+static void debug_print_string(char* str, gint len)
 {
 	char* p = str;
 	while(len > 0) {
@@ -402,8 +403,9 @@
 	}
 	g_print("\n");
 }
+#endif
 
-gchar* import_tiger_copy_line(const gchar* pszString)
+static gchar* import_tiger_copy_line(const gchar* pszString)
 {
 	char azBuffer[LINE_LENGTH_MAX];
 	const gchar* pszFrom = pszString;
@@ -418,7 +420,7 @@
 }
 
 // The MET file *is* zero terminated
-gboolean import_tiger_parse_MET(const gchar* pszMET, tiger_import_process_t* pImportProcess)
+static gboolean import_tiger_parse_MET(const gchar* pszMET, tiger_import_process_t* pImportProcess)
 {
 	gboolean bSuccess = FALSE;
 	const gchar* p = pszMET;
@@ -441,7 +443,7 @@
 
 
 // See TGR2003.PDF page 186 for field description
-gboolean import_tiger_parse_table_1(gchar* pBuffer, gint nLength, GHashTable* pTable, GPtrArray* pBoundaryRT1s)
+static gboolean import_tiger_parse_table_1(gchar* pBuffer, gint nLength, GHashTable* pTable, GPtrArray* pBoundaryRT1s)
 {
 	gint i;
 	for(i=0 ; i<(nLength-TIGER_RT1_LINE_LENGTH) ; i+=TIGER_RT1_LINE_LENGTH) {
@@ -503,7 +505,7 @@
 	return TRUE;
 }
 
-gboolean import_tiger_parse_table_2(gint8* pBuffer, gint nLength, GHashTable *pTable)
+static gboolean import_tiger_parse_table_2(gint8* pBuffer, gint nLength, GHashTable *pTable)
 {
 	gint i;
 	for(i=0 ; i<(nLength-TIGER_RT2_LINE_LENGTH) ; i+=TIGER_RT2_LINE_LENGTH) {
@@ -546,7 +548,7 @@
 	return TRUE;
 }
 
-gboolean import_tiger_parse_table_7(gint8* pBuffer, gint nLength, GHashTable *pTable)
+static gboolean import_tiger_parse_table_7(gint8* pBuffer, gint nLength, GHashTable *pTable)
 {
 	gint i;
 	for(i=0 ; i<(nLength-TIGER_RT7_LINE_LENGTH) ; i+=TIGER_RT7_LINE_LENGTH) {
@@ -580,7 +582,7 @@
 	return TRUE;
 }
 
-gboolean import_tiger_parse_table_8(gint8* pBuffer, gint nLength, GHashTable *pTable)
+static gboolean import_tiger_parse_table_8(gint8* pBuffer, gint nLength, GHashTable *pTable)
 {
 	gint i;
 	for(i=0 ; i<(nLength-TIGER_RT8_LINE_LENGTH) ; i+=TIGER_RT8_LINE_LENGTH) {
@@ -606,7 +608,7 @@
 }
 
 
-gboolean import_tiger_parse_table_i(gint8* pBuffer, gint nLength, GHashTable *pTable)
+static gboolean import_tiger_parse_table_i(gint8* pBuffer, gint nLength, GHashTable *pTable)
 {
 	//
 	// Gather RTi records (chainID,TZID-A,TZID-B) and index them by POLYGON ID in the given hash table
@@ -692,7 +694,7 @@
 //
 // Callbacks
 //
-void callback_save_rt1_chains(gpointer key, gpointer value, gpointer user_data)
+static void callback_save_rt1_chains(gpointer key, gpointer value, gpointer user_data)
 {
 	static int nCallCount=0; nCallCount++;
 	if((nCallCount%CALLBACKS_PER_PULSE) == 0) importwindow_progress_pulse();
@@ -737,7 +739,7 @@
 	ORDER_BACKWARD
 } EOrder;
 
-void tiger_util_add_RT1_points_to_array(tiger_import_process_t* pImportProcess, gint nTLID, GPtrArray* pPointsArray, EOrder eOrder)
+static void tiger_util_add_RT1_points_to_array(tiger_import_process_t* pImportProcess, gint nTLID, GPtrArray* pPointsArray, EOrder eOrder)
 {
 	g_assert(pImportProcess != NULL);
 	g_assert(pImportProcess->m_pTableRT1 != NULL);
@@ -773,7 +775,7 @@
 	}
 }
 
-void callback_save_rti_polygons(gpointer key, gpointer value, gpointer user_data)
+static void callback_save_rti_polygons(gpointer key, gpointer value, gpointer user_data)
 {
 	static int nCallCount=0; nCallCount++;
 	if((nCallCount%CALLBACKS_PER_PULSE) == 0) importwindow_progress_pulse();

Index: importwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/importwindow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- importwindow.c	19 Feb 2005 14:18:32 -0000	1.2
+++ importwindow.c	22 Feb 2005 17:12:27 -0000	1.3
@@ -26,6 +26,7 @@
 #include "../include/db.h"
 #include "../include/import.h"
 #include "../include/mainwindow.h"
+#include "../include/importwindow.h"
 
 //#define G_PROCESS_MAINLOOP  while(g_main_context_iteration(g_main_context_default(), FALSE)) { /* do nothing */ }
 // #define G_PROCESS_MAINLOOP  while(g_main_iteration(FALSE)) { /* do nothing */ }
@@ -52,7 +53,7 @@
 }
 
 
-void importwindow_show()
+void importwindow_show(void)
 {
 	gtk_widget_show(GTK_WIDGET(g_ImportWindow.m_pWindow));
 	gtk_window_present(g_ImportWindow.m_pWindow);
@@ -78,7 +79,7 @@
 	GTK_PROCESS_MAINLOOP;
 }
 
-void importwindow_progress_pulse()
+void importwindow_progress_pulse(void)
 {
 //	gtk_progress_bar_set_text(g_ImportWindow.m_pProgressBar, azBuffer);
 	
@@ -107,7 +108,7 @@
 	GSList* pFile = pSelectedFileList;
 	while(pFile != NULL) {
 		// do some work
-		if(import_from_uri((gchar*)pFile->data, importwindow_progress_pulse)) {
+		if(import_from_uri((gchar*)pFile->data)) {
 			nTotalSuccess++;
 		}
 

Index: locationset.c
===================================================================
RCS file: /cvs/cairo/roadster/src/locationset.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- locationset.c	22 Feb 2005 04:47:24 -0000	1.2
+++ locationset.c	22 Feb 2005 17:12:27 -0000	1.3
@@ -21,6 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <stdlib.h>
 #include <gtk/gtk.h>
 #include "../include/locationset.h"
 #include "../include/db.h"
@@ -78,7 +79,7 @@
 }
 
 // get a new locationset struct from the allocator
-locationset_t* locationset_util_new_locationset()
+static locationset_t* locationset_util_new_locationset(void)
 {
 	g_return_val_if_fail(g_LocationSet.m_pLocationSetChunkAllocator != NULL, NULL);
 
@@ -99,6 +100,7 @@
 }
 
 // return a locationset struct (and all locations) to the allocator
+#if 0
 static void locationset_util_free_locationset(locationset_t* pLocationSet)
 {
 	locationset_util_clear_locationset(pLocationSet);
@@ -106,8 +108,9 @@
 	// give back to allocator
 	g_mem_chunk_free(g_LocationSet.m_pLocationSetChunkAllocator, pLocationSet);
 }
+#endif
 
-void locationset_clear_all_locations()
+static void locationset_clear_all_locations(void)
 {
 	// delete all sets but don't delete array of sets
 	gint i;
@@ -222,7 +225,7 @@
 	return TRUE;
 }
 
-gboolean locationset_find_by_id(gint nLocationSetID, locationset_t** ppLocationSet)
+static gboolean locationset_find_by_id(gint nLocationSetID, locationset_t** ppLocationSet)
 {
 	locationset_t* pLocationSet = g_hash_table_lookup(g_LocationSet.m_pLocationSetHash, &nLocationSetID);
 	if(pLocationSet) {

Index: mainwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/mainwindow.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mainwindow.c	22 Feb 2005 04:47:24 -0000	1.3
+++ mainwindow.c	22 Feb 2005 17:12:27 -0000	1.4
@@ -21,8 +21,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <glade/glade.h>
-
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
@@ -41,6 +39,7 @@
 #include "../include/locationset.h"
 #include "../include/gpsclient.h"
 #include "../include/databasewindow.h"
+#include "../include/mainwindow.h"
 
 #include <gdk/gdkx.h>
 #include <cairo.h>
@@ -63,11 +62,11 @@
 gboolean mainwindow_on_mouse_button_click(GtkWidget* w, GdkEventButton *event);
 gboolean mainwindow_on_expose_event(GtkWidget *pDrawingArea, GdkEventExpose *event, gpointer data);
 gint mainwindow_on_configure_event(GtkWidget *pDrawingArea, GdkEventConfigure *event);
-void mainwindow_draw_map();
+void mainwindow_draw_map(void);
 
-void mainwindow_statusbar_update_zoomscale();
-void mainwindow_statusbar_update_position();
-void mainwindow_setup_selected_tool();
+void mainwindow_statusbar_update_zoomscale(void);
+void mainwindow_statusbar_update_position(void);
+void mainwindow_setup_selected_tool(void);
 
 gboolean mainwindow_callback_on_gps_redraw_timeout(gpointer pData);
 
@@ -144,24 +143,24 @@
 	}
 }
 
-void util_set_image_to_stock(GtkImage* pImage, gchar* pszStockIconID, GtkIconSize nSize)
+static void util_set_image_to_stock(GtkImage* pImage, gchar* pszStockIconID, GtkIconSize nSize)
 {
 	GdkPixbuf* pPixbuf = gtk_widget_render_icon(GTK_WIDGET(g_MainWindow.m_pStatusbarGPSIcon),pszStockIconID, nSize, "name");
 	gtk_image_set_from_pixbuf(pImage, pPixbuf);
 	gdk_pixbuf_unref(pPixbuf);
 }
 
-void mainwindow_set_statusbar_position(gchar* pMessage)
+static void mainwindow_set_statusbar_position(gchar* pMessage)
 {
 	gtk_label_set_text(GTK_LABEL(g_MainWindow.m_pPositionLabel), pMessage);
 }
 
-void mainwindow_set_statusbar_zoomscale(gchar* pMessage)
+static void mainwindow_set_statusbar_zoomscale(gchar* pMessage)
 {
 	gtk_label_set_text(GTK_LABEL(g_MainWindow.m_pZoomScaleLabel), pMessage);
 }
 
-void* mainwindow_set_busy()
+void* mainwindow_set_busy(void)
 {
 	GdkCursor* pCursor = gdk_cursor_new(GDK_WATCH);
 	// set it for the whole window
@@ -188,7 +187,7 @@
 ** Status bar
 */
 
-void mainwindow_load_locationset_list();
+void mainwindow_load_locationset_list(void);
 
 void mainwindow_init(GladeXML* pGladeXML)
 {
@@ -306,7 +305,7 @@
 	mainwindow_callback_on_gps_redraw_timeout(NULL);
 }
 
-void mainwindow_load_locationset_list()
+void mainwindow_load_locationset_list(void)
 {
 	const GPtrArray* pLocationSetArray = locationset_get_set_array();
 
@@ -331,13 +330,13 @@
 	}
 }
 
-void mainwindow_show()
+void mainwindow_show(void)
 {
 	gtk_widget_show(GTK_WIDGET(g_MainWindow.m_pWindow));
 	gtk_window_present(g_MainWindow.m_pWindow);
 }
 
-void mainwindow_hide()
+void mainwindow_hide(void)
 {
 	gtk_widget_hide(GTK_WIDGET(g_MainWindow.m_pWindow));
 }
@@ -360,7 +359,7 @@
 	}
 }
 
-gboolean mainwindow_get_toolbar_visible()
+gboolean mainwindow_get_toolbar_visible(void)
 {
 	return GTK_WIDGET_VISIBLE(g_MainWindow.m_pToolbar);
 }
@@ -378,12 +377,12 @@
 	}
 }
 
-gboolean mainwindow_get_statusbar_visible()
+gboolean mainwindow_get_statusbar_visible(void)
 {
 	return GTK_WIDGET_VISIBLE(g_MainWindow.m_pStatusbar);
 }
 
-void mainwindow_statusbar_update_zoomscale()
+void mainwindow_statusbar_update_zoomscale(void)
 {
 	char buf[200];
 	guint32 uZoomLevelScale = map_get_zoomlevel_scale();
@@ -392,7 +391,7 @@
 	mainwindow_set_statusbar_zoomscale(buf);
 }
 
-void mainwindow_statusbar_update_position()
+void mainwindow_statusbar_update_position(void)
 {
 	char buf[200];
 	float fLatitude, fLongitude;
@@ -414,13 +413,13 @@
 	}
 }
 
-gboolean mainwindow_get_sidebox_visible()
+gboolean mainwindow_get_sidebox_visible(void)
 {
 	return GTK_WIDGET_VISIBLE(g_MainWindow.m_pSidebox);
 }
 
 
-GtkWidget* mainwindow_get_window()
+GtkWidget* mainwindow_get_window(void)
 {
 	return GTK_WIDGET(g_MainWindow.m_pWindow);
 }
@@ -445,7 +444,7 @@
 	//~ gtk_progress_bar_set_fraction(g_MainWindow.m_pProgressBar, 0.0);
 //~ }
 
-void mainwindow_toggle_fullscreen()
+void mainwindow_toggle_fullscreen(void)
 {
     GdkWindow* toplevelgdk = gdk_window_get_toplevel(GTK_WIDGET(g_MainWindow.m_pWindow)->window);
 	if(toplevelgdk) {
@@ -469,7 +468,8 @@
 	//~ g_free(pchSearchString);
 //~ }
 
-gboolean on_searchbox_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+#if ROADSTER_DEAD_CODE
+static gboolean on_searchbox_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
 	// Enter key?
 	if(event->keyval == 65293) {
@@ -480,6 +480,7 @@
 	}
 	return FALSE;
 }
+#endif /* ROADSTER_DEAD_CODE */
 
 // User clicked Quit window
 void on_quitmenuitem_activate(GtkMenuItem *menuitem, gpointer user_data)
@@ -494,10 +495,12 @@
 	return FALSE; // satisfy strick compiler
 }
 
-void on_searchbox_editing_done(GtkCellEditable *celleditable, gpointer user_data)
+#if ROADSTER_DEAD_CODE
+static void on_searchbox_editing_done(GtkCellEditable *celleditable, gpointer user_data)
 {
 //	g_message("on_searchbox_editing_done()\n");
 }
+#endif /* ROADSTER_DEAD_CODE */
 
 // the range slider changed value
 void on_zoomscale_value_changed(GtkRange *range, gpointer user_data)
@@ -515,21 +518,21 @@
 //
 // Zoom
 //
-void zoom_in_one()
+static void zoom_in_one(void)
 {
 	map_set_zoomlevel( map_get_zoomlevel() + 1);
 
 	gtk_range_set_value(GTK_RANGE(g_MainWindow.m_pZoomScale), map_get_zoomlevel());
 }
 
-void zoom_out_one()
+static void zoom_out_one(void)
 {
 	map_set_zoomlevel( map_get_zoomlevel() - 1 );
 
 	gtk_range_set_value(GTK_RANGE(g_MainWindow.m_pZoomScale), map_get_zoomlevel());
 }
 
-void gui_set_tool(EToolType eTool)
+static void gui_set_tool(EToolType eTool)
 {
 	g_MainWindow.m_eSelectedTool = eTool;
 	gdk_window_set_cursor(GTK_WIDGET(g_MainWindow.m_pDrawingArea)->window, g_Tools[eTool].m_Cursor.m_pGdkCursor);
@@ -560,11 +563,13 @@
 	mainwindow_set_toolbar_visible( !mainwindow_get_toolbar_visible() );
 }
 
+#if ROADSTER_DEAD_CODE
 // Show preferences dialog
-void on_preferencesmenuitem_activate(GtkMenuItem *menuitem, gpointer user_data)
+static void on_preferencesmenuitem_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 //	gui_show_preferences_window();
 }
+#endif
 
 // Toggle statusbar visibility
 void on_statusbarmenuitem_activate(GtkMenuItem *menuitem, gpointer user_data)
@@ -610,10 +615,12 @@
 	gotowindow_show();
 }
 
-void on_gotodialoggobutton_activate(GtkButton *button, gpointer user_data)
+#if ROADSTER_DEAD_CODE
+static void on_gotodialoggobutton_activate(GtkButton *button, gpointer user_data)
 {
 	gotowindow_show();
 }
+#endif /* ROADSTER_DEAD_CODE */
 
 gboolean mainwindow_on_mouse_button_click(GtkWidget* w, GdkEventButton *event)
 {
@@ -652,7 +659,7 @@
 	return TRUE;
 }
 
-void mainwindow_begin_import_geography_data()
+void mainwindow_begin_import_geography_data(void)
 {
 	GtkWidget* pDialog = gtk_file_chooser_dialog_new(
 				"Select Map Data for Import",
@@ -691,7 +698,7 @@
 	mainwindow_begin_import_geography_data();
 }
 
-void mainwindow_setup_selected_tool()
+void mainwindow_setup_selected_tool(void)
 {
 	if(gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(g_MainWindow.m_pPointerToolButton))) {
 		gui_set_tool(kToolPointer);
@@ -708,7 +715,7 @@
 	mainwindow_setup_selected_tool();
 }
 
-void mainwindow_draw_map()
+void mainwindow_draw_map(void)
 {
 //	g_print("mainwindow_draw_map()\n");
 
@@ -791,7 +798,7 @@
 	datasetwindow_show();
 }
 
-void mainwindow_show_on_startup()
+void mainwindow_show_on_startup(void)
 {
 }
 

Index: map.c
===================================================================
RCS file: /cvs/cairo/roadster/src/map.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- map.c	22 Feb 2005 04:47:24 -0000	1.4
+++ map.c	22 Feb 2005 17:12:27 -0000	1.5
@@ -320,7 +320,7 @@
 }
 
 // convert pixels to a span of degrees
-double map_pixels_to_degrees(gint16 nPixels, guint16 uZoomLevel)
+static double map_pixels_to_degrees(gint16 nPixels, guint16 uZoomLevel)
 {
 	double fMonitorPixelsPerInch = 85 + 1/3;
 	double fPixelsPerMeter = fMonitorPixelsPerInch * INCHES_PER_METER;
@@ -333,7 +333,7 @@
 	return WORLD_METERS_TO_DEGREES(fMetersOfWorld);
 }
 
-double map_degrees_to_pixels(gdouble fDegrees, guint16 uZoomLevel)
+static double map_degrees_to_pixels(gdouble fDegrees, guint16 uZoomLevel)
 {
 	double fMonitorPixelsPerInch = 85 + 1/3;
 
@@ -402,8 +402,8 @@
 	g_Map.m_WindowDimensions.m_uHeight = uHeight;
 }
 
-
-double map_get_distance_in_meters(mappoint_t* pA, mappoint_t* pB)
+#if ROADSTER_DEAD_CODE
+static double map_get_distance_in_meters(mappoint_t* pA, mappoint_t* pB)
 {
 	g_assert_not_reached();	// unused/tested
 
@@ -428,6 +428,7 @@
 	// Step 2. Multiply the angle by the radius of the sphere to get arc length.
 	return fAOB_Rad * RADIUS_OF_WORLD_IN_METERS;
 }
+#endif /* ROADSTER_DEAD_CODE */
 
 // ========================================================
 //  Draw Functions
@@ -462,7 +463,7 @@
 }
 
 // EXPERIMENTAL TEXT RENDERING
-void map_draw_line_label(cairo_t *pCairo, textlabelstyle_t* pLabelStyle, rendermetrics_t* pRenderMetrics, pointstring_t* pPointString, gdouble fLineWidth, const gchar* pszLabel)
+static void map_draw_line_label(cairo_t *pCairo, textlabelstyle_t* pLabelStyle, rendermetrics_t* pRenderMetrics, pointstring_t* pPointString, gdouble fLineWidth, const gchar* pszLabel)
 {
 	if(pPointString->m_pPointsArray->len < 2) return;
 

Index: scenemanager.c
===================================================================
RCS file: /cvs/cairo/roadster/src/scenemanager.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scenemanager.c	22 Feb 2005 04:47:24 -0000	1.2
+++ scenemanager.c	22 Feb 2005 17:12:27 -0000	1.3
@@ -23,6 +23,7 @@
 
 #include <gtk/gtk.h>
 #include "../include/geometryset.h"
+#include "../include/scenemanager.h"
 
 /*
 Goals:
@@ -40,29 +41,31 @@
 	GHashTable* m_pLabelHash;
 } g_SceneManager;
 
-void scenemanager_init()
+void scenemanager_init(void)
 {
 	g_SceneManager.m_pLabelHash = g_hash_table_new(g_str_hash, g_str_equal);
 }
 
-void scenemanager_add_label_line(geometryset_t* pGeometry, gchar* pszLabel)
+#if ROADSTER_DEAD_CODE
+static void scenemanager_add_label_line(geometryset_t* pGeometry, gchar* pszLabel)
 {
 	
 }
 
-void scenemanager_add_label_polygon(geometryset_t* pGeometry, gchar* pszLabel)
+static void scenemanager_add_label_polygon(geometryset_t* pGeometry, gchar* pszLabel)
 {
 	
 }
 
-void scenemanager_draw()
+static void scenemanager_draw(void)
 {
 	
 }
 
-void scenemanager_clear()
+static void scenemanager_clear(void)
 {
 	g_hash_table_destroy(g_SceneManager.m_pLabelHash);
 
 	scenemanager_init();
 }
+#endif /* ROADSTER_DEAD_CODE */

Index: search.c
===================================================================
RCS file: /cvs/cairo/roadster/src/search.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- search.c	18 Feb 2005 04:22:52 -0000	1.1.1.1
+++ search.c	22 Feb 2005 17:12:27 -0000	1.2
@@ -22,6 +22,7 @@
  */
  
 #include <gtk/gtk.h>
+#include "../include/search.h"
 
 // functions common to all searches
 

Index: search_location.c
===================================================================
RCS file: /cvs/cairo/roadster/src/search_location.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- search_location.c	22 Feb 2005 04:47:24 -0000	1.2
+++ search_location.c	22 Feb 2005 17:12:27 -0000	1.3
@@ -21,10 +21,13 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <stdlib.h>
 #include <gtk/gtk.h>
 #include "../include/db.h"
 #include "../include/util.h"
 #include "../include/search.h"
+#include "../include/searchwindow.h"
+#include "../include/search_location.h"
 
 #define MAX_QUERY					(4000)
 #define SEARCH_RESULT_COUNT_LIMIT	(100)
@@ -48,7 +51,7 @@
 
 	TIMER_BEGIN(search, "\n\n****************************\nSEARCH BEGIN");
 
-	locationsearch_t locationsearch = {0};
+	locationsearch_t locationsearch = { {0}, 0};
 	locationsearch.m_nLocationSetID = nLocationSetID;
 	locationsearch.m_fRadiusInDegrees = map_distance_in_units_to_degrees(fDistance, nDistanceUnit);
 

Index: search_road.c
===================================================================
RCS file: /cvs/cairo/roadster/src/search_road.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- search_road.c	22 Feb 2005 04:47:24 -0000	1.4
+++ search_road.c	22 Feb 2005 17:12:27 -0000	1.5
@@ -30,6 +30,7 @@
 #include "../include/geometryset.h"
 #include "../include/searchwindow.h"
 #include "../include/search.h"
+#include "../include/search_road.h"
 
 typedef struct {
 	gint m_nNumber;			// house number	eg. 51
@@ -43,7 +44,7 @@
 #define MAX_QUERY 	(4000)
 
 // if glib < 2.6
-#if ((GLIB_MAJOR_VERSION <= 2) || ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION < 6)))
+#if ((GLIB_MAJOR_VERSION < 2) || ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION < 6)))
 gint g_strv_length(const gchar** a)
 {
 	gint nCount=0;
@@ -59,7 +60,7 @@
 // prototypes
 
 void search_road_on_cleaned_sentence(const gchar* pszCleanedSentence);
-void search_road_on_words(const gchar** aWords, gint nWordCount);
+void search_road_on_words(gchar** aWords, gint nWordCount);
 void search_road_on_roadsearch_struct(const roadsearch_t* pRoadSearch);
 void search_road_filter_result(const gchar* pszRoadName, gint nRoadNumber, gint nRoadSuffixID, gint nAddressLeftStart, gint nAddressLeftEnd, gint nAddressRightStart, gint nAddressRightEnd, pointstring_t* pPointString);
 
@@ -98,7 +99,7 @@
 	g_strfreev(aWords);	// free the array of strings	
 }
 
-void search_road_on_words(const gchar** aWords, gint nWordCount)
+void search_road_on_words(gchar** aWords, gint nWordCount)
 {
 	g_assert(nWordCount > 0);
 	roadsearch_t roadsearch = {0};
@@ -240,7 +241,7 @@
 }
 
 
-gfloat point_calc_distance(mappoint_t* pA, mappoint_t* pB)
+static gfloat point_calc_distance(mappoint_t* pA, mappoint_t* pB)
 {
 	// determine slope of the line
 	gdouble fRise = pB->m_fLatitude - pA->m_fLatitude;
@@ -257,7 +258,7 @@
 
 #define HIGHLIGHT_DISTANCE_FROM_ROAD (0.00012)		// this seems like a good amount...
 
-void pointstring_walk_percentage(pointstring_t* pPointString, gdouble fPercent, ERoadSide eRoadSide, mappoint_t* pReturnPoint)
+static void pointstring_walk_percentage(pointstring_t* pPointString, gdouble fPercent, ERoadSide eRoadSide, mappoint_t* pReturnPoint)
 {
 	gint i;
 	if(pPointString->m_pPointsArray->len < 2) {
@@ -324,19 +325,21 @@
 	g_assert_not_reached();
 }
 
-gint min4(gint a, gint b, gint c, gint d)
+#if ROADSTER_DEAD_CODE
+static gint min4(gint a, gint b, gint c, gint d)
 {
 	gint x = min(a,b);
 	gint y = min(c,d);
 	return min(x,y);
 }
 
-gint max4(gint a, gint b, gint c, gint d)
+static gint max4(gint a, gint b, gint c, gint d)
 {
 	gint x = max(a,b);
 	gint y = max(c,d);
 	return max(x,y);
 }
+#endif /* ROADSTER_DEAD_CODE */
 
 #define BUFFER_SIZE 200
 void search_road_filter_result(const gchar* pszRoadName, gint nRoadNumber, gint nRoadSuffixID, gint nAddressLeftStart, gint nAddressLeftEnd, gint nAddressRightStart, gint nAddressRightEnd, pointstring_t* pPointString)

Index: searchwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/searchwindow.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- searchwindow.c	22 Feb 2005 04:47:24 -0000	1.2
+++ searchwindow.c	22 Feb 2005 17:12:27 -0000	1.3
@@ -34,10 +34,11 @@
 
 #include "../include/search_road.h"
 #include "../include/search_location.h"
+#include "../include/searchwindow.h"
 #include "../include/locationset.h"
 #include "../include/mainwindow.h"
 
-void fill_combobox_with_distance_unit_names(GtkComboBox* pComboBox)
+static void fill_combobox_with_distance_unit_names(GtkComboBox* pComboBox)
 {
 	gint i;
 	for(i=UNIT_FIRST ; i<=UNIT_LAST ; i++) {
@@ -156,7 +157,7 @@
 	g_signal_connect(G_OBJECT(pTreeSelection), "changed", (GtkSignalFunc)searchwindow_on_resultslist_selection_changed, NULL);
 }
 
-gint searchwindow_get_selected_locationset()
+static gint searchwindow_get_selected_locationset(void)
 {
 	gint nID;
 	GtkTreeIter iter;
@@ -170,7 +171,7 @@
 	return 0;
 }
 
-void searchwindow_clear_results()
+void searchwindow_clear_results(void)
 {
 	// remove all search results from the list
 	if(g_SearchWindow.m_pResultsListStore != NULL) {
@@ -249,7 +250,7 @@
 	searchwindow_clear_results();
 }
 
-void searchwindow_go_to_selected_result()
+void searchwindow_go_to_selected_result(void)
 {
 	GtkTreeSelection* pSelection = gtk_tree_view_get_selection(
 		g_SearchWindow.m_pResultsTreeView);

Index: util.c
===================================================================
RCS file: /cvs/cairo/roadster/src/util.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- util.c	18 Feb 2005 04:22:51 -0000	1.1.1.1
+++ util.c	22 Feb 2005 17:12:27 -0000	1.2
@@ -20,8 +20,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
- 
-#include <gtk/gtk.h>
+
+#include <stdlib.h> 
+#include "../include/util.h"
 #include "../include/layers.h"		// for color_t -- move it elsewhere!
 
 void util_close_parent_window(GtkWidget* pWidget, gpointer data)
@@ -29,10 +30,12 @@
 	gtk_widget_hide(gtk_widget_get_toplevel(pWidget));
 }
 
-void util_random_color(color_t* pColor)
+#if ROADSTER_DEAD_CODE
+static void util_random_color(color_t* pColor)
 {
 	pColor->m_fRed = (random()%1000)/1000.0;
 	pColor->m_fGreen = (random()%1000)/1000.0;
 	pColor->m_fBlue = (random()%1000)/1000.0;
 	pColor->m_fAlpha = 1.0;
 }
+#endif /* ROADSTER_DEAD_CODE */

Index: welcomewindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/welcomewindow.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- welcomewindow.c	18 Feb 2005 04:22:52 -0000	1.1.1.1
+++ welcomewindow.c	22 Feb 2005 17:12:27 -0000	1.2
@@ -29,6 +29,7 @@
 
 #include <gnome.h>
 #include "../include/mainwindow.h"
+#include "../include/welcomewindow.h"
 
 #define URL_CENSUS_GOV_TIGER_DATA_WEBSITE ("http://www.census.gov/geo/www/tiger/tiger2003/tgr2003.html")
 
@@ -41,13 +42,13 @@
 	g_WelcomeWindow.m_pWindow = GTK_WINDOW(glade_xml_get_widget(pGladeXML, "welcomewindow"));			g_return_if_fail(g_WelcomeWindow.m_pWindow != NULL);
 }
 
-void welcomewindow_show()
+void welcomewindow_show(void)
 {
 	gtk_widget_show(GTK_WIDGET(g_WelcomeWindow.m_pWindow));
 	gtk_window_present(g_WelcomeWindow.m_pWindow);
 }
 
-void welcomewindow_hide()
+static void welcomewindow_hide(void)
 {
 	gtk_widget_hide(GTK_WIDGET(g_WelcomeWindow.m_pWindow));
 }


