[cairo-commit] roadster/src Makefile.am, 1.6, 1.7 main.c, 1.6, 1.7 mainwindow.c, 1.8, 1.9

[Nathan Fredrickson]

Committed by: nrf

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

Modified Files:
	Makefile.am main.c mainwindow.c 
Log Message:
2005-02-28  Nathan Fredrickson  <nathan at silverorange.com>
    * main.c: Make main_init() return a value.
    * mainwindow.c: Add missing prototype.
    * configure.ac: Add pkgconfig check for libsvg and libsvg-cairo.
    * src/Makefile.am: Remove the hacky inclusion of libsvg-cairo.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/roadster/src/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	28 Feb 2005 03:25:23 -0000	1.6
+++ Makefile.am	28 Feb 2005 06:31:04 -0000	1.7
@@ -49,6 +49,5 @@
 	$(CAIRO_LIBS) \
 	$(MYSQL_LIBS) \
 	$(GPSD_LIBS) \
-	-lsvg-cairo \
 	$(NULL)
 

Index: main.c
===================================================================
RCS file: /cvs/cairo/roadster/src/main.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- main.c	28 Feb 2005 03:25:23 -0000	1.6
+++ main.c	28 Feb 2005 06:31:04 -0000	1.7
@@ -39,24 +39,30 @@
 #include "pointstring.h"
 #include "track.h"
 
+static int main_init(void);
 static void main_deinit(void);
-static void main_init(void);
 
 int main (int argc, char *argv[])
 {
+	int ret;
+
 	#ifdef ENABLE_NLS
 		bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
 		textdomain(PACKAGE);
 	#endif
 	gnome_init(PACKAGE, VERSION, argc, argv);
 
-	main_init();
+	ret = main_init();
+
+	if (ret)
+		return ret;
+
 	gui_run();
 	main_deinit();	// usually doesn't get here
 	return 0;
 }
 
-void main_init(void)
+int main_init(void)
 {
 	if(!gnome_vfs_init()) {	
 		g_warning("gnome_vfs_init failed\n");
@@ -100,6 +106,8 @@
 	db_create_tables();
 
 	g_print("initialization complete\n");
+
+	return 0;
 }
 
 static void main_deinit(void)

Index: mainwindow.c
===================================================================
RCS file: /cvs/cairo/roadster/src/mainwindow.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mainwindow.c	28 Feb 2005 03:25:23 -0000	1.8
+++ mainwindow.c	28 Feb 2005 06:31:04 -0000	1.9
@@ -46,7 +46,7 @@
 #include <gdk/gdkx.h>
 #include <cairo.h>
 
-#ifdef HAVE_NEWER_CAIRO
+#ifdef HAVE_CAIRO_0_2_0
 #  include <cairo-xlib.h>
 #endif
 
@@ -87,6 +87,7 @@
 static gboolean mainwindow_on_expose_event(GtkWidget *pDrawingArea, GdkEventExpose *event, gpointer data);
 static gint mainwindow_on_configure_event(GtkWidget *pDrawingArea, GdkEventConfigure *event);
 static gboolean mainwindow_callback_on_gps_redraw_timeout(gpointer pData);
+static void mainwindow_setup_selected_tool(void);
 
 struct {
 	GtkWindow* m_pWindow;