Remove all calls to g_type_init(), it's deprecated

The type system is initialized automatically now.
This commit is contained in:
Michael Natterer 2013-05-25 22:44:20 +02:00
parent e5b7df0748
commit 66ff5dd70b
13 changed files with 3 additions and 24 deletions

View File

@ -83,8 +83,6 @@ void
app_libs_init (GOptionContext *context,
gboolean no_interface)
{
g_type_init ();
g_option_context_add_group (context, gegl_get_option_group ());
#ifndef GIMP_CONSOLE_COMPILATION

View File

@ -69,8 +69,6 @@ main (int argc,
}
}
g_type_init ();
units_init ();
g_print ("\nTesting GimpConfig ...\n");

View File

@ -62,7 +62,6 @@ gimp_init_for_testing (void)
{
Gimp *gimp;
g_type_init();
gimp_log_init ();
gegl_init (NULL, NULL);
@ -91,7 +90,6 @@ gimp_init_for_gui_testing_internal (gboolean show_gui,
Gimp *gimp;
/* from main() */
g_type_init();
gimp_log_init ();
gegl_init (NULL, NULL);

View File

@ -264,7 +264,6 @@ main (int argc,
Gimp *gimp;
int result;
g_type_init ();
g_test_init (&argc, &argv, NULL);
gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_SRCDIR",

View File

@ -185,7 +185,7 @@ remove (GimpTestFixture *f,
void *ret_data = gimp_id_table_lookup (f->id_table, ret_id);
gboolean remove_successful = gimp_id_table_remove (f->id_table, ret_id);
void *ret_data2 = gimp_id_table_lookup (f->id_table, ret_id);
g_assert (remove_successful);
g_assert (ret_data == data1);
g_assert (ret_data2 == NULL);
@ -205,14 +205,13 @@ remove_non_existing (GimpTestFixture *f,
gboolean remove_successful = gimp_id_table_remove (f->id_table, id);
void *ret_data = gimp_id_table_lookup (f->id_table, id);
g_assert (! remove_successful);
g_assert (ret_data == NULL);
}
int main(int argc, char **argv)
{
g_type_init ();
g_test_init (&argc, &argv, NULL);
ADD_TEST (insert_and_lookup);

View File

@ -971,7 +971,6 @@ main (int argc,
Gimp *gimp;
int result;
g_type_init ();
g_test_init (&argc, &argv, NULL);
gimp_test_utils_set_gimp2_directory ("GIMP_TESTING_ABS_TOP_SRCDIR",

View File

@ -418,7 +418,6 @@ gimp_main (const GimpPlugInInfo *info,
gimp_wire_set_writer (gimp_write);
gimp_wire_set_flusher (gimp_flush);
g_type_init ();
gimp_enums_init ();
/* initialize units */

View File

@ -63,8 +63,6 @@ main (gint argc,
const gchar *folder;
GError *error = NULL;
g_type_init ();
context = g_option_context_new (NULL);
g_option_context_add_main_entries (context, main_entries, NULL);

View File

@ -186,9 +186,6 @@ run (const gchar *name,
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR;
/* MUST call this before any RSVG funcs */
g_type_init ();
if (strcmp (name, LOAD_PROC) == 0)
{
gimp_get_data (LOAD_PROC, &load_vals);

View File

@ -131,9 +131,6 @@ run (const gchar *name,
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
/* MUST call this before any RSVG funcs */
g_type_init ();
gimp_get_data (PLUG_IN_PROC, &save);
webpagevals.url = g_strdup (save.url);

View File

@ -100,8 +100,6 @@ main (gint argc,
return EXIT_FAILURE;
}
g_type_init ();
if (help_base)
uri = g_strdup (help_base);
else

View File

@ -375,7 +375,6 @@ run (const gchar *name,
values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR;
INIT_I18N();
g_type_init();
if (! strcmp (name, EDITOR_PROC))
image_ID = param[1].data.d_image;

View File

@ -173,7 +173,7 @@ main (int argc,
char *argv[])
{
g_set_prgname ("xmpdump");
g_type_init();
if (argc > 1)
{
for (argv++, argc--; argc; argv++, argc--)