libgimp*, app: add the help-id to the wire protocol

Pass the help-id specified by the procedure to the core, and use it in
the core if set instead of always using the procedure's name (which
was probably good enough for all eternity, but it's still more
consistent this way).
This commit is contained in:
Michael Natterer 2019-08-08 09:57:56 +02:00
parent 0aa2dcfadb
commit d156028c8a
7 changed files with 43 additions and 7 deletions

View file

@ -1202,6 +1202,9 @@ _gp_proc_install_read (GIOChannel *channel,
if (! _gimp_wire_read_string (channel,
&proc_install->help, 1, user_data))
goto cleanup;
if (! _gimp_wire_read_string (channel,
&proc_install->help_id, 1, user_data))
goto cleanup;
if (! _gimp_wire_read_string (channel,
&proc_install->authors, 1, user_data))
goto cleanup;
@ -1255,6 +1258,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->help_id);
g_free (proc_install->authors);
g_free (proc_install->copyright);
g_free (proc_install->date);
@ -1443,6 +1447,9 @@ _gp_proc_install_write (GIOChannel *channel,
if (! _gimp_wire_write_string (channel,
&proc_install->help, 1, user_data))
return;
if (! _gimp_wire_write_string (channel,
&proc_install->help_id, 1, user_data))
return;
if (! _gimp_wire_write_string (channel,
&proc_install->authors, 1, user_data))
return;
@ -1498,6 +1505,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->help_id);
g_free (proc_install->authors);
g_free (proc_install->copyright);
g_free (proc_install->date);

View file

@ -26,7 +26,7 @@ G_BEGIN_DECLS
/* Increment every time the protocol changes
*/
#define GIMP_PROTOCOL_VERSION 0x0106
#define GIMP_PROTOCOL_VERSION 0x0107
enum
@ -268,6 +268,7 @@ struct _GPProcInstall
gchar *name;
gchar *blurb;
gchar *help;
gchar *help_id;
gchar *authors;
gchar *copyright;
gchar *date;