Commit 6c84db71 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/app_procs.c app/gimprc.c app/module_db.c s/if(be_verbose ||

2000-08-15  Michael Natterer  <mitch@gimp.org>

	* app/app_procs.c
	* app/gimprc.c
	* app/module_db.c
	* app/plug_in.c: s/if(be_verbose || no_splash)/if(be_verbose)/g

	Changed because nobody on #gimp could explain why "no_splash"
	should imply "be_verbose".
parent 45e31efd
2000-08-15 Michael Natterer <mitch@gimp.org>
* app/app_procs.c
* app/gimprc.c
* app/module_db.c
* app/plug_in.c: s/if(be_verbose || no_splash)/if(be_verbose)/g
Changed because nobody on #gimp could explain why "no_splash"
should imply "be_verbose".
2000-08-15 Michael Natterer <mitch@gimp.org>
 
* plug-ins/print/*
......
......@@ -345,10 +345,13 @@ plug_in_init (void)
if (plug_in_def->query)
{
write_pluginrc = TRUE;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
}
app_init_update_status (NULL, plug_in_def->prog, nth / nplugins);
nth++;
}
......@@ -381,8 +384,9 @@ plug_in_init (void)
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
}
......@@ -395,10 +399,12 @@ plug_in_init (void)
plug_in_make_menu ();
/* run the available extensions */
tmp = proc_defs;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("Starting extensions: "));
app_init_update_status (_("Extensions"), "", 0);
tmp = proc_defs;
nplugins = g_slist_length (tmp); nth = 0;
while (tmp)
......@@ -410,15 +416,17 @@ plug_in_init (void)
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("%s ", proc_def->db_info.name);
app_init_update_status (NULL, proc_def->db_info.name,
nth / nplugins);
plug_in_run (&proc_def->db_info, NULL, 0, FALSE, TRUE, -1);
}
}
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
......
......@@ -485,7 +485,7 @@ app_init (void)
filename = gimp_gtkrc ();
if (be_verbose || no_splash)
if (be_verbose)
g_print (_("parsing \"%s\"\n"), filename);
gtk_rc_parse (filename);
......
......@@ -597,15 +597,16 @@ module_initialize (gchar *filename)
mod->load_inhibit = module_inhibited (mod->fullpath, module_db_load_inhibit);
if (!mod->load_inhibit)
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("load module: \"%s\"\n"), filename);
mod_load (mod, TRUE);
}
else
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("skipping module: \"%s\"\n"), filename);
mod->state = ST_UNLOADED_OK;
}
......
......@@ -448,7 +448,7 @@ parse_absolute_gimprc_file (char *filename)
if (!parse_info.fp)
return FALSE;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("parsing \"%s\"\n"), filename);
cur_token = -1;
......
......@@ -597,15 +597,16 @@ module_initialize (gchar *filename)
mod->load_inhibit = module_inhibited (mod->fullpath, module_db_load_inhibit);
if (!mod->load_inhibit)
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("load module: \"%s\"\n"), filename);
mod_load (mod, TRUE);
}
else
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("skipping module: \"%s\"\n"), filename);
mod->state = ST_UNLOADED_OK;
}
......
......@@ -345,10 +345,13 @@ plug_in_init (void)
if (plug_in_def->query)
{
write_pluginrc = TRUE;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
}
app_init_update_status (NULL, plug_in_def->prog, nth / nplugins);
nth++;
}
......@@ -381,8 +384,9 @@ plug_in_init (void)
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
}
......@@ -395,10 +399,12 @@ plug_in_init (void)
plug_in_make_menu ();
/* run the available extensions */
tmp = proc_defs;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("Starting extensions: "));
app_init_update_status (_("Extensions"), "", 0);
tmp = proc_defs;
nplugins = g_slist_length (tmp); nth = 0;
while (tmp)
......@@ -410,15 +416,17 @@ plug_in_init (void)
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("%s ", proc_def->db_info.name);
app_init_update_status (NULL, proc_def->db_info.name,
nth / nplugins);
plug_in_run (&proc_def->db_info, NULL, 0, FALSE, TRUE, -1);
}
}
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
......
......@@ -345,10 +345,13 @@ plug_in_init (void)
if (plug_in_def->query)
{
write_pluginrc = TRUE;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
}
app_init_update_status (NULL, plug_in_def->prog, nth / nplugins);
nth++;
}
......@@ -381,8 +384,9 @@ plug_in_init (void)
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
}
......@@ -395,10 +399,12 @@ plug_in_init (void)
plug_in_make_menu ();
/* run the available extensions */
tmp = proc_defs;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("Starting extensions: "));
app_init_update_status (_("Extensions"), "", 0);
tmp = proc_defs;
nplugins = g_slist_length (tmp); nth = 0;
while (tmp)
......@@ -410,15 +416,17 @@ plug_in_init (void)
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("%s ", proc_def->db_info.name);
app_init_update_status (NULL, proc_def->db_info.name,
nth / nplugins);
plug_in_run (&proc_def->db_info, NULL, 0, FALSE, TRUE, -1);
}
}
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
......
......@@ -345,10 +345,13 @@ plug_in_init (void)
if (plug_in_def->query)
{
write_pluginrc = TRUE;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
}
app_init_update_status (NULL, plug_in_def->prog, nth / nplugins);
nth++;
}
......@@ -381,8 +384,9 @@ plug_in_init (void)
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
}
......@@ -395,10 +399,12 @@ plug_in_init (void)
plug_in_make_menu ();
/* run the available extensions */
tmp = proc_defs;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("Starting extensions: "));
app_init_update_status (_("Extensions"), "", 0);
tmp = proc_defs;
nplugins = g_slist_length (tmp); nth = 0;
while (tmp)
......@@ -410,15 +416,17 @@ plug_in_init (void)
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("%s ", proc_def->db_info.name);
app_init_update_status (NULL, proc_def->db_info.name,
nth / nplugins);
plug_in_run (&proc_def->db_info, NULL, 0, FALSE, TRUE, -1);
}
}
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
......
......@@ -597,15 +597,16 @@ module_initialize (gchar *filename)
mod->load_inhibit = module_inhibited (mod->fullpath, module_db_load_inhibit);
if (!mod->load_inhibit)
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("load module: \"%s\"\n"), filename);
mod_load (mod, TRUE);
}
else
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("skipping module: \"%s\"\n"), filename);
mod->state = ST_UNLOADED_OK;
}
......
......@@ -345,10 +345,13 @@ plug_in_init (void)
if (plug_in_def->query)
{
write_pluginrc = TRUE;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
}
app_init_update_status (NULL, plug_in_def->prog, nth / nplugins);
nth++;
}
......@@ -381,8 +384,9 @@ plug_in_init (void)
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
}
......@@ -395,10 +399,12 @@ plug_in_init (void)
plug_in_make_menu ();
/* run the available extensions */
tmp = proc_defs;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("Starting extensions: "));
app_init_update_status (_("Extensions"), "", 0);
tmp = proc_defs;
nplugins = g_slist_length (tmp); nth = 0;
while (tmp)
......@@ -410,15 +416,17 @@ plug_in_init (void)
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("%s ", proc_def->db_info.name);
app_init_update_status (NULL, proc_def->db_info.name,
nth / nplugins);
plug_in_run (&proc_def->db_info, NULL, 0, FALSE, TRUE, -1);
}
}
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
......
......@@ -345,10 +345,13 @@ plug_in_init (void)
if (plug_in_def->query)
{
write_pluginrc = TRUE;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
}
app_init_update_status (NULL, plug_in_def->prog, nth / nplugins);
nth++;
}
......@@ -381,8 +384,9 @@ plug_in_init (void)
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
}
......@@ -395,10 +399,12 @@ plug_in_init (void)
plug_in_make_menu ();
/* run the available extensions */
tmp = proc_defs;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("Starting extensions: "));
app_init_update_status (_("Extensions"), "", 0);
tmp = proc_defs;
nplugins = g_slist_length (tmp); nth = 0;
while (tmp)
......@@ -410,15 +416,17 @@ plug_in_init (void)
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("%s ", proc_def->db_info.name);
app_init_update_status (NULL, proc_def->db_info.name,
nth / nplugins);
plug_in_run (&proc_def->db_info, NULL, 0, FALSE, TRUE, -1);
}
}
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
......
......@@ -345,10 +345,13 @@ plug_in_init (void)
if (plug_in_def->query)
{
write_pluginrc = TRUE;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
}
app_init_update_status (NULL, plug_in_def->prog, nth / nplugins);
nth++;
}
......@@ -381,8 +384,9 @@ plug_in_init (void)
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
}
......@@ -395,10 +399,12 @@ plug_in_init (void)
plug_in_make_menu ();
/* run the available extensions */
tmp = proc_defs;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("Starting extensions: "));
app_init_update_status (_("Extensions"), "", 0);
tmp = proc_defs;
nplugins = g_slist_length (tmp); nth = 0;
while (tmp)
......@@ -410,15 +416,17 @@ plug_in_init (void)
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("%s ", proc_def->db_info.name);
app_init_update_status (NULL, proc_def->db_info.name,
nth / nplugins);
plug_in_run (&proc_def->db_info, NULL, 0, FALSE, TRUE, -1);
}
}
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
......
......@@ -345,10 +345,13 @@ plug_in_init (void)
if (plug_in_def->query)
{
write_pluginrc = TRUE;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
}
app_init_update_status (NULL, plug_in_def->prog, nth / nplugins);
nth++;
}
......@@ -381,8 +384,9 @@ plug_in_init (void)
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
}
......@@ -395,10 +399,12 @@ plug_in_init (void)
plug_in_make_menu ();
/* run the available extensions */
tmp = proc_defs;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("Starting extensions: "));
app_init_update_status (_("Extensions"), "", 0);
tmp = proc_defs;
nplugins = g_slist_length (tmp); nth = 0;
while (tmp)
......@@ -410,15 +416,17 @@ plug_in_init (void)
(proc_def->db_info.num_args == 0) &&
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("%s ", proc_def->db_info.name);
app_init_update_status (NULL, proc_def->db_info.name,
nth / nplugins);
plug_in_run (&proc_def->db_info, NULL, 0, FALSE, TRUE, -1);
}
}
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print ("\n");
/* create help path list and free up stuff */
......
......@@ -345,10 +345,13 @@ plug_in_init (void)
if (plug_in_def->query)
{
write_pluginrc = TRUE;
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("query plug-in: \"%s\"\n"), plug_in_def->prog);
plug_in_query (plug_in_def);
}
app_init_update_status (NULL, plug_in_def->prog, nth / nplugins);
nth++;
}
......@@ -381,8 +384,9 @@ plug_in_init (void)
/* write the pluginrc file if necessary */
if (write_pluginrc)
{
if ((be_verbose == TRUE) || (no_splash == TRUE))
if (be_verbose)
g_print (_("writing \"%s\"\n"), filename);
plug_in_write_rc (filename);
}
......@@ -395,10 +399,12 @@ plug_in_init (void)
plug_in_make_menu ();