gnumeric r16943 - trunk/src

[mortenw svn gnome org]

Author: mortenw
Date: Sun Nov  2 15:30:27 2008
New Revision: 16943
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16943&view=rev

Log:
Clean up references to main-component.c which has been dead for years.
Remove bonobo refs from test-pango



Removed:
   trunk/src/main-component.c
Modified:
   trunk/src/Makefile.am
   trunk/src/test-pango.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Nov  2 15:30:27 2008
@@ -421,7 +421,6 @@
 # what the build
 EXTRA_DIST = \
 	gnm-marshalers.list			\
-	main-component.c			\
 	README.gnm_float			\
 	gnumeric.rc gnm-i18n.h			\
 	GNOME_Gnumeric-gtk.xml.in		\
@@ -448,19 +447,3 @@
 ##	$(GNOMEUI_LIBS)			\
 ##	$(GNOME_XML_LIB) 		\
 ##	$(INTLLIBS)
-
-## Bonobo requires things to be in a subdir of this form
-##bonobo_component_uidir=$(gnumeric_datadir)/gnome-2.0/ui
-##bonobo_component_ui_DATA = GNOME_Gnumeric.xml GNOME_Gnumeric_Component.xml
-##if ENABLE_BONOBO_COMPONENT
-##libexec_PROGRAMS = gnumeric-component
-##gnumeric_component_SOURCES =			\
-##	$(GNUMERIC_SOURCE)			\
-##	main-component.c
-##
-##gnumeric_component_LDADD = $(gnumeric_LDADD)
-##
-##gnumeric_component_LDFLAGS = -export-dynamic
-##
-##gnumeric_component_app_libs = $(gnumeric_app_libs)
-##endif

Modified: trunk/src/test-pango.c
==============================================================================
--- trunk/src/test-pango.c	(original)
+++ trunk/src/test-pango.c	Sun Nov  2 15:30:27 2008
@@ -22,10 +22,6 @@
 #include <goffice/app/io-context.h>
 
 #include <gtk/gtkmain.h>
-#ifdef GNM_WITH_GNOME
-#include <bonobo/bonobo-main.h>
-#include <bonobo/bonobo-ui-main.h>
-#endif
 
 #define TEST_STEPS	50
 #define STEP_SIZE	40
@@ -80,12 +76,6 @@
 
 	g_idle_add (cb_exercise_pango, wbc);
 
-#ifdef GNM_WITH_GNOME
-	bonobo_main ();
-#else
-	gtk_main ();
-#endif
-
 	gnm_shutdown ();
 	gnm_pre_parse_shutdown ();