From 9b7196a0b7b23ce7b071d1c34e6c963ec7537294 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 7 May 2004 11:25:45 +0000 Subject: [PATCH] removed member "accelerator". It was never set and this is the 2004-05-07 Michael Natterer * app/plug-in/plug-in-proc.[ch]: removed member "accelerator". It was never set and this is the conceptually wrong place to store it anyway. * app/actions/file-dialog-actions.c * app/actions/plug-in-actions.c * app/plug-in/plug-in-message.c * app/xcf/xcf.c: changed accordingly. * tools/pdbgen/pdb/plug_in.pdb (plugins_query): always return NULL as accelerator. Cleaned up the function a bit and made it aware of proc_def->menu_label added below. * app/pdb/plug_in_cmds.c: regenerated. --- ChangeLog | 17 ++++++++++ app/actions/file-dialog-actions.c | 2 +- app/actions/plug-in-actions.c | 2 +- app/pdb/gimppluginprocedure.c | 1 - app/pdb/gimppluginprocedure.h | 1 - app/pdb/plug_in_cmds.c | 50 +++++++++++++++++++---------- app/plug-in/gimpplugin-message.c | 1 - app/plug-in/gimppluginprocedure.c | 1 - app/plug-in/gimppluginprocedure.h | 1 - app/plug-in/plug-in-message.c | 1 - app/plug-in/plug-in-proc-def.c | 1 - app/plug-in/plug-in-proc-def.h | 1 - app/plug-in/plug-in-proc.c | 1 - app/plug-in/plug-in-proc.h | 1 - app/xcf/xcf.c | 2 -- tools/pdbgen/pdb/plug_in.pdb | 52 ++++++++++++++++++++----------- 16 files changed, 86 insertions(+), 49 deletions(-) diff --git a/ChangeLog b/ChangeLog index b79c3b419c..9b24341391 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2004-05-07 Michael Natterer + + * app/plug-in/plug-in-proc.[ch]: removed member "accelerator". + It was never set and this is the conceptually wrong place to store + it anyway. + + * app/actions/file-dialog-actions.c + * app/actions/plug-in-actions.c + * app/plug-in/plug-in-message.c + * app/xcf/xcf.c: changed accordingly. + + * tools/pdbgen/pdb/plug_in.pdb (plugins_query): always return NULL + as accelerator. Cleaned up the function a bit and made it aware of + proc_def->menu_label added below. + + * app/pdb/plug_in_cmds.c: regenerated. + 2004-05-07 Michael Natterer Changed plug-in menu registration again to allow passing just the diff --git a/app/actions/file-dialog-actions.c b/app/actions/file-dialog-actions.c index 8a6c764649..5073925457 100644 --- a/app/actions/file-dialog-actions.c +++ b/app/actions/file-dialog-actions.c @@ -86,7 +86,7 @@ file_dialog_actions_setup (GimpActionGroup *group, entry.name = file_proc->db_info.name; entry.stock_id = stock_id; entry.label = label; - entry.accelerator = file_proc->accelerator; + entry.accelerator = NULL; entry.tooltip = NULL; entry.proc_def = file_proc; entry.help_id = help_id; diff --git a/app/actions/plug-in-actions.c b/app/actions/plug-in-actions.c index ddc5a20e97..4d9b69b75d 100644 --- a/app/actions/plug-in-actions.c +++ b/app/actions/plug-in-actions.c @@ -299,7 +299,7 @@ plug_in_actions_add_proc (GimpActionGroup *group, entry.name = proc_def->db_info.name; entry.stock_id = NULL; entry.label = label; - entry.accelerator = proc_def->accelerator; + entry.accelerator = NULL; entry.tooltip = NULL; entry.proc_def = proc_def; entry.help_id = help_id; diff --git a/app/pdb/gimppluginprocedure.c b/app/pdb/gimppluginprocedure.c index 3f3278fd29..1941886ffe 100644 --- a/app/pdb/gimppluginprocedure.c +++ b/app/pdb/gimppluginprocedure.c @@ -78,7 +78,6 @@ plug_in_proc_def_free (PlugInProcDef *proc_def) g_list_foreach (proc_def->menu_paths, (GFunc) g_free, NULL); g_list_free (proc_def->menu_paths); - g_free (proc_def->accelerator); g_free (proc_def->extensions); g_free (proc_def->prefixes); g_free (proc_def->magics); diff --git a/app/pdb/gimppluginprocedure.h b/app/pdb/gimppluginprocedure.h index c72b89e826..cb5894204f 100644 --- a/app/pdb/gimppluginprocedure.h +++ b/app/pdb/gimppluginprocedure.h @@ -29,7 +29,6 @@ struct _PlugInProcDef gchar *prog; gchar *menu_label; GList *menu_paths; - gchar *accelerator; gchar *extensions; gchar *prefixes; gchar *magics; diff --git a/app/pdb/plug_in_cmds.c b/app/pdb/plug_in_cmds.c index ef95bbdd10..776f0d9f5c 100644 --- a/app/pdb/plug_in_cmds.c +++ b/app/pdb/plug_in_cmds.c @@ -191,8 +191,7 @@ plugins_query_invoker (Gimp *gimp, gchar **types_strs; gint32 *time_ints; gchar **realname_strs; - PlugInProcDef *proc_def; - GSList *list = NULL; + GSList *list; gint i = 0; regex_t sregex; @@ -203,22 +202,31 @@ plugins_query_invoker (Gimp *gimp, else search_str = NULL; - /* count number of plugin entries, then allocate 4 arrays of correct size + /* count number of plugin entries, then allocate arrays of correct size * where we can store the strings. */ for (list = gimp->plug_in_proc_defs; list; list = g_slist_next (list)) { - proc_def = (PlugInProcDef *) list->data; + PlugInProcDef *proc_def = list->data; if (proc_def->prog && proc_def->menu_paths) { - gchar *name = strrchr (proc_def->menu_paths->data, '/'); + gchar *name; - if (name) - name = name + 1; + if (proc_def->menu_label) + { + name = proc_def->menu_label; + } else - name = proc_def->menu_paths->data; + { + name = strrchr (proc_def->menu_paths->data, '/'); + + if (name) + name = name + 1; + else + name = proc_def->menu_paths->data; + } if (search_str && match_strings (&sregex, name)) continue; @@ -236,27 +244,35 @@ plugins_query_invoker (Gimp *gimp, for (list = gimp->plug_in_proc_defs; list; list = g_slist_next (list)) { + PlugInProcDef *proc_def = list->data; + if (i > num_plugins) g_error ("Internal error counting plugins"); - proc_def = (PlugInProcDef *) list->data; - if (proc_def->prog && proc_def->menu_paths) { ProcRecord *pr = &proc_def->db_info; + gchar *name; - gchar *name = strrchr (proc_def->menu_paths->data, '/'); - - if (name) - name = name + 1; + if (proc_def->menu_label) + { + name = proc_def->menu_label; + } else - name = proc_def->menu_paths->data; + { + name = strrchr (proc_def->menu_paths->data, '/'); - if (search_str && match_strings (&sregex,name)) + if (name) + name = name + 1; + else + name = proc_def->menu_paths->data; + } + + if (search_str && match_strings (&sregex, name)) continue; menu_strs[i] = gimp_strip_uline (proc_def->menu_paths->data); - accel_strs[i] = g_strdup (proc_def->accelerator); + accel_strs[i] = NULL; prog_strs[i] = g_strdup (proc_def->prog); types_strs[i] = g_strdup (proc_def->image_types); realname_strs[i] = g_strdup (pr->name); diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index b67ca5a520..24b4698101 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -690,7 +690,6 @@ plug_in_handle_proc_install (PlugIn *plug_in, } proc_def->prog = g_strdup (prog); - proc_def->accelerator = NULL; proc_def->extensions = NULL; proc_def->prefixes = NULL; proc_def->magics = NULL; diff --git a/app/plug-in/gimppluginprocedure.c b/app/plug-in/gimppluginprocedure.c index 3f3278fd29..1941886ffe 100644 --- a/app/plug-in/gimppluginprocedure.c +++ b/app/plug-in/gimppluginprocedure.c @@ -78,7 +78,6 @@ plug_in_proc_def_free (PlugInProcDef *proc_def) g_list_foreach (proc_def->menu_paths, (GFunc) g_free, NULL); g_list_free (proc_def->menu_paths); - g_free (proc_def->accelerator); g_free (proc_def->extensions); g_free (proc_def->prefixes); g_free (proc_def->magics); diff --git a/app/plug-in/gimppluginprocedure.h b/app/plug-in/gimppluginprocedure.h index c72b89e826..cb5894204f 100644 --- a/app/plug-in/gimppluginprocedure.h +++ b/app/plug-in/gimppluginprocedure.h @@ -29,7 +29,6 @@ struct _PlugInProcDef gchar *prog; gchar *menu_label; GList *menu_paths; - gchar *accelerator; gchar *extensions; gchar *prefixes; gchar *magics; diff --git a/app/plug-in/plug-in-message.c b/app/plug-in/plug-in-message.c index b67ca5a520..24b4698101 100644 --- a/app/plug-in/plug-in-message.c +++ b/app/plug-in/plug-in-message.c @@ -690,7 +690,6 @@ plug_in_handle_proc_install (PlugIn *plug_in, } proc_def->prog = g_strdup (prog); - proc_def->accelerator = NULL; proc_def->extensions = NULL; proc_def->prefixes = NULL; proc_def->magics = NULL; diff --git a/app/plug-in/plug-in-proc-def.c b/app/plug-in/plug-in-proc-def.c index 3f3278fd29..1941886ffe 100644 --- a/app/plug-in/plug-in-proc-def.c +++ b/app/plug-in/plug-in-proc-def.c @@ -78,7 +78,6 @@ plug_in_proc_def_free (PlugInProcDef *proc_def) g_list_foreach (proc_def->menu_paths, (GFunc) g_free, NULL); g_list_free (proc_def->menu_paths); - g_free (proc_def->accelerator); g_free (proc_def->extensions); g_free (proc_def->prefixes); g_free (proc_def->magics); diff --git a/app/plug-in/plug-in-proc-def.h b/app/plug-in/plug-in-proc-def.h index c72b89e826..cb5894204f 100644 --- a/app/plug-in/plug-in-proc-def.h +++ b/app/plug-in/plug-in-proc-def.h @@ -29,7 +29,6 @@ struct _PlugInProcDef gchar *prog; gchar *menu_label; GList *menu_paths; - gchar *accelerator; gchar *extensions; gchar *prefixes; gchar *magics; diff --git a/app/plug-in/plug-in-proc.c b/app/plug-in/plug-in-proc.c index 3f3278fd29..1941886ffe 100644 --- a/app/plug-in/plug-in-proc.c +++ b/app/plug-in/plug-in-proc.c @@ -78,7 +78,6 @@ plug_in_proc_def_free (PlugInProcDef *proc_def) g_list_foreach (proc_def->menu_paths, (GFunc) g_free, NULL); g_list_free (proc_def->menu_paths); - g_free (proc_def->accelerator); g_free (proc_def->extensions); g_free (proc_def->prefixes); g_free (proc_def->magics); diff --git a/app/plug-in/plug-in-proc.h b/app/plug-in/plug-in-proc.h index c72b89e826..cb5894204f 100644 --- a/app/plug-in/plug-in-proc.h +++ b/app/plug-in/plug-in-proc.h @@ -29,7 +29,6 @@ struct _PlugInProcDef gchar *prog; gchar *menu_label; GList *menu_paths; - gchar *accelerator; gchar *extensions; gchar *prefixes; gchar *magics; diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c index 55593233a7..096b64d757 100644 --- a/app/xcf/xcf.c +++ b/app/xcf/xcf.c @@ -83,7 +83,6 @@ static PlugInProcDef xcf_plug_in_load_proc = "gimp_xcf_load", "XCF (GIMP)", NULL, - NULL, "xcf", "", "0,string,gimp\\040xcf\\040", @@ -133,7 +132,6 @@ static PlugInProcDef xcf_plug_in_save_proc = "gimp_xcf_save", "XCF (GIMP)", NULL, - NULL, "xcf", "", NULL, diff --git a/tools/pdbgen/pdb/plug_in.pdb b/tools/pdbgen/pdb/plug_in.pdb index 4c8e47e2b0..c875237bd1 100644 --- a/tools/pdbgen/pdb/plug_in.pdb +++ b/tools/pdbgen/pdb/plug_in.pdb @@ -130,8 +130,7 @@ sub plugins_query { %invoke = ( headers => [ qw("libgimpbase/gimpbase.h") ], - vars => [ 'PlugInProcDef *proc_def', 'GSList *list = NULL', - 'gint i = 0', 'regex_t sregex' ], + vars => [ 'GSList *list', 'gint i = 0', 'regex_t sregex' ], code => <<'CODE' { if (search_str && strlen (search_str)) @@ -139,22 +138,31 @@ sub plugins_query { else search_str = NULL; - /* count number of plugin entries, then allocate 4 arrays of correct size + /* count number of plugin entries, then allocate arrays of correct size * where we can store the strings. */ for (list = gimp->plug_in_proc_defs; list; list = g_slist_next (list)) { - proc_def = (PlugInProcDef *) list->data; + PlugInProcDef *proc_def = list->data; if (proc_def->prog && proc_def->menu_paths) { - gchar *name = strrchr (proc_def->menu_paths->data, '/'); + gchar *name; - if (name) - name = name + 1; - else - name = proc_def->menu_paths->data; + if (proc_def->menu_label) + { + name = proc_def->menu_label; + } + else + { + name = strrchr (proc_def->menu_paths->data, '/'); + + if (name) + name = name + 1; + else + name = proc_def->menu_paths->data; + } if (search_str && match_strings (&sregex, name)) continue; @@ -172,27 +180,35 @@ sub plugins_query { for (list = gimp->plug_in_proc_defs; list; list = g_slist_next (list)) { + PlugInProcDef *proc_def = list->data; + if (i > num_plugins) g_error ("Internal error counting plugins"); - proc_def = (PlugInProcDef *) list->data; - if (proc_def->prog && proc_def->menu_paths) { ProcRecord *pr = &proc_def->db_info; + gchar *name; - gchar *name = strrchr (proc_def->menu_paths->data, '/'); + if (proc_def->menu_label) + { + name = proc_def->menu_label; + } + else + { + name = strrchr (proc_def->menu_paths->data, '/'); - if (name) - name = name + 1; - else - name = proc_def->menu_paths->data; + if (name) + name = name + 1; + else + name = proc_def->menu_paths->data; + } - if (search_str && match_strings (&sregex,name)) + if (search_str && match_strings (&sregex, name)) continue; menu_strs[i] = gimp_strip_uline (proc_def->menu_paths->data); - accel_strs[i] = g_strdup (proc_def->accelerator); + accel_strs[i] = NULL; prog_strs[i] = g_strdup (proc_def->prog); types_strs[i] = g_strdup (proc_def->image_types); realname_strs[i] = g_strdup (pr->name);