diff --git a/ChangeLog b/ChangeLog
index 890832751b..15ea3e6270 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-05-19  Manish Singh  <yosh@gimp.org>
+
+	* app/actions/file-actions.c: remove unnecessary G_OBJECT() casts.
+
+	* tools/pdbgen/pdb/help.pdb
+	* tools/pdbgen/pdb/image.pdb
+	* tools/pdbgen/pdb/paths.pdb
+	* tools/pdbgen/pdb/plug_in.pdb: a bit of quoting clean up.
+
+	* tools/pdbgen/pdb/plug_in.pdb: handle icon_data_length properly.
+
+	* app/pdb/plug_in_cmds.c: regenerated.
+
 2004-05-20  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/tga.c
diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c
index 1ed8c19a1d..207581bd0a 100644
--- a/app/actions/file-actions.c
+++ b/app/actions/file-actions.c
@@ -234,7 +234,7 @@ file_actions_last_opened_update (GimpContainer   *container,
 
               g_free (basename);
 
-              g_object_set (G_OBJECT (action),
+              g_object_set (action,
                             "label",    escaped,
                             "tooltip",  filename,
                             "visible",  TRUE,
@@ -247,7 +247,7 @@ file_actions_last_opened_update (GimpContainer   *container,
         }
       else
         {
-          g_object_set (G_OBJECT (action),
+          g_object_set (action,
                         "visible",  FALSE,
                         "viewable", NULL,
                         NULL);
diff --git a/app/pdb/plug_in_cmds.c b/app/pdb/plug_in_cmds.c
index e11f7e54ca..54967e05d9 100644
--- a/app/pdb/plug_in_cmds.c
+++ b/app/pdb/plug_in_cmds.c
@@ -648,6 +648,8 @@ plugin_icon_register_invoker (Gimp        *gimp,
     success = FALSE;
 
   icon_data_length = args[2].value.pdb_int;
+  if (icon_data_length <= 0)
+    success = FALSE;
 
   icon_data = (guint8 *) args[3].value.pdb_pointer;
 
@@ -716,7 +718,7 @@ static ProcArg plugin_icon_register_inargs[] =
   {
     GIMP_PDB_INT32,
     "icon_data_length",
-    "The length of 'icon_data'"
+    "The length of 'icon_data': 0 < icon_data_length"
   },
   {
     GIMP_PDB_INT8ARRAY,
diff --git a/tools/pdbgen/pdb/help.pdb b/tools/pdbgen/pdb/help.pdb
index b610866302..0d1dac2ba6 100644
--- a/tools/pdbgen/pdb/help.pdb
+++ b/tools/pdbgen/pdb/help.pdb
@@ -36,7 +36,7 @@ HELP
 	{ name => 'help_domain', type => 'string', null_ok => 1,
 	  desc => "The help domain in which help_id is registered" },
 	{ name => 'help_id', type => 'string',
-	  desc => 'The help page\'s ID' }
+	  desc => "The help page's ID" }
     );
 
     %invoke = (
diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb
index 0394e744dd..92a1c547b1 100644
--- a/tools/pdbgen/pdb/image.pdb
+++ b/tools/pdbgen/pdb/image.pdb
@@ -782,7 +782,7 @@ HELP
 }
 
 sub image_add_layer_mask {
-    $blurb = $help = 'This procedure is deprecated! Use \'gimp_layer_add_mask\' instead.';
+    $blurb = $help = "This procedure is deprecated! Use 'gimp_layer_add_mask' instead.";
     $author = $copyright = $date = '';
 
     @inargs = (
@@ -803,7 +803,7 @@ CODE
 }
 
 sub image_remove_layer_mask {
-    $blurb = $help = 'This procedure is deprecated! Use \'gimp_layer_remove_mask\' instead.';
+    $blurb = $help = "This procedure is deprecated! Use 'gimp_layer_remove_mask' instead.";
     $author = $copyright = $date = '';
 
     @inargs = (
diff --git a/tools/pdbgen/pdb/paths.pdb b/tools/pdbgen/pdb/paths.pdb
index 06690e26f7..c13bfc64af 100644
--- a/tools/pdbgen/pdb/paths.pdb
+++ b/tools/pdbgen/pdb/paths.pdb
@@ -417,7 +417,7 @@ HELP
 	{ name => 'name', type => 'string',
 	  desc => 'the name of the path whose tattoo should be set' },
         { name => 'tattovalue', type => 'int32',
-	  desc => 'The tattoo associated with the name path. Only values returned from \'path_get_tattoo\' should be used here', init => 1  }
+	  desc => "The tattoo associated with the name path. Only values returned from 'path_get_tattoo' should be used here", init => 1  }
     );
 
     %invoke = (
diff --git a/tools/pdbgen/pdb/plug_in.pdb b/tools/pdbgen/pdb/plug_in.pdb
index d7f946ad04..f1b1a0415c 100644
--- a/tools/pdbgen/pdb/plug_in.pdb
+++ b/tools/pdbgen/pdb/plug_in.pdb
@@ -281,9 +281,9 @@ HELP
 
     @inargs = (
 	{ name => 'domain_name', type => 'string',
-	  desc => 'The XML namespace of the plug-in\'s help pages' },
+	  desc => "The XML namespace of the plug-in's help pages" },
 	{ name => 'domain_uri', type => 'string',
-	  desc => 'The root URI of the plug-in\'s help pages' }
+	  desc => "The root URI of the plug-in's help pages" }
     );
 
     %invoke = (
@@ -317,7 +317,7 @@ HELP
 	{ name => 'procedure_name', type => 'string',
 	  desc => 'The procedure for which to install the menu path' },
 	{ name => 'menu_path', type => 'string',
-	  desc => 'The procedure\'s additional menu path' }
+	  desc => "The procedure's additional menu path" }
     );
 
     %invoke = (
@@ -405,10 +405,10 @@ HELP
 	  desc => 'The procedure for which to install the icon' },
         { name => 'icon_type', type => 'enum GimpIconType',
           desc => 'The type of the icon' },
-        { name => 'icon_data_length', type => 'int32',
-          desc => 'The length of \'icon_data\'' },
 	{ name => 'icon_data', type => 'int8array',
-	  desc => 'The procedure\'s icon. The format depends on the \'icon_type\' parameter' }
+	  desc => "The procedure's icon. The format depends on the 'icon_type' parameter",
+	  array => { name => 'icon_data_length', type => '0 < int32',
+                     desc => "The length of 'icon_data': %%desc%%" } }
     );
 
     %invoke = (