From caac418cb2c3ad199348bc854e5ebfe01ad89c28 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 1 Nov 2004 15:44:57 +0000 Subject: [PATCH] don't check for file_proc->menu_paths. Our load and save procedure don't 2004-11-01 Sven Neumann * app/widgets/gimpfiledialog.c (gimp_file_dialog_add_filters): don't check for file_proc->menu_paths. Our load and save procedure don't necessarily register a menu path any longer. * app/plug-in/plug-ins.c: minor cleanup. * app/xcf/xcf.c (xcf_init): no need for adding menu paths for the XCF load and save procedures. * tools/pdbgen/pdb/fileops.pdb: fixed outdated documentation. * app/pdb/fileops_cmds.c * libgimp/gimpfileops_pdb.c: regenerated. --- ChangeLog | 16 ++++++++++++++++ app/pdb/fileops_cmds.c | 6 +++--- app/plug-in/gimppluginmanager.c | 8 ++------ app/plug-in/plug-ins.c | 8 ++------ app/widgets/gimpfiledialog.c | 2 +- app/xcf/xcf.c | 2 -- libgimp/gimpfileops_pdb.c | 10 +++------- tools/pdbgen/pdb/fileops.pdb | 9 +++------ 8 files changed, 30 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b283e3ffe..f1d389a3b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2004-11-01 Sven Neumann + + * app/widgets/gimpfiledialog.c (gimp_file_dialog_add_filters): + don't check for file_proc->menu_paths. Our load and save procedure + don't necessarily register a menu path any longer. + + * app/plug-in/plug-ins.c: minor cleanup. + + * app/xcf/xcf.c (xcf_init): no need for adding menu paths for the + XCF load and save procedures. + + * tools/pdbgen/pdb/fileops.pdb: fixed outdated documentation. + + * app/pdb/fileops_cmds.c + * libgimp/gimpfileops_pdb.c: regenerated. + 2004-11-01 Michael Natterer * tools/pdbgen/pdb/drawable_transform.pdb: added "clip_result" to diff --git a/app/pdb/fileops_cmds.c b/app/pdb/fileops_cmds.c index 75f827f108..a17cadf432 100644 --- a/app/pdb/fileops_cmds.c +++ b/app/pdb/fileops_cmds.c @@ -642,7 +642,7 @@ static ProcRecord register_magic_load_handler_proc = { "gimp_register_magic_load_handler", "Registers a file load handler procedure.", - "Registers a procedural database procedure to be called to load files of a particular file format using magic file information. The procedure you use must have a menu path associated with it.", + "Registers a procedural database procedure to be called to load files of a particular file format using magic file information.", "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", @@ -696,7 +696,7 @@ static ProcRecord register_load_handler_proc = { "gimp_register_load_handler", "Registers a file load handler procedure.", - "Registers a procedural database procedure to be called to load files of a particular file format. The procedure you use must have a menu path associated with it.", + "Registers a procedural database procedure to be called to load files of a particular file format.", "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", @@ -792,7 +792,7 @@ static ProcRecord register_save_handler_proc = { "gimp_register_save_handler", "Registers a file save handler procedure.", - "Registers a procedural database procedure to be called to save files in a particular file format. The procedure you use must have a menu path associated with it.", + "Registers a procedural database procedure to be called to save files in a particular file format.", "Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis", "1995-1996", diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index fc5d47e081..290d2c68bd 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -543,9 +543,7 @@ plug_ins_def_add_from_rc (Gimp *gimp, */ for (list = plug_in_def->proc_defs; list; list = list->next) { - PlugInProcDef *proc_def; - - proc_def = (PlugInProcDef *) list->data; + PlugInProcDef *proc_def = list->data; if (! proc_def->extensions && ! proc_def->prefixes && @@ -563,11 +561,9 @@ plug_ins_def_add_from_rc (Gimp *gimp, */ for (list = gimp->plug_in_defs; list; list = list->next) { - PlugInDef *ondisk_plug_in_def; + PlugInDef *ondisk_plug_in_def = list->data; gchar *basename2; - ondisk_plug_in_def = (PlugInDef *) list->data; - basename2 = g_path_get_basename (ondisk_plug_in_def->prog); if (! strcmp (basename1, basename2)) diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c index fc5d47e081..290d2c68bd 100644 --- a/app/plug-in/plug-ins.c +++ b/app/plug-in/plug-ins.c @@ -543,9 +543,7 @@ plug_ins_def_add_from_rc (Gimp *gimp, */ for (list = plug_in_def->proc_defs; list; list = list->next) { - PlugInProcDef *proc_def; - - proc_def = (PlugInProcDef *) list->data; + PlugInProcDef *proc_def = list->data; if (! proc_def->extensions && ! proc_def->prefixes && @@ -563,11 +561,9 @@ plug_ins_def_add_from_rc (Gimp *gimp, */ for (list = gimp->plug_in_defs; list; list = list->next) { - PlugInDef *ondisk_plug_in_def; + PlugInDef *ondisk_plug_in_def = list->data; gchar *basename2; - ondisk_plug_in_def = (PlugInDef *) list->data; - basename2 = g_path_get_basename (ondisk_plug_in_def->prog); if (! strcmp (basename1, basename2)) diff --git a/app/widgets/gimpfiledialog.c b/app/widgets/gimpfiledialog.c index 5eda890c3a..208bdf9f24 100644 --- a/app/widgets/gimpfiledialog.c +++ b/app/widgets/gimpfiledialog.c @@ -500,7 +500,7 @@ gimp_file_dialog_add_filters (GimpFileDialog *dialog, { PlugInProcDef *file_proc = list->data; - if (file_proc->menu_paths && file_proc->extensions_list) + if (file_proc->extensions_list) { const gchar *domain; GString *label; diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c index 246c2a48a3..21fd81a6e4 100644 --- a/app/xcf/xcf.c +++ b/app/xcf/xcf.c @@ -198,13 +198,11 @@ xcf_init (Gimp *gimp) * PlugInProcDef struct. -josh */ procedural_db_register (gimp, &xcf_plug_in_save_proc.db_info); - xcf_plug_in_save_proc.menu_paths = g_list_append (NULL, ""); xcf_plug_in_save_proc.image_types_val = plug_ins_image_types_parse (xcf_plug_in_save_proc.image_types); plug_ins_add_internal (gimp, &xcf_plug_in_save_proc); procedural_db_register (gimp, &xcf_plug_in_load_proc.db_info); - xcf_plug_in_load_proc.menu_paths = g_list_append (NULL, ""); xcf_plug_in_load_proc.image_types_val = plug_ins_image_types_parse (xcf_plug_in_load_proc.image_types); plug_ins_add_internal (gimp, &xcf_plug_in_load_proc); diff --git a/libgimp/gimpfileops_pdb.c b/libgimp/gimpfileops_pdb.c index a908201aa4..8ab61f8848 100644 --- a/libgimp/gimpfileops_pdb.c +++ b/libgimp/gimpfileops_pdb.c @@ -154,9 +154,7 @@ gimp_temp_name (const gchar *extension) * Registers a file load handler procedure. * * Registers a procedural database procedure to be called to load files - * of a particular file format using magic file information. The - * procedure you use must have a <Load> menu path associated with - * it. + * of a particular file format using magic file information. * * Returns: TRUE on success. */ @@ -194,8 +192,7 @@ gimp_register_magic_load_handler (const gchar *procedure_name, * Registers a file load handler procedure. * * Registers a procedural database procedure to be called to load files - * of a particular file format. The procedure you use must have a - * <Load> menu path associated with it. + * of a particular file format. * * Returns: TRUE on success. */ @@ -231,8 +228,7 @@ gimp_register_load_handler (const gchar *procedure_name, * Registers a file save handler procedure. * * Registers a procedural database procedure to be called to save files - * in a particular file format. The procedure you use must have a - * <Save> menu path associated with it. + * in a particular file format. * * Returns: TRUE on success. */ diff --git a/tools/pdbgen/pdb/fileops.pdb b/tools/pdbgen/pdb/fileops.pdb index 6b1880775e..7e0509c725 100644 --- a/tools/pdbgen/pdb/fileops.pdb +++ b/tools/pdbgen/pdb/fileops.pdb @@ -378,8 +378,7 @@ sub register_magic_load_handler { $help = <<'HELP'; Registers a procedural database procedure to be called to load files of a -particular file format using magic file information. The procedure you use -must have a menu path associated with it. +particular file format using magic file information. HELP &std_pdb_misc; @@ -433,8 +432,7 @@ sub register_load_handler { $help = <<'HELP'; Registers a procedural database procedure to be called to load files of a -particular file format. The procedure you use must have a menu path -associated with it. +particular file format. HELP &std_pdb_misc; @@ -453,8 +451,7 @@ sub register_save_handler { $help = <<'HELP'; Registers a procedural database procedure to be called to save files in a -particular file format. The procedure you use must have a menu path -associated with it. +particular file format. HELP &std_pdb_misc;