gimp r26877 - in trunk: . app/plug-in

[mitch svn gnome org]

Author: mitch
Date: Fri Sep  5 15:46:00 2008
New Revision: 26877
URL: http://svn.gnome.org/viewvc/gimp?rev=26877&view=rev

Log:
2008-09-05  Michael Natterer  <mitch gimp org>

	* app/plug-in/gimpplugindebug.[ch] (gimp_plug_in_debug_argv): made
	the "args" parameter const.

	* app/plug-in/gimpplugin.c (gimp_plug_in_open): made some strings
	const.



Modified:
   trunk/ChangeLog
   trunk/app/plug-in/gimpplugin.c
   trunk/app/plug-in/gimpplugindebug.c
   trunk/app/plug-in/gimpplugindebug.h

Modified: trunk/app/plug-in/gimpplugin.c
==============================================================================
--- trunk/app/plug-in/gimpplugin.c	(original)
+++ trunk/app/plug-in/gimpplugin.c	Fri Sep  5 15:46:00 2008
@@ -220,18 +220,20 @@
                    GimpPlugInCallMode  call_mode,
                    gboolean            synchronous)
 {
-  gint       my_read[2];
-  gint       my_write[2];
-  gchar    **envp;
-  gchar     *args[9], **argv;
-  gint       argc;
-  gchar     *interp, *interp_arg;
-  gchar     *read_fd, *write_fd;
-  gchar     *mode, *stm;
-  GError    *error = NULL;
-  gboolean   debug;
-  guint      debug_flag;
-  guint      spawn_flags;
+  gint          my_read[2];
+  gint          my_write[2];
+  gchar       **envp;
+  const gchar  *args[9];
+  gchar       **argv;
+  gint          argc;
+  gchar        *interp, *interp_arg;
+  gchar        *read_fd, *write_fd;
+  const gchar  *mode;
+  gchar        *stm;
+  GError       *error = NULL;
+  gboolean      debug;
+  guint         debug_flag;
+  guint         spawn_flags;
 
   g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), FALSE);
   g_return_val_if_fail (plug_in->call_mode == GIMP_PLUG_IN_CALL_NONE, FALSE);
@@ -331,7 +333,7 @@
   args[argc++] = stm;
   args[argc++] = NULL;
 
-  argv = args;
+  argv = (gchar **) args;
   envp = gimp_environ_table_get_envp (plug_in->manager->environ_table);
   spawn_flags = (G_SPAWN_LEAVE_DESCRIPTORS_OPEN |
                  G_SPAWN_DO_NOT_REAP_CHILD      |

Modified: trunk/app/plug-in/gimpplugindebug.c
==============================================================================
--- trunk/app/plug-in/gimpplugindebug.c	(original)
+++ trunk/app/plug-in/gimpplugindebug.c	Fri Sep  5 15:46:00 2008
@@ -109,7 +109,7 @@
 gimp_plug_in_debug_argv (GimpPlugInDebug    *debug,
                          const gchar        *name,
                          GimpDebugWrapFlag   flag,
-                         gchar             **args)
+                         const gchar       **args)
 {
   GPtrArray  *argv;
   gchar     **arg;
@@ -134,7 +134,7 @@
   for (arg = debug->args; *arg != NULL; arg++)
     g_ptr_array_add (argv, *arg);
 
-  for (arg = args; *arg != NULL; arg++)
+  for (arg = (gchar **) args; *arg != NULL; arg++)
     g_ptr_array_add (argv, *arg);
 
   g_ptr_array_add (argv, NULL);

Modified: trunk/app/plug-in/gimpplugindebug.h
==============================================================================
--- trunk/app/plug-in/gimpplugindebug.h	(original)
+++ trunk/app/plug-in/gimpplugindebug.h	Fri Sep  5 15:46:00 2008
@@ -38,7 +38,7 @@
 gchar           ** gimp_plug_in_debug_argv (GimpPlugInDebug    *debug,
                                             const gchar        *name,
                                             GimpDebugWrapFlag   flag,
-                                            gchar             **args);
+                                            const gchar       **args);
 
 
 #endif /* __GIMP_PLUG_IN_DEBUG_H__ */