Commit 5997c7dd authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

removed calls to the splash update function during initialization of

2005-11-05  Sven Neumann  <sven@gimp.org>

        * tools/pdbgen/app.pl: removed calls to the splash update function
        during initialization of internal procedures. This only takes time
        and doesn't provide useful information.

        * app/pdb/internal_procs.[ch]: regenerated.

        * app/pdb/procedural_db.[ch]: changed accordingly.

        * core/gimp.c: call the splash update function from here.
parent ce583142
2005-11-05 Sven Neumann <sven@gimp.org>
* tools/pdbgen/app.pl: removed calls to the splash update function
during initialization of internal procedures. This only takes time
and doesn't provide useful information.
* app/pdb/internal_procs.[ch]: regenerated.
* app/pdb/procedural_db.[ch]: changed accordingly.
* core/gimp.c: call the splash update function from here.
2005-11-05 DindinX <dindinx@gimp.org> 2005-11-05 DindinX <dindinx@gimp.org>
* libgimpwidgets/gimpscrolledpreview.c: don't return void in a * libgimpwidgets/gimpscrolledpreview.c: don't return void in a
......
...@@ -574,6 +574,8 @@ gimp_real_initialize (Gimp *gimp, ...@@ -574,6 +574,8 @@ gimp_real_initialize (Gimp *gimp,
if (gimp->be_verbose) if (gimp->be_verbose)
g_print ("INIT: gimp_real_initialize\n"); g_print ("INIT: gimp_real_initialize\n");
status_callback (_("Initialization"), NULL, 0.0);
gimp_fonts_init (gimp); gimp_fonts_init (gimp);
gimp->brush_factory = gimp->brush_factory =
...@@ -629,20 +631,22 @@ gimp_real_initialize (Gimp *gimp, ...@@ -629,20 +631,22 @@ gimp_real_initialize (Gimp *gimp,
gimp_gradients_init (gimp); gimp_gradients_init (gimp);
/* register all internal procedures */ /* register all internal procedures */
status_callback (_("Procedural Database"), NULL, 0.0); status_callback (NULL,_("Internal Procedures"), 0.2);
procedural_db_init_procs (gimp, status_callback); procedural_db_init_procs (gimp);
status_callback (_("Plug-In Interpreters"), "", 0.0); status_callback (NULL, _("Plug-In Interpreters"), 0.8);
path = gimp_config_path_expand (gimp->config->interpreter_path, TRUE, NULL); path = gimp_config_path_expand (gimp->config->interpreter_path, TRUE, NULL);
gimp_interpreter_db_load (gimp->interpreter_db, path); gimp_interpreter_db_load (gimp->interpreter_db, path);
g_free (path); g_free (path);
status_callback (_("Plug-In Environment"), "", 0.0); status_callback (NULL, _("Plug-In Environment"), 0.9);
path = gimp_config_path_expand (gimp->config->environ_path, TRUE, NULL); path = gimp_config_path_expand (gimp->config->environ_path, TRUE, NULL);
gimp_environ_table_load (gimp->environ_table, path); gimp_environ_table_load (gimp->environ_table, path);
g_free (path); g_free (path);
status_callback (NULL, "", 1.0);
} }
static void static void
......
...@@ -99,8 +99,7 @@ procedural_db_free (Gimp *gimp) ...@@ -99,8 +99,7 @@ procedural_db_free (Gimp *gimp)
} }
void void
procedural_db_init_procs (Gimp *gimp, procedural_db_init_procs (Gimp *gimp)
GimpInitStatusFunc status_callback)
{ {
static const struct static const struct
{ {
...@@ -174,9 +173,8 @@ procedural_db_init_procs (Gimp *gimp, ...@@ -174,9 +173,8 @@ procedural_db_init_procs (Gimp *gimp,
}; };
g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (status_callback != NULL);
internal_procs_init (gimp, status_callback); internal_procs_init (gimp);
if (gimp->pdb_compat_mode != GIMP_PDB_COMPAT_OFF) if (gimp->pdb_compat_mode != GIMP_PDB_COMPAT_OFF)
{ {
......
...@@ -125,44 +125,43 @@ struct _ProcRecord ...@@ -125,44 +125,43 @@ struct _ProcRecord
/* Functions */ /* Functions */
void procedural_db_init (Gimp *gimp); void procedural_db_init (Gimp *gimp);
void procedural_db_free (Gimp *gimp); void procedural_db_free (Gimp *gimp);
void procedural_db_init_procs (Gimp *gimp, void procedural_db_init_procs (Gimp *gimp);
GimpInitStatusFunc status_callback);
void procedural_db_register (Gimp *gimp,
void procedural_db_register (Gimp *gimp, ProcRecord *procedure);
ProcRecord *procedure); void procedural_db_unregister (Gimp *gimp,
void procedural_db_unregister (Gimp *gimp, const gchar *name);
const gchar *name); ProcRecord * procedural_db_lookup (Gimp *gimp,
ProcRecord * procedural_db_lookup (Gimp *gimp, const gchar *name);
const gchar *name);
Argument * procedural_db_execute (Gimp *gimp,
Argument * procedural_db_execute (Gimp *gimp, GimpContext *context,
GimpContext *context, GimpProgress *progress,
GimpProgress *progress, const gchar *name,
const gchar *name, Argument *args);
Argument *args); Argument * procedural_db_run_proc (Gimp *gimp,
Argument * procedural_db_run_proc (Gimp *gimp, GimpContext *context,
GimpContext *context, GimpProgress *progress,
GimpProgress *progress, const gchar *name,
const gchar *name, gint *nreturn_vals,
gint *nreturn_vals,
...); ...);
Argument * procedural_db_return_args (ProcRecord *procedure, Argument * procedural_db_return_args (ProcRecord *procedure,
gboolean success); gboolean success);
void procedural_db_destroy_args (Argument *args, void procedural_db_destroy_args (Argument *args,
gint nargs); gint nargs);
void procedural_db_free_data (Gimp *gimp); void procedural_db_free_data (Gimp *gimp);
void procedural_db_set_data (Gimp *gimp, void procedural_db_set_data (Gimp *gimp,
const gchar *identifier, const gchar *identifier,
gint32 bytes, gint32 bytes,
const guint8 *data); const guint8 *data);
const guint8 * procedural_db_get_data (Gimp *gimp, const guint8 * procedural_db_get_data (Gimp *gimp,
const gchar *identifier, const gchar *identifier,
gint32 *bytes); gint32 *bytes);
#endif /* __PROCEDURAL_DB_H__ */ #endif /* __PROCEDURAL_DB_H__ */
...@@ -99,8 +99,7 @@ procedural_db_free (Gimp *gimp) ...@@ -99,8 +99,7 @@ procedural_db_free (Gimp *gimp)
} }
void void
procedural_db_init_procs (Gimp *gimp, procedural_db_init_procs (Gimp *gimp)
GimpInitStatusFunc status_callback)
{ {
static const struct static const struct
{ {
...@@ -174,9 +173,8 @@ procedural_db_init_procs (Gimp *gimp, ...@@ -174,9 +173,8 @@ procedural_db_init_procs (Gimp *gimp,
}; };
g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (status_callback != NULL);
internal_procs_init (gimp, status_callback); internal_procs_init (gimp);
if (gimp->pdb_compat_mode != GIMP_PDB_COMPAT_OFF) if (gimp->pdb_compat_mode != GIMP_PDB_COMPAT_OFF)
{ {
......
...@@ -125,44 +125,43 @@ struct _ProcRecord ...@@ -125,44 +125,43 @@ struct _ProcRecord
/* Functions */ /* Functions */
void procedural_db_init (Gimp *gimp); void procedural_db_init (Gimp *gimp);
void procedural_db_free (Gimp *gimp); void procedural_db_free (Gimp *gimp);
void procedural_db_init_procs (Gimp *gimp, void procedural_db_init_procs (Gimp *gimp);
GimpInitStatusFunc status_callback);
void procedural_db_register (Gimp *gimp,
void procedural_db_register (Gimp *gimp, ProcRecord *procedure);
ProcRecord *procedure); void procedural_db_unregister (Gimp *gimp,
void procedural_db_unregister (Gimp *gimp, const gchar *name);
const gchar *name); ProcRecord * procedural_db_lookup (Gimp *gimp,
ProcRecord * procedural_db_lookup (Gimp *gimp, const gchar *name);
const gchar *name);
Argument * procedural_db_execute (Gimp *gimp,
Argument * procedural_db_execute (Gimp *gimp, GimpContext *context,
GimpContext *context, GimpProgress *progress,
GimpProgress *progress, const gchar *name,
const gchar *name, Argument *args);
Argument *args); Argument * procedural_db_run_proc (Gimp *gimp,
Argument * procedural_db_run_proc (Gimp *gimp, GimpContext *context,
GimpContext *context, GimpProgress *progress,
GimpProgress *progress, const gchar *name,
const gchar *name, gint *nreturn_vals,
gint *nreturn_vals,
...); ...);
Argument * procedural_db_return_args (ProcRecord *procedure, Argument * procedural_db_return_args (ProcRecord *procedure,
gboolean success); gboolean success);
void procedural_db_destroy_args (Argument *args, void procedural_db_destroy_args (Argument *args,
gint nargs); gint nargs);
void procedural_db_free_data (Gimp *gimp); void procedural_db_free_data (Gimp *gimp);
void procedural_db_set_data (Gimp *gimp, void procedural_db_set_data (Gimp *gimp,
const gchar *identifier, const gchar *identifier,
gint32 bytes, gint32 bytes,
const guint8 *data); const guint8 *data);
const guint8 * procedural_db_get_data (Gimp *gimp, const guint8 * procedural_db_get_data (Gimp *gimp,
const gchar *identifier, const gchar *identifier,
gint32 *bytes); gint32 *bytes);
#endif /* __PROCEDURAL_DB_H__ */ #endif /* __PROCEDURAL_DB_H__ */
...@@ -99,8 +99,7 @@ procedural_db_free (Gimp *gimp) ...@@ -99,8 +99,7 @@ procedural_db_free (Gimp *gimp)
} }
void void
procedural_db_init_procs (Gimp *gimp, procedural_db_init_procs (Gimp *gimp)
GimpInitStatusFunc status_callback)
{ {
static const struct static const struct
{ {
...@@ -174,9 +173,8 @@ procedural_db_init_procs (Gimp *gimp, ...@@ -174,9 +173,8 @@ procedural_db_init_procs (Gimp *gimp,
}; };
g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (status_callback != NULL);
internal_procs_init (gimp, status_callback); internal_procs_init (gimp);
if (gimp->pdb_compat_mode != GIMP_PDB_COMPAT_OFF) if (gimp->pdb_compat_mode != GIMP_PDB_COMPAT_OFF)
{ {
......
...@@ -125,44 +125,43 @@ struct _ProcRecord ...@@ -125,44 +125,43 @@ struct _ProcRecord
/* Functions */ /* Functions */
void procedural_db_init (Gimp *gimp); void procedural_db_init (Gimp *gimp);
void procedural_db_free (Gimp *gimp); void procedural_db_free (Gimp *gimp);
void procedural_db_init_procs (Gimp *gimp, void procedural_db_init_procs (Gimp *gimp);
GimpInitStatusFunc status_callback);
void procedural_db_register (Gimp *gimp,
void procedural_db_register (Gimp *gimp, ProcRecord *procedure);
ProcRecord *procedure); void procedural_db_unregister (Gimp *gimp,
void procedural_db_unregister (Gimp *gimp, const gchar *name);
const gchar *name); ProcRecord * procedural_db_lookup (Gimp *gimp,
ProcRecord * procedural_db_lookup (Gimp *gimp, const gchar *name);
const gchar *name);
Argument * procedural_db_execute (Gimp *gimp,
Argument * procedural_db_execute (Gimp *gimp, GimpContext *context,
GimpContext *context, GimpProgress *progress,
GimpProgress *progress, const gchar *name,
const gchar *name, Argument *args);
Argument *args); Argument * procedural_db_run_proc (Gimp *gimp,
Argument * procedural_db_run_proc (Gimp *gimp, GimpContext *context,
GimpContext *context, GimpProgress *progress,
GimpProgress *progress, const gchar *name,
const gchar *name, gint *nreturn_vals,
gint *nreturn_vals,
...); ...);
Argument * procedural_db_return_args (ProcRecord *procedure, Argument * procedural_db_return_args (ProcRecord *procedure,
gboolean success); gboolean success);
void procedural_db_destroy_args (Argument *args, void procedural_db_destroy_args (Argument *args,
gint nargs); gint nargs);
void procedural_db_free_data (Gimp *gimp); void procedural_db_free_data (Gimp *gimp);
void procedural_db_set_data (Gimp *gimp, void procedural_db_set_data (Gimp *gimp,
const gchar *identifier, const gchar *identifier,
gint32 bytes, gint32 bytes,
const guint8 *data); const guint8 *data);
const guint8 * procedural_db_get_data (Gimp *gimp, const guint8 * procedural_db_get_data (Gimp *gimp,
const gchar *identifier, const gchar *identifier,
gint32 *bytes); gint32 *bytes);
#endif /* __PROCEDURAL_DB_H__ */ #endif /* __PROCEDURAL_DB_H__ */
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include "core/gimp.h" #include "core/gimp.h"
#include "gimp-intl.h"
/* Forward declarations for registering PDB procs */ /* Forward declarations for registering PDB procs */
void register_brush_procs (Gimp *gimp); void register_brush_procs (Gimp *gimp);
...@@ -80,148 +78,100 @@ void register_vectors_procs (Gimp *gimp); ...@@ -80,148 +78,100 @@ void register_vectors_procs (Gimp *gimp);
/* 493 procedures registered total */ /* 493 procedures registered total */
void void
internal_procs_init (Gimp *gimp, internal_procs_init (Gimp *gimp)
GimpInitStatusFunc status_callback)
{ {
g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (status_callback != NULL);
status_callback (_("Internal Procedures"), _("Brush"), 0.0);
register_brush_procs (gimp); register_brush_procs (gimp);
status_callback (NULL, _("Brush UI"), 0.045);
register_brush_select_procs (gimp); register_brush_select_procs (gimp);
status_callback (NULL, _("Brushes"), 0.051);
register_brushes_procs (gimp); register_brushes_procs (gimp);
status_callback (NULL, _("Buffer procedures"), 0.063);
register_buffer_procs (gimp); register_buffer_procs (gimp);
status_callback (NULL, _("Channel"), 0.077);
register_channel_procs (gimp); register_channel_procs (gimp);
status_callback (NULL, _("Color"), 0.097);
register_color_procs (gimp); register_color_procs (gimp);
status_callback (NULL, _("Context"), 0.13);
register_context_procs (gimp); register_context_procs (gimp);
status_callback (NULL, _("Convert"), 0.174);
register_convert_procs (gimp); register_convert_procs (gimp);
status_callback (NULL, _("Display procedures"), 0.181);
register_display_procs (gimp); register_display_procs (gimp);
status_callback (NULL, _("Drawable procedures"), 0.191);
register_drawable_procs (gimp); register_drawable_procs (gimp);
status_callback (NULL, _("Transformation procedures"), 0.262);
register_drawable_transform_procs (gimp); register_drawable_transform_procs (gimp);
status_callback (NULL, _("Edit procedures"), 0.294);
register_edit_procs (gimp); register_edit_procs (gimp);
status_callback (NULL, _("File Operations"), 0.325);
register_fileops_procs (gimp); register_fileops_procs (gimp);
status_callback (NULL, _("Floating selections"), 0.347);
register_floating_sel_procs (gimp); register_floating_sel_procs (gimp);
status_callback (NULL, _("Font UI"), 0.359);
register_font_select_procs (gimp); register_font_select_procs (gimp);
status_callback (NULL, _("Fonts"), 0.365);
register_fonts_procs (gimp); register_fonts_procs (gimp);
status_callback (NULL, _("Gimprc procedures"), 0.369);
register_gimprc_procs (gimp); register_gimprc_procs (gimp);
status_callback (NULL, _("Gradient"), 0.383);
register_gradient_procs (gimp); register_gradient_procs (gimp);
status_callback (NULL, _("Gradient UI"), 0.444);
register_gradient_select_procs (gimp); register_gradient_select_procs (gimp);
status_callback (NULL, _("Gradients"), 0.45);
register_gradients_procs (gimp); register_gradients_procs (gimp);
status_callback (NULL, _("Image grid procedures"), 0.46);
register_grid_procs (gimp); register_grid_procs (gimp);
status_callback (NULL, _("Guide procedures"), 0.481);
register_guides_procs (gimp); register_guides_procs (gimp);
status_callback (NULL, _("Help procedures"), 0.493);
register_help_procs (gimp); register_help_procs (gimp);
status_callback (NULL, _("Image"), 0.495);
register_image_procs (gimp); register_image_procs (gimp);
status_callback (NULL, _("Layer"), 0.623);
register_layer_procs (gimp); register_layer_procs (gimp);
status_callback (NULL, _("Message procedures"), 0.677);
register_message_procs (gimp); register_message_procs (gimp);
status_callback (NULL, _("Miscellaneous"), 0.684);
register_misc_procs (gimp); register_misc_procs (gimp);
status_callback (NULL, _("Paint Tool procedures"), 0.69);
register_paint_tools_procs (gimp); register_paint_tools_procs (gimp);
status_callback (NULL, _("Palette"), 0.72);
register_palette_procs (gimp); register_palette_procs (gimp);
status_callback (NULL, _("Palette UI"), 0.748);
register_palette_select_procs (gimp); register_palette_select_procs (gimp);
status_callback (NULL, _("Palettes"), 0.755);
register_palettes_procs (gimp); register_palettes_procs (gimp);
status_callback (NULL, _("Parasite procedures"), 0.763);
register_parasite_procs (gimp); register_parasite_procs (gimp);
status_callback (NULL, _("Paths"), 0.787);
register_paths_procs (gimp); register_paths_procs (gimp);
status_callback (NULL, _("Pattern"), 0.824);
register_pattern_procs (gimp); register_pattern_procs (gimp);
status_callback (NULL, _("Pattern UI"), 0.828);
register_pattern_select_procs (gimp); register_pattern_select_procs (gimp);
status_callback (NULL, _("Patterns"), 0.834);
register_patterns_procs (gimp); register_patterns_procs (gimp);
status_callback (NULL, _("Plug-in"), 0.842);
register_plug_in_procs (gimp); register_plug_in_procs (gimp);
status_callback (NULL, _("Procedural database"), 0.854);
register_procedural_db_procs (gimp); register_procedural_db_procs (gimp);
status_callback (NULL, _("Progress"), 0.872);
register_progress_procs (gimp); register_progress_procs (gimp);
status_callback (NULL, _("Image mask"), 0.888);
register_selection_procs (gimp);