callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app/plug-in/plug-in-message.c app/plug-in/plug-in-params.c string review.

Browse Source 
2006-03-29  Sven Neumann  <sven@gimp.org>

	* app/plug-in/plug-in-message.c
	* app/plug-in/plug-in-params.c
	* app/plug-in/plug-in.c: string review.
This commit is contained in:
Sven Neumann
2006-03-29 10:45:18 +00:00
committed by Sven Neumann
parent a569559b4a
commit 25f5647eee
6 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-03-29 Sven Neumann <sven@gimp.org>
* app/plug-in/plug-in-message.c
* app/plug-in/plug-in-params.c
* app/plug-in/plug-in.c: string review.
2006-03-29 Tor Lillqvist <tml@novell.com> 2006-03-29 Tor Lillqvist <tml@novell.com>
* plug-ins/common/winprint.c (query): Make it compile again, add * plug-ins/common/winprint.c (query): Make it compile again, add

16
app/plug-in/gimpplugin-message.c
View File

@ -94,7 +94,7 @@ plug_in_handle_message (PlugIn *plug_in,
case GP_CONFIG: case GP_CONFIG:
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent a CONFIG message (should not happen)", "sent a CONFIG message. This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);
@ -106,7 +106,7 @@ plug_in_handle_message (PlugIn *plug_in,
case GP_TILE_ACK: case GP_TILE_ACK:
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent a TILE_ACK message (should not happen)", "sent a TILE_ACK message. This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);
@ -114,7 +114,7 @@ plug_in_handle_message (PlugIn *plug_in,
case GP_TILE_DATA: case GP_TILE_DATA:
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent a TILE_DATA message (should not happen)", "sent a TILE_DATA message. This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);
@ -130,7 +130,7 @@ plug_in_handle_message (PlugIn *plug_in,
case GP_TEMP_PROC_RUN: case GP_TEMP_PROC_RUN:
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent a TEMP_PROC_RUN message (should not happen)", "sent a TEMP_PROC_RUN message. This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);
@ -562,7 +562,7 @@ plug_in_handle_temp_proc_return (PlugIn *plug_in,
{ {
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent a TEMP_PROC_RETURN message while not running " "sent a TEMP_PROC_RETURN message while not running "
"a temp proc (should not happen)", "a temporary procedure. This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);
@ -829,7 +829,7 @@ plug_in_handle_extension_ack (PlugIn *plug_in)
{ {
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent an EXTENSION_ACK message while not being started " "sent an EXTENSION_ACK message while not being started "
"as extension (should not happen)", "as an extension. This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);
@ -846,8 +846,8 @@ plug_in_handle_has_init (PlugIn *plug_in)
else else
{ {
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent an HAS_INIT message while not in query() " "sent an HAS_INIT message while not in query(). "
"(should not happen)", "This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);

8
app/plug-in/gimpplugin.c
View File

@ -363,7 +363,7 @@ plug_in_open (PlugIn *plug_in)
*/ */
if ((pipe (my_read) == -1) || (pipe (my_write) == -1)) if ((pipe (my_read) == -1) || (pipe (my_write) == -1))
{ {
g_message ("Unable to run Plug-In \"%s\"\n(%s)\n\npipe() failed: %s", g_message ("Unable to run plug-in \"%s\"\n(%s)\n\npipe() failed: %s",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog), gimp_filename_to_utf8 (plug_in->prog),
g_strerror (errno)); g_strerror (errno));
@ -473,7 +473,7 @@ plug_in_open (PlugIn *plug_in)
&plug_in->pid, &plug_in->pid,
&error)) &error))
{ {
g_message ("Unable to run Plug-In \"%s\"\n(%s)\n\n%s", g_message ("Unable to run plug-in \"%s\"\n(%s)\n\n%s",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog), gimp_filename_to_utf8 (plug_in->prog),
error->message); error->message);
@ -750,8 +750,8 @@ plug_in_recv_message (GIOChannel *channel,
} }
if (! got_message) if (! got_message)
g_message (_("Plug-In crashed: \"%s\"\n(%s)\n\n" g_message (_("Plug-in crashed: \"%s\"\n(%s)\n\n"
"The dying Plug-In may have messed up GIMP's internal state. " "The dying plug-in may have messed up GIMP's internal state. "
"You may want to save your images and restart GIMP " "You may want to save your images and restart GIMP "
"to be on the safe side."), "to be on the safe side."),
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),

16
app/plug-in/plug-in-message.c
View File

@ -94,7 +94,7 @@ plug_in_handle_message (PlugIn *plug_in,
case GP_CONFIG: case GP_CONFIG:
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent a CONFIG message (should not happen)", "sent a CONFIG message. This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);
@ -106,7 +106,7 @@ plug_in_handle_message (PlugIn *plug_in,
case GP_TILE_ACK: case GP_TILE_ACK:
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent a TILE_ACK message (should not happen)", "sent a TILE_ACK message. This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);
@ -114,7 +114,7 @@ plug_in_handle_message (PlugIn *plug_in,
case GP_TILE_DATA: case GP_TILE_DATA:
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent a TILE_DATA message (should not happen)", "sent a TILE_DATA message. This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);
@ -130,7 +130,7 @@ plug_in_handle_message (PlugIn *plug_in,
case GP_TEMP_PROC_RUN: case GP_TEMP_PROC_RUN:
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent a TEMP_PROC_RUN message (should not happen)", "sent a TEMP_PROC_RUN message. This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);
@ -562,7 +562,7 @@ plug_in_handle_temp_proc_return (PlugIn *plug_in,
{ {
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent a TEMP_PROC_RETURN message while not running " "sent a TEMP_PROC_RETURN message while not running "
"a temp proc (should not happen)", "a temporary procedure. This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);
@ -829,7 +829,7 @@ plug_in_handle_extension_ack (PlugIn *plug_in)
{ {
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent an EXTENSION_ACK message while not being started " "sent an EXTENSION_ACK message while not being started "
"as extension (should not happen)", "as an extension. This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);
@ -846,8 +846,8 @@ plug_in_handle_has_init (PlugIn *plug_in)
else else
{ {
g_message ("Plug-In \"%s\"\n(%s)\n\n" g_message ("Plug-In \"%s\"\n(%s)\n\n"
"sent an HAS_INIT message while not in query() " "sent an HAS_INIT message while not in query(). "
"(should not happen)", "This should not happen.",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog)); gimp_filename_to_utf8 (plug_in->prog));
plug_in_close (plug_in, TRUE); plug_in_close (plug_in, TRUE);

14
app/plug-in/plug-in-params.c
View File

@ -143,7 +143,7 @@ plug_in_params_to_args (GPParam *params,
args[i].value.pdb_color = params[i].data.d_color; args[i].value.pdb_color = params[i].data.d_color;
break; break;
case GIMP_PDB_REGION: case GIMP_PDB_REGION:
g_message ("the \"region\" arg type is not currently supported"); g_message ("the \"region\" argument type is not supported");
break; break;
case GIMP_PDB_DISPLAY: case GIMP_PDB_DISPLAY:
args[i].value.pdb_int = params[i].data.d_display; args[i].value.pdb_int = params[i].data.d_display;
@ -295,7 +295,7 @@ plug_in_args_to_params (Argument *args,
params[i].data.d_color = args[i].value.pdb_color; params[i].data.d_color = args[i].value.pdb_color;
break; break;
case GIMP_PDB_REGION: case GIMP_PDB_REGION:
g_message ("the \"region\" arg type is not currently supported"); g_message ("the \"region\" argument type is not supported");
break; break;
case GIMP_PDB_DISPLAY: case GIMP_PDB_DISPLAY:
params[i].data.d_display = args[i].value.pdb_int; params[i].data.d_display = args[i].value.pdb_int;
@ -409,7 +409,7 @@ plug_in_params_destroy (GPParam *params,
case GIMP_PDB_COLOR: case GIMP_PDB_COLOR:
break; break;
case GIMP_PDB_REGION: case GIMP_PDB_REGION:
g_message ("the \"region\" arg type is not currently supported"); g_message ("the \"region\" argument type is not supported");
break; break;
case GIMP_PDB_DISPLAY: case GIMP_PDB_DISPLAY:
case GIMP_PDB_IMAGE: case GIMP_PDB_IMAGE:
@ -511,7 +511,7 @@ plug_in_proc_args_check (const gchar *plug_in_name,
"Plug-In \"%s\"\n(%s)\n\n" "Plug-In \"%s\"\n(%s)\n\n"
"attempted to install %s procedure \"%s\" " "attempted to install %s procedure \"%s\" "
"which does not take the standard %s Plug-In " "which does not take the standard %s Plug-In "
"args.\n" "arguments.\n"
"(INT32)", "(INT32)",
gimp_filename_to_utf8 (plug_in_name), gimp_filename_to_utf8 (plug_in_name),
gimp_filename_to_utf8 (plug_in_prog), gimp_filename_to_utf8 (plug_in_prog),
@ -530,7 +530,7 @@ plug_in_proc_args_check (const gchar *plug_in_name,
"Plug-In \"%s\"\n(%s)\n\n" "Plug-In \"%s\"\n(%s)\n\n"
"attempted to install <Load> procedure \"%s\" " "attempted to install <Load> procedure \"%s\" "
"which does not take the standard <Load> Plug-In " "which does not take the standard <Load> Plug-In "
"args.\n" "arguments.\n"
"(INT32, STRING, STRING)", "(INT32, STRING, STRING)",
gimp_filename_to_utf8 (plug_in_name), gimp_filename_to_utf8 (plug_in_name),
gimp_filename_to_utf8 (plug_in_prog), gimp_filename_to_utf8 (plug_in_prog),
@ -551,7 +551,7 @@ plug_in_proc_args_check (const gchar *plug_in_name,
"Plug-In \"%s\"\n(%s)\n\n" "Plug-In \"%s\"\n(%s)\n\n"
"attempted to install <Save> procedure \"%s\" " "attempted to install <Save> procedure \"%s\" "
"which does not take the standard <Save> Plug-In " "which does not take the standard <Save> Plug-In "
"args.\n" "arguments.\n"
"(INT32, IMAGE, DRAWABLE, STRING, STRING)", "(INT32, IMAGE, DRAWABLE, STRING, STRING)",
gimp_filename_to_utf8 (plug_in_name), gimp_filename_to_utf8 (plug_in_name),
gimp_filename_to_utf8 (plug_in_prog), gimp_filename_to_utf8 (plug_in_prog),
@ -573,7 +573,7 @@ plug_in_proc_args_check (const gchar *plug_in_name,
"Plug-In \"%s\"\n(%s)\n\n" "Plug-In \"%s\"\n(%s)\n\n"
"attempted to install %s procedure \"%s\" " "attempted to install %s procedure \"%s\" "
"which does not take the standard %s Plug-In " "which does not take the standard %s Plug-In "
"args.\n" "arguments.\n"
"(INT32)", "(INT32)",
gimp_filename_to_utf8 (plug_in_name), gimp_filename_to_utf8 (plug_in_name),
gimp_filename_to_utf8 (plug_in_prog), gimp_filename_to_utf8 (plug_in_prog),

8
app/plug-in/plug-in.c
View File

@ -363,7 +363,7 @@ plug_in_open (PlugIn *plug_in)
*/ */
if ((pipe (my_read) == -1) || (pipe (my_write) == -1)) if ((pipe (my_read) == -1) || (pipe (my_write) == -1))
{ {
g_message ("Unable to run Plug-In \"%s\"\n(%s)\n\npipe() failed: %s", g_message ("Unable to run plug-in \"%s\"\n(%s)\n\npipe() failed: %s",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog), gimp_filename_to_utf8 (plug_in->prog),
g_strerror (errno)); g_strerror (errno));
@ -473,7 +473,7 @@ plug_in_open (PlugIn *plug_in)
&plug_in->pid, &plug_in->pid,
&error)) &error))
{ {
g_message ("Unable to run Plug-In \"%s\"\n(%s)\n\n%s", g_message ("Unable to run plug-in \"%s\"\n(%s)\n\n%s",
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),
gimp_filename_to_utf8 (plug_in->prog), gimp_filename_to_utf8 (plug_in->prog),
error->message); error->message);
@ -750,8 +750,8 @@ plug_in_recv_message (GIOChannel *channel,
} }
if (! got_message) if (! got_message)
g_message (_("Plug-In crashed: \"%s\"\n(%s)\n\n" g_message (_("Plug-in crashed: \"%s\"\n(%s)\n\n"
"The dying Plug-In may have messed up GIMP's internal state. " "The dying plug-in may have messed up GIMP's internal state. "
"You may want to save your images and restart GIMP " "You may want to save your images and restart GIMP "
"to be on the safe side."), "to be on the safe side."),
gimp_filename_to_utf8 (plug_in->name), gimp_filename_to_utf8 (plug_in->name),