[gimp/gimp-2-10] Issue #4641 - Invalid PDB parameter names for data-selection functions



commit b886dd1f46090405285105a19320227987b88ee6
Author: Ell <ell_se yahoo com>
Date:   Thu Mar 5 20:17:26 2020 +0200

    Issue #4641 - Invalid PDB parameter names for data-selection functions
    
    In the various libgimp data-selection functions, replace spaces
    with hyphens in the callback-proc parameter names.  Spaces in
    parameter names are invalid, which is now enforced by GIMP/GLib,
    causing procedure registration to fail.

 libgimp/gimpbrushselect.c    | 12 ++++++------
 libgimp/gimpfontselect.c     |  2 +-
 libgimp/gimpgradientselect.c |  6 +++---
 libgimp/gimppaletteselect.c  |  4 ++--
 libgimp/gimppatternselect.c  | 12 ++++++------
 5 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/libgimp/gimpbrushselect.c b/libgimp/gimpbrushselect.c
index 5d79f41d97..fb17659f4a 100644
--- a/libgimp/gimpbrushselect.c
+++ b/libgimp/gimpbrushselect.c
@@ -73,12 +73,12 @@ gimp_brush_select_new (const gchar          *title,
     { GIMP_PDB_STRING,    "str",           "String"                     },
     { GIMP_PDB_FLOAT,     "opacity",       "Opacity"                    },
     { GIMP_PDB_INT32,     "spacing",       "Spacing"                    },
-    { GIMP_PDB_INT32,     "paint mode",    "Paint mode"                 },
-    { GIMP_PDB_INT32,     "mask width",    "Brush width"                },
-    { GIMP_PDB_INT32,     "mask height"    "Brush height"               },
-    { GIMP_PDB_INT32,     "mask len",      "Length of brush mask data"  },
-    { GIMP_PDB_INT8ARRAY, "mask data",     "The brush mask data"        },
-    { GIMP_PDB_INT32,     "dialog status", "If the dialog was closing "
+    { GIMP_PDB_INT32,     "paint-mode",    "Paint mode"                 },
+    { GIMP_PDB_INT32,     "mask-width",    "Brush width"                },
+    { GIMP_PDB_INT32,     "mask-height",   "Brush height"               },
+    { GIMP_PDB_INT32,     "mask-len",      "Length of brush mask data"  },
+    { GIMP_PDB_INT8ARRAY, "mask-data",     "The brush mask data"        },
+    { GIMP_PDB_INT32,     "dialog-status", "If the dialog was closing "
                                            "[0 = No, 1 = Yes]"          }
   };
 
diff --git a/libgimp/gimpfontselect.c b/libgimp/gimpfontselect.c
index 0b2ece7b87..2012af6245 100644
--- a/libgimp/gimpfontselect.c
+++ b/libgimp/gimpfontselect.c
@@ -62,7 +62,7 @@ gimp_font_select_new (const gchar         *title,
   static const GimpParamDef args[] =
   {
     { GIMP_PDB_STRING, "str",           "String"                     },
-    { GIMP_PDB_INT32,  "dialog status", "If the dialog was closing "
+    { GIMP_PDB_INT32,  "dialog-status", "If the dialog was closing "
                                         "[0 = No, 1 = Yes]"          }
   };
 
diff --git a/libgimp/gimpgradientselect.c b/libgimp/gimpgradientselect.c
index adc560ec13..28e5de141e 100644
--- a/libgimp/gimpgradientselect.c
+++ b/libgimp/gimpgradientselect.c
@@ -65,9 +65,9 @@ gimp_gradient_select_new (const gchar             *title,
   static const GimpParamDef args[] =
   {
     { GIMP_PDB_STRING,    "str",            "String"                     },
-    { GIMP_PDB_INT32,     "gradient width", "Gradient width"             },
-    { GIMP_PDB_FLOATARRAY,"gradient data",  "The gradient mask data"     },
-    { GIMP_PDB_INT32,     "dialog status",  "If the dialog was closing "
+    { GIMP_PDB_INT32,     "gradient-width", "Gradient width"             },
+    { GIMP_PDB_FLOATARRAY,"gradient-data",  "The gradient mask data"     },
+    { GIMP_PDB_INT32,     "dialog-status",  "If the dialog was closing "
                                             "[0 = No, 1 = Yes]"          }
   };
 
diff --git a/libgimp/gimppaletteselect.c b/libgimp/gimppaletteselect.c
index d96f30a26a..c6ddaafcf3 100644
--- a/libgimp/gimppaletteselect.c
+++ b/libgimp/gimppaletteselect.c
@@ -63,8 +63,8 @@ gimp_palette_select_new (const gchar            *title,
   static const GimpParamDef args[] =
   {
     { GIMP_PDB_STRING, "str",           "String"                      },
-    { GIMP_PDB_INT32,  "num colors",    "Number of colors"            },
-    { GIMP_PDB_INT32,  "dialog status", "If the dialog was closing "
+    { GIMP_PDB_INT32,  "num-colors",    "Number of colors"            },
+    { GIMP_PDB_INT32,  "dialog-status", "If the dialog was closing "
                                         "[0 = No, 1 = Yes]"           }
   };
 
diff --git a/libgimp/gimppatternselect.c b/libgimp/gimppatternselect.c
index a05b89d47e..6cb278342d 100644
--- a/libgimp/gimppatternselect.c
+++ b/libgimp/gimppatternselect.c
@@ -66,12 +66,12 @@ gimp_pattern_select_new (const gchar            *title,
   static const GimpParamDef args[] =
   {
     { GIMP_PDB_STRING,   "str",           "String"                      },
-    { GIMP_PDB_INT32,    "mask width",    "Pattern width"               },
-    { GIMP_PDB_INT32,    "mask height",   "Pattern height"              },
-    { GIMP_PDB_INT32,    "mask bpp",      "Pattern bytes per pixel"     },
-    { GIMP_PDB_INT32,    "mask len",      "Length of pattern mask data" },
-    { GIMP_PDB_INT8ARRAY,"mask data",     "The pattern mask data"       },
-    { GIMP_PDB_INT32,    "dialog status", "If the dialog was closing "
+    { GIMP_PDB_INT32,    "mask-width",    "Pattern width"               },
+    { GIMP_PDB_INT32,    "mask-height",   "Pattern height"              },
+    { GIMP_PDB_INT32,    "mask-bpp",      "Pattern bytes per pixel"     },
+    { GIMP_PDB_INT32,    "mask-len",      "Length of pattern mask data" },
+    { GIMP_PDB_INT8ARRAY,"mask-data",     "The pattern mask data"       },
+    { GIMP_PDB_INT32,    "dialog-status", "If the dialog was closing "
                                           "[0 = No, 1 = Yes]"           }
   };
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]