diff --git a/app/pdb/gimppdb-query.c b/app/pdb/gimppdb-query.c index 00689faa9b..f22ba9f854 100644 --- a/app/pdb/gimppdb-query.c +++ b/app/pdb/gimppdb-query.c @@ -63,7 +63,7 @@ struct _PDBQuery GRegex *name_regex; GRegex *blurb_regex; GRegex *help_regex; - GRegex *author_regex; + GRegex *authors_regex; GRegex *copyright_regex; GRegex *date_regex; GRegex *proc_type_regex; @@ -81,7 +81,7 @@ struct _PDBStrings gchar *blurb; gchar *help; - gchar *author; + gchar *authors; gchar *copyright; gchar *date; }; @@ -162,7 +162,7 @@ gimp_pdb_query (GimpPDB *pdb, const gchar *name, const gchar *blurb, const gchar *help, - const gchar *author, + const gchar *authors, const gchar *copyright, const gchar *date, const gchar *proc_type, @@ -177,7 +177,7 @@ gimp_pdb_query (GimpPDB *pdb, g_return_val_if_fail (name != NULL, FALSE); g_return_val_if_fail (blurb != NULL, FALSE); g_return_val_if_fail (help != NULL, FALSE); - g_return_val_if_fail (author != NULL, FALSE); + g_return_val_if_fail (authors != NULL, FALSE); g_return_val_if_fail (copyright != NULL, FALSE); g_return_val_if_fail (date != NULL, FALSE); g_return_val_if_fail (proc_type != NULL, FALSE); @@ -200,8 +200,8 @@ gimp_pdb_query (GimpPDB *pdb, if (! pdb_query.help_regex) goto cleanup; - pdb_query.author_regex = g_regex_new (author, PDB_REGEX_FLAGS, 0, error); - if (! pdb_query.author_regex) + pdb_query.authors_regex = g_regex_new (authors, PDB_REGEX_FLAGS, 0, error); + if (! pdb_query.authors_regex) goto cleanup; pdb_query.copyright_regex = g_regex_new (copyright, PDB_REGEX_FLAGS, 0, error); @@ -242,8 +242,8 @@ gimp_pdb_query (GimpPDB *pdb, if (pdb_query.copyright_regex) g_regex_unref (pdb_query.copyright_regex); - if (pdb_query.author_regex) - g_regex_unref (pdb_query.author_regex); + if (pdb_query.authors_regex) + g_regex_unref (pdb_query.authors_regex); if (pdb_query.help_regex) g_regex_unref (pdb_query.help_regex); @@ -268,7 +268,7 @@ gimp_pdb_proc_info (GimpPDB *pdb, const gchar *proc_name, gchar **blurb, gchar **help, - gchar **author, + gchar **authors, gchar **copyright, gchar **date, GimpPDBProcType *proc_type, @@ -308,7 +308,7 @@ gimp_pdb_proc_info (GimpPDB *pdb, { *blurb = strings.compat ? strings.blurb : g_strdup (strings.blurb); *help = strings.compat ? strings.help : g_strdup (strings.help); - *author = strings.compat ? strings.author : g_strdup (strings.author); + *authors = strings.compat ? strings.authors : g_strdup (strings.authors); *copyright = strings.compat ? strings.copyright : g_strdup (strings.copyright); *date = strings.compat ? strings.date : g_strdup (strings.date); *proc_type = procedure->proc_type; @@ -371,7 +371,7 @@ gimp_pdb_query_entry (gpointer key, if (match_string (pdb_query->name_regex, proc_name) && match_string (pdb_query->blurb_regex, strings.blurb) && match_string (pdb_query->help_regex, strings.help) && - match_string (pdb_query->author_regex, strings.author) && + match_string (pdb_query->authors_regex, strings.authors) && match_string (pdb_query->copyright_regex, strings.copyright) && match_string (pdb_query->date_regex, strings.date) && match_string (pdb_query->proc_type_regex, type_desc->value_desc)) @@ -525,7 +525,7 @@ gimp_pdb_print_entry (gpointer key, output_string (string, strings.help); g_string_append_printf (string, " "); - output_string (string, strings.author); + output_string (string, strings.authors); g_string_append_printf (string, " "); output_string (string, strings.copyright); @@ -624,7 +624,7 @@ gimp_pdb_get_strings (PDBStrings *strings, strings->blurb = g_strdup_printf (COMPAT_BLURB, gimp_object_get_name (procedure)); strings->help = g_strdup (strings->blurb); - strings->author = NULL; + strings->authors = NULL; strings->copyright = NULL; strings->date = NULL; } @@ -632,7 +632,7 @@ gimp_pdb_get_strings (PDBStrings *strings, { strings->blurb = procedure->blurb; strings->help = procedure->help; - strings->author = procedure->author; + strings->authors = procedure->authors; strings->copyright = procedure->copyright; strings->date = procedure->date; } diff --git a/app/pdb/gimppdb-query.h b/app/pdb/gimppdb-query.h index 4b8c3207a3..997d7ac3f1 100644 --- a/app/pdb/gimppdb-query.h +++ b/app/pdb/gimppdb-query.h @@ -26,7 +26,7 @@ gboolean gimp_pdb_query (GimpPDB *pdb, const gchar *name, const gchar *blurb, const gchar *help, - const gchar *author, + const gchar *authors, const gchar *copyright, const gchar *date, const gchar *proc_type, @@ -37,7 +37,7 @@ gboolean gimp_pdb_proc_info (GimpPDB *pdb, const gchar *proc_name, gchar **blurb, gchar **help, - gchar **author, + gchar **authors, gchar **copyright, gchar **date, GimpPDBProcType *proc_type, diff --git a/app/pdb/gimpprocedure.c b/app/pdb/gimpprocedure.c index a12dab9889..27553f2f9c 100644 --- a/app/pdb/gimpprocedure.c +++ b/app/pdb/gimpprocedure.c @@ -147,7 +147,7 @@ gimp_procedure_get_memsize (GimpObject *object, memsize += gimp_string_get_memsize (procedure->original_name); memsize += gimp_string_get_memsize (procedure->blurb); memsize += gimp_string_get_memsize (procedure->help); - memsize += gimp_string_get_memsize (procedure->author); + memsize += gimp_string_get_memsize (procedure->authors); memsize += gimp_string_get_memsize (procedure->copyright); memsize += gimp_string_get_memsize (procedure->date); memsize += gimp_string_get_memsize (procedure->deprecated); @@ -267,7 +267,7 @@ gimp_procedure_set_strings (GimpProcedure *procedure, const gchar *original_name, const gchar *blurb, const gchar *help, - const gchar *author, + const gchar *authors, const gchar *copyright, const gchar *date, const gchar *deprecated) @@ -279,7 +279,7 @@ gimp_procedure_set_strings (GimpProcedure *procedure, procedure->original_name = g_strdup (original_name); procedure->blurb = g_strdup (blurb); procedure->help = g_strdup (help); - procedure->author = g_strdup (author); + procedure->authors = g_strdup (authors); procedure->copyright = g_strdup (copyright); procedure->date = g_strdup (date); procedure->deprecated = g_strdup (deprecated); @@ -292,7 +292,7 @@ gimp_procedure_set_static_strings (GimpProcedure *procedure, const gchar *original_name, const gchar *blurb, const gchar *help, - const gchar *author, + const gchar *authors, const gchar *copyright, const gchar *date, const gchar *deprecated) @@ -304,7 +304,7 @@ gimp_procedure_set_static_strings (GimpProcedure *procedure, procedure->original_name = (gchar *) original_name; procedure->blurb = (gchar *) blurb; procedure->help = (gchar *) help; - procedure->author = (gchar *) author; + procedure->authors = (gchar *) authors; procedure->copyright = (gchar *) copyright; procedure->date = (gchar *) date; procedure->deprecated = (gchar *) deprecated; @@ -317,7 +317,7 @@ gimp_procedure_take_strings (GimpProcedure *procedure, gchar *original_name, gchar *blurb, gchar *help, - gchar *author, + gchar *authors, gchar *copyright, gchar *date, gchar *deprecated) @@ -329,7 +329,7 @@ gimp_procedure_take_strings (GimpProcedure *procedure, procedure->original_name = original_name; procedure->blurb = blurb; procedure->help = help; - procedure->author = author; + procedure->authors = authors; procedure->copyright = copyright; procedure->date = date; procedure->deprecated = deprecated; @@ -710,7 +710,7 @@ gimp_procedure_free_strings (GimpProcedure *procedure) g_free (procedure->original_name); g_free (procedure->blurb); g_free (procedure->help); - g_free (procedure->author); + g_free (procedure->authors); g_free (procedure->copyright); g_free (procedure->date); g_free (procedure->deprecated); @@ -719,7 +719,7 @@ gimp_procedure_free_strings (GimpProcedure *procedure) procedure->original_name = NULL; procedure->blurb = NULL; procedure->help = NULL; - procedure->author = NULL; + procedure->authors = NULL; procedure->copyright = NULL; procedure->date = NULL; procedure->deprecated = NULL; diff --git a/app/pdb/gimpprocedure.h b/app/pdb/gimpprocedure.h index 7e9f2dc607..36ec3bc670 100644 --- a/app/pdb/gimpprocedure.h +++ b/app/pdb/gimpprocedure.h @@ -51,7 +51,7 @@ struct _GimpProcedure gchar *original_name; /* Uncanonicalized procedure name */ gchar *blurb; /* Short procedure description */ gchar *help; /* Detailed help instructions */ - gchar *author; /* Author field */ + gchar *authors; /* Authors field */ gchar *copyright; /* Copyright field */ gchar *date; /* Date field */ gchar *deprecated; /* Replacement if deprecated */ @@ -100,7 +100,7 @@ void gimp_procedure_set_strings (GimpProcedure *procedure, const gchar *original_name, const gchar *blurb, const gchar *help, - const gchar *author, + const gchar *authors, const gchar *copyright, const gchar *date, const gchar *deprecated); @@ -108,7 +108,7 @@ void gimp_procedure_set_static_strings (GimpProcedure *procedure, const gchar *original_name, const gchar *blurb, const gchar *help, - const gchar *author, + const gchar *authors, const gchar *copyright, const gchar *date, const gchar *deprecated); @@ -116,7 +116,7 @@ void gimp_procedure_take_strings (GimpProcedure *procedure, gchar *original_name, gchar *blurb, gchar *help, - gchar *author, + gchar *authors, gchar *copyright, gchar *date, gchar *deprecated); diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index adf34013c1..1d7caf143c 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -745,7 +745,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn *plug_in, VALIDATE (canonical) && VALIDATE_OR_NULL (proc_install->blurb) && VALIDATE_OR_NULL (proc_install->help) && - VALIDATE_OR_NULL (proc_install->author) && + VALIDATE_OR_NULL (proc_install->authors) && VALIDATE_OR_NULL (proc_install->copyright) && VALIDATE_OR_NULL (proc_install->date)) { @@ -851,7 +851,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn *plug_in, proc_install->name, proc_install->blurb, proc_install->help, - proc_install->author, + proc_install->authors, proc_install->copyright, proc_install->date, NULL); diff --git a/app/plug-in/plug-in-rc.c b/app/plug-in/plug-in-rc.c index 7408e325a8..c470b8884e 100644 --- a/app/plug-in/plug-in-rc.c +++ b/app/plug-in/plug-in-rc.c @@ -427,7 +427,7 @@ plug_in_procedure_deserialize (GScanner *scanner, return G_TOKEN_STRING; if (! gimp_scanner_parse_string (scanner, &procedure->help)) return G_TOKEN_STRING; - if (! gimp_scanner_parse_string (scanner, &procedure->author)) + if (! gimp_scanner_parse_string (scanner, &procedure->authors)) return G_TOKEN_STRING; if (! gimp_scanner_parse_string (scanner, &procedure->copyright)) return G_TOKEN_STRING; @@ -1172,7 +1172,7 @@ plug_in_rc_write (GSList *plug_in_defs, gimp_config_writer_linefeed (writer); gimp_config_writer_string (writer, procedure->help); gimp_config_writer_linefeed (writer); - gimp_config_writer_string (writer, procedure->author); + gimp_config_writer_string (writer, procedure->authors); gimp_config_writer_linefeed (writer); gimp_config_writer_string (writer, procedure->copyright); gimp_config_writer_linefeed (writer); diff --git a/libgimp/gimplegacy.c b/libgimp/gimplegacy.c index c65ad2541d..1b31c3cb27 100644 --- a/libgimp/gimplegacy.c +++ b/libgimp/gimplegacy.c @@ -288,7 +288,7 @@ gimp_install_procedure (const gchar *name, proc_install.name = (gchar *) name; proc_install.blurb = (gchar *) blurb; proc_install.help = (gchar *) help; - proc_install.author = (gchar *) author; + proc_install.authors = (gchar *) author; proc_install.copyright = (gchar *) copyright; proc_install.date = (gchar *) date; proc_install.menu_label = (gchar *) menu_label; diff --git a/libgimp/gimpprocedure-private.c b/libgimp/gimpprocedure-private.c index 8d26f28d40..10733b1a9c 100644 --- a/libgimp/gimpprocedure-private.c +++ b/libgimp/gimpprocedure-private.c @@ -60,7 +60,7 @@ _gimp_procedure_register (GimpProcedure *procedure) proc_install.name = (gchar *) gimp_procedure_get_name (procedure); proc_install.blurb = (gchar *) gimp_procedure_get_blurb (procedure); proc_install.help = (gchar *) gimp_procedure_get_help (procedure); - proc_install.author = (gchar *) gimp_procedure_get_authors (procedure); + proc_install.authors = (gchar *) gimp_procedure_get_authors (procedure); proc_install.copyright = (gchar *) gimp_procedure_get_copyright (procedure); proc_install.date = (gchar *) gimp_procedure_get_date (procedure); proc_install.menu_label = (gchar *) gimp_procedure_get_menu_label (procedure); diff --git a/libgimpbase/gimpprotocol.c b/libgimpbase/gimpprotocol.c index c675e2de85..5abd904298 100644 --- a/libgimpbase/gimpprotocol.c +++ b/libgimpbase/gimpprotocol.c @@ -1207,7 +1207,7 @@ _gp_proc_install_read (GIOChannel *channel, &proc_install->help, 1, user_data)) goto cleanup; if (! _gimp_wire_read_string (channel, - &proc_install->author, 1, user_data)) + &proc_install->authors, 1, user_data)) goto cleanup; if (! _gimp_wire_read_string (channel, &proc_install->copyright, 1, user_data)) @@ -1259,7 +1259,7 @@ _gp_proc_install_read (GIOChannel *channel, g_free (proc_install->name); g_free (proc_install->blurb); g_free (proc_install->help); - g_free (proc_install->author); + g_free (proc_install->authors); g_free (proc_install->copyright); g_free (proc_install->date); g_free (proc_install->menu_label); @@ -1441,7 +1441,7 @@ _gp_proc_install_write (GIOChannel *channel, &proc_install->help, 1, user_data)) return; if (! _gimp_wire_write_string (channel, - &proc_install->author, 1, user_data)) + &proc_install->authors, 1, user_data)) return; if (! _gimp_wire_write_string (channel, &proc_install->copyright, 1, user_data)) @@ -1495,7 +1495,7 @@ _gp_proc_install_destroy (GimpWireMessage *msg) g_free (proc_install->name); g_free (proc_install->blurb); g_free (proc_install->help); - g_free (proc_install->author); + g_free (proc_install->authors); g_free (proc_install->copyright); g_free (proc_install->date); g_free (proc_install->menu_label); diff --git a/libgimpbase/gimpprotocol.h b/libgimpbase/gimpprotocol.h index 20b7ae5eae..a9a29cde11 100644 --- a/libgimpbase/gimpprotocol.h +++ b/libgimpbase/gimpprotocol.h @@ -258,7 +258,7 @@ struct _GPProcInstall gchar *name; gchar *blurb; gchar *help; - gchar *author; + gchar *authors; gchar *copyright; gchar *date; gchar *menu_label;