[gimp] app: oops these two files were not meant to be pushed just yet

[Michael Natterer <mitch src gnome org>]

commit d74ae12781527cf888f17d0cc57182c18bef49a0
Author: Michael Natterer <mitch gimp org>
Date:   Fri Jul 26 16:02:33 2019 +0200

    app: oops these two files were not meant to be pushed just yet

 app/plug-in/gimpplugin-message.c | 12 ++++--------
 app/plug-in/plug-in-rc.c         | 21 +++++----------------
 2 files changed, 9 insertions(+), 24 deletions(-)
---
diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c
index affbb35297..0ee2c5d3e3 100644
--- a/app/plug-in/gimpplugin-message.c
+++ b/app/plug-in/gimpplugin-message.c
@@ -755,8 +755,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn    *plug_in,
               null_name = TRUE;
             }
           else if (! (VALIDATE         (proc_install->params[i].name) &&
-                      VALIDATE_OR_NULL (proc_install->params[i].nick) &&
-                      VALIDATE_OR_NULL (proc_install->params[i].blurb)))
+                      VALIDATE_OR_NULL (proc_install->params[i].description)))
             {
               valid_utf8 = FALSE;
             }
@@ -769,8 +768,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn    *plug_in,
               null_name = TRUE;
             }
           else if (! (VALIDATE         (proc_install->return_vals[i].name) &&
-                      VALIDATE_OR_NULL (proc_install->return_vals[i].nick) &&
-                      VALIDATE_OR_NULL (proc_install->return_vals[i].blurb)))
+                      VALIDATE_OR_NULL (proc_install->return_vals[i].description)))
             {
               valid_utf8 = FALSE;
             }
@@ -863,8 +861,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn    *plug_in,
         gimp_pdb_compat_param_spec (plug_in->manager->gimp,
                                     proc_install->params[i].type,
                                     proc_install->params[i].name,
-                                    proc_install->params[i].nick,
-                                    proc_install->params[i].blurb);
+                                    proc_install->params[i].description);
 
       gimp_procedure_add_argument (procedure, pspec);
     }
@@ -875,8 +872,7 @@ gimp_plug_in_handle_proc_install (GimpPlugIn    *plug_in,
         gimp_pdb_compat_param_spec (plug_in->manager->gimp,
                                     proc_install->return_vals[i].type,
                                     proc_install->return_vals[i].name,
-                                    proc_install->return_vals[i].nick,
-                                    proc_install->return_vals[i].blurb);
+                                    proc_install->return_vals[i].description);
 
       gimp_procedure_add_return_value (procedure, pspec);
     }
diff --git a/app/plug-in/plug-in-rc.c b/app/plug-in/plug-in-rc.c
index 1f2852ec29..87bd8e7292 100644
--- a/app/plug-in/plug-in-rc.c
+++ b/app/plug-in/plug-in-rc.c
@@ -743,9 +743,8 @@ plug_in_proc_arg_deserialize (GScanner      *scanner,
 {
   GTokenType  token;
   gint        arg_type;
-  gchar      *name  = NULL;
-  gchar      *nick  = NULL;
-  gchar      *blurb = NULL;
+  gchar      *name = NULL;
+  gchar      *desc = NULL;
   GParamSpec *pspec;
 
   if (! gimp_scanner_parse_token (scanner, G_TOKEN_LEFT_PAREN))
@@ -771,12 +770,7 @@ plug_in_proc_arg_deserialize (GScanner      *scanner,
       token = G_TOKEN_STRING;
       goto error;
     }
-  if (! gimp_scanner_parse_string (scanner, &nick))
-    {
-      token = G_TOKEN_STRING;
-      goto error;
-    }
-  if (! gimp_scanner_parse_string (scanner, &blurb))
+  if (! gimp_scanner_parse_string (scanner, &desc))
     {
       token = G_TOKEN_STRING;
       goto error;
@@ -790,7 +784,7 @@ plug_in_proc_arg_deserialize (GScanner      *scanner,
 
   token = G_TOKEN_LEFT_PAREN;
 
-  pspec = gimp_pdb_compat_param_spec (gimp, arg_type, name, nick, blurb);
+  pspec = gimp_pdb_compat_param_spec (gimp, arg_type, name, desc);
 
   if (return_value)
     gimp_procedure_add_return_value (procedure, pspec);
@@ -800,8 +794,7 @@ plug_in_proc_arg_deserialize (GScanner      *scanner,
  error:
 
   g_free (name);
-  g_free (nick);
-  g_free (blurb);
+  g_free (desc);
 
   return token;
 }
@@ -1070,8 +1063,6 @@ plug_in_rc_write (GSList  *plug_in_defs,
 
                   gimp_config_writer_string (writer,
                                              g_param_spec_get_name (pspec));
-                  gimp_config_writer_string (writer,
-                                             g_param_spec_get_nick (pspec));
                   gimp_config_writer_string (writer,
                                              g_param_spec_get_blurb (pspec));
 
@@ -1088,8 +1079,6 @@ plug_in_rc_write (GSList  *plug_in_defs,
 
                   gimp_config_writer_string (writer,
                                              g_param_spec_get_name (pspec));
-                  gimp_config_writer_string (writer,
-                                             g_param_spec_get_nick (pspec));
                   gimp_config_writer_string (writer,
                                              g_param_spec_get_blurb (pspec));