Add some more goffice TYPE name conversions.

6 files changed, 89 insertions, 0 deletions

diff --git a/science/gchemutils/files/patch-goffice_gchemutils.cc b/science/gchemutils/files/patch-goffice_gchemutils.cc
new file mode 100644
index 000000000000..f067b79374ce
--- /dev/null
+++ b/science/gchemutils/files/patch-goffice_gchemutils.cc
@@ -0,0 +1,11 @@
+--- goffice/gchemutils.cc.orig	2009-05-03 13:54:25.000000000 -0400
++++ goffice/gchemutils.cc	2009-05-03 13:54:33.000000000 -0400
+@@ -135,7 +135,7 @@ go_gchemutils_component_class_init (GOCo
+ 
+ GSF_DYNAMIC_CLASS (GOGChemUtilsComponent, go_gchemutils_component,
+ 	go_gchemutils_component_class_init, go_gchemutils_component_init,
+-	GO_COMPONENT_TYPE)
++	GO_TYPE_COMPONENT)
+ 
+ /*************************************************************************************/
+ 
diff --git a/science/gchemutils/files/patch-mozilla-plugin_chem-viewer.cc b/science/gchemutils/files/patch-mozilla-plugin_chem-viewer.cc
new file mode 100644
index 000000000000..cc9659bb4ede
--- /dev/null
+++ b/science/gchemutils/files/patch-mozilla-plugin_chem-viewer.cc
@@ -0,0 +1,11 @@
+--- mozilla-plugin/chem-viewer.cc.orig	2009-05-03 13:53:24.000000000 -0400
++++ mozilla-plugin/chem-viewer.cc	2009-05-03 13:53:34.000000000 -0400
+@@ -299,7 +299,7 @@ int main (int argc, char *argv[])
+ 	}
+ #endif
+ 	libgoffice_init ();
+-	go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_PLUGIN_LOADER_MODULE_TYPE);
++	go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
+ 	in_channel = g_io_channel_unix_new (fileno (stdin));
+ 	g_io_add_watch (in_channel, G_IO_IN, io_func, &error);
+ 	gtk_main ();
diff --git a/science/gchemutils/files/patch-programs_calc_gchemcalc.cc b/science/gchemutils/files/patch-programs_calc_gchemcalc.cc
new file mode 100644
index 000000000000..9383fabbf27a
--- /dev/null
+++ b/science/gchemutils/files/patch-programs_calc_gchemcalc.cc
@@ -0,0 +1,11 @@
+--- programs/calc/gchemcalc.cc.orig	2009-05-03 13:55:23.000000000 -0400
++++ programs/calc/gchemcalc.cc	2009-05-03 13:55:34.000000000 -0400
+@@ -736,7 +736,7 @@ int main (int argc, char *argv[])
+ 	App = new GChemCalc ();
+ 	
+ 	/* Initialize plugins manager */
+-	go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_PLUGIN_LOADER_MODULE_TYPE);
++	go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
+ 
+ 	GladeXML *xml =  glade_xml_new (GLADEDIR"/gchemcalc.glade", "gchemcalc", NULL);
+ 	App->window = GTK_WINDOW (glade_xml_get_widget (xml, "gchemcalc"));
diff --git a/science/gchemutils/files/patch-programs_spectra_gspectrum.cc b/science/gchemutils/files/patch-programs_spectra_gspectrum.cc
new file mode 100644
index 000000000000..63ceb003d0b5
--- /dev/null
+++ b/science/gchemutils/files/patch-programs_spectra_gspectrum.cc
@@ -0,0 +1,11 @@
+--- programs/spectra/gspectrum.cc.orig	2009-05-03 13:58:03.000000000 -0400
++++ programs/spectra/gspectrum.cc	2009-05-03 13:58:10.000000000 -0400
+@@ -65,7 +65,7 @@ int main (int argc, char *argv[])
+ 	// create a new Application. This initialize Goffice
+ 	gsvApplication *App = new gsvApplication ();
+ 	// Initialize plugins manager
+-	go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_PLUGIN_LOADER_MODULE_TYPE);
++	go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
+ 	gsvDocument *pDoc = App->OnFileNew();
+ 	char *path, *uri;
+ 	bool bres = false;
diff --git a/science/gchemutils/files/patch-programs_table_gchemtable-data.cc b/science/gchemutils/files/patch-programs_table_gchemtable-data.cc
new file mode 100644
index 000000000000..79848459dd7e
--- /dev/null
+++ b/science/gchemutils/files/patch-programs_table_gchemtable-data.cc
@@ -0,0 +1,34 @@
+--- programs/table/gchemtable-data.cc.orig	2009-05-03 13:56:09.000000000 -0400
++++ programs/table/gchemtable-data.cc	2009-05-03 13:57:00.000000000 -0400
+@@ -114,11 +114,11 @@ gct_data_scalar_init (GObject *obj)
+ 
+ GSF_CLASS (GctDataScalar, gct_data_scalar,
+ 	   gct_data_scalar_class_init, gct_data_scalar_init,
+-	   GO_DATA_SCALAR_TYPE)
++	   GO_TYPE_DATA_SCALAR)
+ 
+ void gct_data_scalar_new (char const *name, void (*loader) (double *value))
+ {
+-	GctDataScalar *sc = GCT_DATA_SCALAR (g_object_new (GO_DATA_SCALAR_TYPE, NULL));
++	GctDataScalar *sc = GCT_DATA_SCALAR (g_object_new (GO_TYPE_DATA_SCALAR, NULL));
+ 	sc->loader = loader;
+ 	GctScalars[name] = GO_DATA (sc);
+ 
+@@ -242,7 +242,7 @@ gct_data_vector_init (GObject *obj)
+ 
+ GSF_CLASS (GctDataVector, gct_data_vector,
+ 	   gct_data_vector_class_init, gct_data_vector_init,
+-	   GO_DATA_VECTOR_TYPE)
++	   GO_TYPE_DATA_VECTOR)
+ 
+ void gct_data_vector_new (char const *name, void (*loader) (double **values, int *length))
+ {
+@@ -346,7 +346,7 @@ gct_data_matrix_init (GObject *obj)
+ 
+ GSF_CLASS (GctDataMatrix, gct_data_matrix,
+ 	   gct_data_matrix_class_init, gct_data_matrix_init,
+-	   GO_DATA_MATRIX_TYPE)
++	   GO_TYPE_DATA_MATRIX)
+ 
+ void gct_data_matrix_new (char const *name, void (*loader) (double **values, int *cols, int *rows))
+ {
diff --git a/science/gchemutils/files/patch-programs_table_gchemtable-main.cc b/science/gchemutils/files/patch-programs_table_gchemtable-main.cc
new file mode 100644
index 000000000000..63229c90d349
--- /dev/null
+++ b/science/gchemutils/files/patch-programs_table_gchemtable-main.cc
@@ -0,0 +1,11 @@
+--- programs/table/gchemtable-main.cc.orig	2009-05-03 13:57:28.000000000 -0400
++++ programs/table/gchemtable-main.cc	2009-05-03 13:57:35.000000000 -0400
+@@ -41,7 +41,7 @@ int main (int argc, char *argv[])
+ 	GSList *l = NULL;
+ 	l = g_slist_append (l, (void *) "GOffice_plot_xy");
+ 	l = g_slist_append (l, (void *) "GOffice_reg_linear");
+-	go_plugins_init (NULL, NULL, l, NULL, FALSE, GO_PLUGIN_LOADER_MODULE_TYPE);
++	go_plugins_init (NULL, NULL, l, NULL, FALSE, GO_TYPE_PLUGIN_LOADER_MODULE);
+ 	g_slist_free (l);
+ 
+ 	gtk_main();