gimp r27548 - in trunk: . app app/actions app/config app/core app/dialogs app/display app/file app/gegl app/gui app/paint app/pdb app/plug-in app/text app/tools app/widgets app/xcf tools/pdbgen/pdb
- From: neo svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r27548 - in trunk: . app app/actions app/config app/core app/dialogs app/display app/file app/gegl app/gui app/paint app/pdb app/plug-in app/text app/tools app/widgets app/xcf tools/pdbgen/pdb
- Date: Tue, 4 Nov 2008 12:33:09 +0000 (UTC)
Author: neo
Date: Tue Nov 4 12:33:09 2008
New Revision: 27548
URL: http://svn.gnome.org/viewvc/gimp?rev=27548&view=rev
Log:
2008-11-04 Sven Neumann <sven sven>
* configure.in: bumped minimum required version of GLib to
2.18.0.
* INSTALL: document the updated dependency.
* app/core/gimp.[ch]: introduced gimp_message_literal(), a
variant
of gimp_message() that takes a literal string.
* app/errors.[ch]: removed format arguments from
gimp_fatal_error()
and gimp_terminate() and let them take a literal string instead.
* app/tools/gimptool.[ch]: introduced
gimp_tool_message_literal(),
a variant of gimp_tool_message() that takes a literal string.
* app/actions/documents-commands.c
* app/actions/drawable-commands.c
* app/actions/edit-commands.c
* app/actions/error-console-commands.c
* app/actions/file-commands.c
* app/actions/gradients-commands.c
* app/actions/image-commands.c
* app/actions/layers-commands.c
* app/actions/palettes-commands.c
* app/actions/plug-in-commands.c
* app/actions/select-commands.c
* app/actions/vectors-commands.c
* app/config/gimprc.c
* app/core/gimp-modules.c
* app/core/gimp-parasites.c
* app/core/gimp-templates.c
* app/core/gimp-units.c
* app/core/gimpchannel.c
* app/core/gimpcontainer-filter.c
* app/core/gimpdrawable-bucket-fill.c
* app/core/gimpimage-convert.c
* app/core/gimpimage-merge.c
* app/core/gimpimage.c
* app/core/gimpimagefile.c
* app/core/gimplayer-floating-sel.c
* app/core/gimplayer.c
* app/core/gimpselection.c
* app/dialogs/convert-dialog.c
* app/dialogs/dialogs.c
* app/dialogs/palette-import-dialog.c
* app/dialogs/preferences-dialog.c
* app/dialogs/quit-dialog.c
* app/dialogs/stroke-dialog.c
* app/display/gimpdisplayshell-dnd.c
* app/file/file-open.c
* app/file/file-procedure.c
* app/file/file-save.c
* app/file/file-utils.c
* app/gegl/gimpcurvesconfig.c
* app/gegl/gimplevelsconfig.c
* app/gui/gui-message.c
* app/gui/gui.c
* app/gui/session.c
* app/paint/gimpbrushcore.c
* app/paint/gimpclone.c
* app/paint/gimpheal.c
* app/paint/gimpperspectiveclone.c
* app/paint/gimpsourcecore.c
* app/pdb/gimppdb-utils.c
* app/pdb/gimpprocedure.c
* app/plug-in/gimpplugin-message.c
* app/plug-in/gimpplugin.c
* app/plug-in/gimppluginmanager-restore.c
* app/plug-in/gimppluginprocedure.c
* app/text/gimptextlayer.c
* app/tools/gimp-tools.c
* app/tools/gimpaligntool.c
* app/tools/gimpblendtool.c
* app/tools/gimpbrightnesscontrasttool.c
* app/tools/gimpbucketfilltool.c
* app/tools/gimpcolorbalancetool.c
* app/tools/gimpcolorpickertool.c
* app/tools/gimpcurvestool.c
* app/tools/gimpdesaturatetool.c
* app/tools/gimpeditselectiontool.c
* app/tools/gimpforegroundselecttool.c
* app/tools/gimpfreeselecttool.c
* app/tools/gimpgegltool.c
* app/tools/gimphuesaturationtool.c
* app/tools/gimpimagemaptool-settings.c
* app/tools/gimpiscissorstool.c
* app/tools/gimplevelstool.c
* app/tools/gimpmeasuretool.c
* app/tools/gimppainttool.c
* app/tools/gimpposterizetool.c
* app/tools/gimpselectiontool.c
* app/tools/gimpsourcetool.c
* app/tools/gimpthresholdtool.c
* app/tools/gimptransformtool.c
* app/tools/gimpvectortool.c
* app/widgets/gimpactionview.c
* app/widgets/gimpcontrollerlist.c
* app/widgets/gimpcontrollers.c
* app/widgets/gimpdataeditor.c
* app/widgets/gimpdevices.c
* app/widgets/gimpdnd-xds.c
* app/widgets/gimperrordialog.c
* app/widgets/gimphelp.c
* app/widgets/gimpitemtreeview.c
* app/widgets/gimppdbdialog.c
* app/widgets/gimpsettingsbox.c
* app/widgets/gimpvectorstreeview.c
* app/widgets/gimpwidgets-utils.c
* app/xcf/xcf-load.c
* tools/pdbgen/pdb/convert.pdb
* tools/pdbgen/pdb/edit.pdb
* tools/pdbgen/pdb/floating_sel.pdb
* tools/pdbgen/pdb/image.pdb: use the _literal variants for
g_set_error(), gimp_message() and gimp_tool_message().
* app/pdb/convert-cmds.c
* app/pdb/edit-cmds.c
* app/pdb/floating-sel-cmds.c
* app/pdb/image-cmds.c: regenerated.
Modified:
trunk/ChangeLog
trunk/INSTALL
trunk/app/actions/debug-commands.c
trunk/app/actions/documents-commands.c
trunk/app/actions/drawable-commands.c
trunk/app/actions/edit-commands.c
trunk/app/actions/error-console-commands.c
trunk/app/actions/file-commands.c
trunk/app/actions/gradients-commands.c
trunk/app/actions/image-commands.c
trunk/app/actions/layers-commands.c
trunk/app/actions/palettes-commands.c
trunk/app/actions/plug-in-commands.c
trunk/app/actions/select-commands.c
trunk/app/actions/vectors-commands.c
trunk/app/config/gimprc.c
trunk/app/core/gimp-modules.c
trunk/app/core/gimp-parasites.c
trunk/app/core/gimp-templates.c
trunk/app/core/gimp-units.c
trunk/app/core/gimp.c
trunk/app/core/gimp.h
trunk/app/core/gimpchannel.c
trunk/app/core/gimpcontainer-filter.c
trunk/app/core/gimpdrawable-bucket-fill.c
trunk/app/core/gimpimage-convert.c
trunk/app/core/gimpimage-merge.c
trunk/app/core/gimpimage.c
trunk/app/core/gimpimagefile.c
trunk/app/core/gimplayer-floating-sel.c
trunk/app/core/gimplayer.c
trunk/app/core/gimpselection.c
trunk/app/dialogs/convert-dialog.c
trunk/app/dialogs/dialogs.c
trunk/app/dialogs/palette-import-dialog.c
trunk/app/dialogs/preferences-dialog.c
trunk/app/dialogs/quit-dialog.c
trunk/app/dialogs/stroke-dialog.c
trunk/app/display/gimpdisplayshell-dnd.c
trunk/app/errors.c
trunk/app/errors.h
trunk/app/file/file-open.c
trunk/app/file/file-procedure.c
trunk/app/file/file-save.c
trunk/app/file/file-utils.c
trunk/app/gegl/gimpcurvesconfig.c
trunk/app/gegl/gimplevelsconfig.c
trunk/app/gui/gui-message.c
trunk/app/gui/gui.c
trunk/app/gui/session.c
trunk/app/paint/gimpbrushcore.c
trunk/app/paint/gimpclone.c
trunk/app/paint/gimpheal.c
trunk/app/paint/gimpperspectiveclone.c
trunk/app/paint/gimpsourcecore.c
trunk/app/pdb/convert-cmds.c
trunk/app/pdb/edit-cmds.c
trunk/app/pdb/floating-sel-cmds.c
trunk/app/pdb/gimppdb-utils.c
trunk/app/pdb/gimpprocedure.c
trunk/app/pdb/image-cmds.c
trunk/app/plug-in/gimpplugin-message.c
trunk/app/plug-in/gimpplugin.c
trunk/app/plug-in/gimppluginmanager-restore.c
trunk/app/plug-in/gimppluginprocedure.c
trunk/app/text/gimptextlayer.c
trunk/app/tools/gimp-tools.c
trunk/app/tools/gimpaligntool.c
trunk/app/tools/gimpblendtool.c
trunk/app/tools/gimpbrightnesscontrasttool.c
trunk/app/tools/gimpbucketfilltool.c
trunk/app/tools/gimpcolorbalancetool.c
trunk/app/tools/gimpcolorpickertool.c
trunk/app/tools/gimpcurvestool.c
trunk/app/tools/gimpdesaturatetool.c
trunk/app/tools/gimpeditselectiontool.c
trunk/app/tools/gimpforegroundselecttool.c
trunk/app/tools/gimpfreeselecttool.c
trunk/app/tools/gimpgegltool.c
trunk/app/tools/gimphuesaturationtool.c
trunk/app/tools/gimpimagemaptool-settings.c
trunk/app/tools/gimpiscissorstool.c
trunk/app/tools/gimplevelstool.c
trunk/app/tools/gimpmeasuretool.c
trunk/app/tools/gimppainttool.c
trunk/app/tools/gimpposterizetool.c
trunk/app/tools/gimpselectiontool.c
trunk/app/tools/gimpsourcetool.c
trunk/app/tools/gimpthresholdtool.c
trunk/app/tools/gimptool.c
trunk/app/tools/gimptool.h
trunk/app/tools/gimptransformtool.c
trunk/app/tools/gimpvectortool.c
trunk/app/widgets/gimpactionview.c
trunk/app/widgets/gimpcontrollerlist.c
trunk/app/widgets/gimpcontrollers.c
trunk/app/widgets/gimpdataeditor.c
trunk/app/widgets/gimpdevices.c
trunk/app/widgets/gimpdnd-xds.c
trunk/app/widgets/gimperrordialog.c
trunk/app/widgets/gimphelp.c
trunk/app/widgets/gimpitemtreeview.c
trunk/app/widgets/gimppdbdialog.c
trunk/app/widgets/gimpsettingsbox.c
trunk/app/widgets/gimpvectorstreeview.c
trunk/app/widgets/gimpwidgets-utils.c
trunk/app/xcf/xcf-load.c
trunk/configure.in
trunk/tools/pdbgen/pdb/convert.pdb
trunk/tools/pdbgen/pdb/edit.pdb
trunk/tools/pdbgen/pdb/floating_sel.pdb
trunk/tools/pdbgen/pdb/image.pdb
Modified: trunk/INSTALL
==============================================================================
--- trunk/INSTALL (original)
+++ trunk/INSTALL Tue Nov 4 12:33:09 2008
@@ -1,19 +1,19 @@
--------------------------------------
-Installation instructions for GIMP 2.6
+Installation instructions for GIMP 2.7
--------------------------------------
There are some basic steps to building and installing GIMP.
-GIMP 2.6 replaces earlier GIMP 2.x versions. It is advised that you
-uninstall them before installing GIMP 2.6. If you want to keep your
-older GIMP 2.x installation in parallel to GIMP 2.6, you have to
+GIMP 2.7 replaces earlier GIMP 2.x versions. It is advised that you
+uninstall them before installing GIMP 2.7. If you want to keep your
+older GIMP 2.x installation in parallel to GIMP 2.7, you have to
choose a separate prefix which is not in your default library search
path.
-GIMP 2.6 is fully backward compatible to all earlier GIMP 2.x version.
-Plug-ins and scripts written for GIMP 2.4, or GIMP 2.2 or even 2.0,
+GIMP 2.7 is fully backward compatible to all earlier GIMP 2.x version.
+Plug-ins and scripts written for GIMP 2.6 or earlier GIMP 2.x versions
will continue to work and don't need to be changed nor recompiled to
-be used with GIMP 2.x.
+be used with GIMP 2.7.
The most important part is to make sure the requirements for a build
are fulfilled. We depend on a number of tools and libraries which are
@@ -42,7 +42,7 @@
http://svn.gnome.org/svn/gegl/trunk
4. You need to have installed GTK+ version 2.12.5 or newer. GIMP
- also need a recent versions of GLib (>= 2.16.1) and Pango (>= 1.18.0).
+ also need a recent versions of GLib (>= 2.18.0) and Pango (>= 1.20.1).
Sources for these can be grabbed from ftp://ftp.gtk.org/.
5. We use cairo, which is hosted at http://www.cairographics.org/.
@@ -82,9 +82,9 @@
of make, we'd appreciate if you'd send us a patch with the changes.
13. Install GIMP by running `make install'. In order to avoid clashes
- with other versions of GIMP, we install a binary called gimp-2.6.
+ with other versions of GIMP, we install a binary called gimp-2.7.
By default there's also a link created so that you can type 'gimp'
- to start gimp-2.6.
+ to start gimp-2.7.
Please make sure you don't have any old GTK+-2.x, jpeg, etc. libraries
lying around on your system, otherwise configure may fail to find the
@@ -96,8 +96,8 @@
might be used to build and install GIMP. The actual configuration,
compilation and installation output is not shown.
- % tar xvfz gimp-2.6.x.tar.gz # unpack the sources
- % cd gimp-2.6.x # change to the toplevel directory
+ % tar xvfz gimp-2.7.x.tar.gz # unpack the sources
+ % cd gimp-2.7.x # change to the toplevel directory
% ./configure # run the `configure' script
% make # build GIMP
% make install # install GIMP
@@ -132,8 +132,8 @@
is intended primarily as a convenience for developers.
--enable-gimpdir=DIR. This option changes the default directory
- GIMP uses to search for its configuration files from ~/.gimp-2.6
- (the directory .gimp-2.6 in the users home directory) to DIR.
+ GIMP uses to search for its configuration files from ~/.gimp-2.7
+ (the directory .gimp-2.7 in the users home directory) to DIR.
--enable-binreloc. When compiled for Linux with this option enabled,
GIMP will be binary relocatable. Plug-ins and data files will
@@ -236,8 +236,8 @@
if you call configure with --without-desktop-dir.
--disable-default-binary. Use this option if you don't want to make
- gimp-2.6 the default gimp installation. Otherwise a link called
- gimp pointing to the gimp-2.6 executable will be installed.
+ gimp-2.7 the default gimp installation. Otherwise a link called
+ gimp pointing to the gimp-2.7 executable will be installed.
--disable-gimp-console. Use this option if you don't want the
gimp-console binary to be built in addition to the standard binary.
@@ -258,7 +258,7 @@
- A bunch of public libraries in the directories starting with 'libgimp'.
- The plug-in programs in the 'plug-ins' directory.
- Some modules in the 'modules' subdirectory.
- - The main GIMP program 'gimp-2.6' in `app'.
+ - The main GIMP program 'gimp-2.7' in `app'.
The `make install' commands installs the gimp header files associated
with the libgimp libraries, the plug-ins, some data files and the GIMP
Modified: trunk/app/actions/debug-commands.c
==============================================================================
--- trunk/app/actions/debug-commands.c (original)
+++ trunk/app/actions/debug-commands.c Tue Nov 4 12:33:09 2008
@@ -176,7 +176,8 @@
if (managers)
{
- g_print ("\n\n========================================\n"
+ g_print ("\n\n"
+ "========================================\n"
"UI Manager: %s\n"
"========================================\n\n",
entry->identifier);
Modified: trunk/app/actions/documents-commands.c
==============================================================================
--- trunk/app/actions/documents-commands.c (original)
+++ trunk/app/actions/documents-commands.c Tue Nov 4 12:33:09 2008
@@ -235,8 +235,8 @@
if (! gtk_recent_manager_purge_items (gtk_recent_manager_get_default (),
&error))
{
- gimp_message (gimp, G_OBJECT (dialog), GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (gimp, G_OBJECT (dialog), GIMP_MESSAGE_ERROR,
+ error->message);
g_clear_error (&error);
}
}
Modified: trunk/app/actions/drawable-commands.c
==============================================================================
--- trunk/app/actions/drawable-commands.c (original)
+++ trunk/app/actions/drawable-commands.c Tue Nov 4 12:33:09 2008
@@ -59,8 +59,9 @@
if (gimp_drawable_is_indexed (drawable))
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- _("Equalize does not operate on indexed layers."));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ _("Equalize does not operate on indexed layers."));
return;
}
@@ -82,8 +83,9 @@
if (gimp_drawable_is_indexed (drawable))
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- _("Invert does not operate on indexed layers."));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ _("Invert does not operate on indexed layers."));
return;
}
@@ -105,8 +107,9 @@
if (! gimp_drawable_is_rgb (drawable))
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- _("White Balance operates only on RGB color layers."));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ _("White Balance operates only on RGB color layers."));
return;
}
Modified: trunk/app/actions/edit-commands.c
==============================================================================
--- trunk/app/actions/edit-commands.c (original)
+++ trunk/app/actions/edit-commands.c Tue Nov 4 12:33:09 2008
@@ -198,15 +198,18 @@
GimpDisplay *display = action_data_get_display (data);
if (display)
- gimp_message (image->gimp, G_OBJECT (display), GIMP_MESSAGE_INFO,
- _("Cut pixels to the clipboard"));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (display), GIMP_MESSAGE_INFO,
+ _("Cut pixels to the clipboard"));
gimp_image_flush (image);
}
else
{
- gimp_message (image->gimp, G_OBJECT (action_data_get_display (data)),
- GIMP_MESSAGE_WARNING, "%s", error->message);
+ gimp_message_literal (image->gimp,
+ G_OBJECT (action_data_get_display (data)),
+ GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
}
}
@@ -225,15 +228,18 @@
GimpDisplay *display = action_data_get_display (data);
if (display)
- gimp_message (image->gimp, G_OBJECT (display), GIMP_MESSAGE_INFO,
- _("Copied pixels to the clipboard"));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (display), GIMP_MESSAGE_INFO,
+ _("Copied pixels to the clipboard"));
gimp_image_flush (image);
}
else
{
- gimp_message (image->gimp, G_OBJECT (action_data_get_display (data)),
- GIMP_MESSAGE_WARNING, "%s", error->message);
+ gimp_message_literal (image->gimp,
+ G_OBJECT (action_data_get_display (data)),
+ GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
}
}
@@ -251,15 +257,18 @@
GimpDisplay *display = action_data_get_display (data);
if (display)
- gimp_message (image->gimp, G_OBJECT (display), GIMP_MESSAGE_INFO,
- _("Copied pixels to the clipboard"));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (display), GIMP_MESSAGE_INFO,
+ _("Copied pixels to the clipboard"));
gimp_image_flush (image);
}
else
{
- gimp_message (image->gimp, G_OBJECT (action_data_get_display (data)),
- GIMP_MESSAGE_WARNING, "%s", error->message);
+ gimp_message_literal (image->gimp,
+ G_OBJECT (action_data_get_display (data)),
+ GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
}
}
@@ -312,8 +321,8 @@
}
else
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_WARNING,
- _("There is no image data in the clipboard to paste."));
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING,
+ _("There is no image data in the clipboard to paste."));
}
}
@@ -346,8 +355,8 @@
}
else
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_WARNING,
- _("There is no image data in the clipboard to paste."));
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING,
+ _("There is no image data in the clipboard to paste."));
}
}
@@ -521,9 +530,9 @@
}
else
{
- gimp_message (display->image->gimp, G_OBJECT (display),
- GIMP_MESSAGE_WARNING,
- _("There is no image data in the clipboard to paste."));
+ gimp_message_literal (display->image->gimp, G_OBJECT (display),
+ GIMP_MESSAGE_WARNING,
+ _("There is no image data in the clipboard to paste."));
}
}
}
@@ -539,8 +548,8 @@
if (! drawable)
{
- gimp_message (image->gimp, NULL, GIMP_MESSAGE_WARNING,
- _("There is no active layer or channel to cut from."));
+ gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
+ _("There is no active layer or channel to cut from."));
return;
}
@@ -554,8 +563,8 @@
}
else
{
- gimp_message (image->gimp, NULL, GIMP_MESSAGE_WARNING,
- "%s", error->message);
+ gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
}
}
@@ -571,8 +580,8 @@
if (! drawable)
{
- gimp_message (image->gimp, NULL, GIMP_MESSAGE_WARNING,
- _("There is no active layer or channel to copy from."));
+ gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
+ _("There is no active layer or channel to copy from."));
return;
}
@@ -586,8 +595,8 @@
}
else
{
- gimp_message (image->gimp, NULL, GIMP_MESSAGE_WARNING,
- "%s", error->message);
+ gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
}
}
@@ -611,8 +620,8 @@
}
else
{
- gimp_message (image->gimp, NULL, GIMP_MESSAGE_WARNING,
- "%s", error->message);
+ gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
}
}
Modified: trunk/app/actions/error-console-commands.c
==============================================================================
--- trunk/app/actions/error-console-commands.c (original)
+++ trunk/app/actions/error-console-commands.c Tue Nov 4 12:33:09 2008
@@ -80,8 +80,9 @@
if (value && ! gtk_text_buffer_get_selection_bounds (console->text_buffer,
NULL, NULL))
{
- gimp_message (console->gimp, G_OBJECT (console), GIMP_MESSAGE_WARNING,
- _("Cannot save. Nothing is selected."));
+ gimp_message_literal (console->gimp,
+ G_OBJECT (console), GIMP_MESSAGE_WARNING,
+ _("Cannot save. Nothing is selected."));
return;
}
Modified: trunk/app/actions/file-commands.c
==============================================================================
--- trunk/app/actions/file-commands.c (original)
+++ trunk/app/actions/file-commands.c Tue Nov 4 12:33:09 2008
@@ -262,9 +262,9 @@
break;
case GIMP_PDB_CANCEL:
- gimp_message (image->gimp, G_OBJECT (display),
- GIMP_MESSAGE_INFO,
- _("Saving canceled"));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (display), GIMP_MESSAGE_INFO,
+ _("Saving canceled"));
break;
default:
@@ -297,8 +297,9 @@
}
else
{
- gimp_message (image->gimp, G_OBJECT (display),
- GIMP_MESSAGE_INFO, _("No changes need to be saved"));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (display), GIMP_MESSAGE_INFO,
+ _("No changes need to be saved"));
saved = TRUE;
break;
}
@@ -360,9 +361,10 @@
if (! uri)
{
- gimp_message (image->gimp, G_OBJECT (display), GIMP_MESSAGE_ERROR,
- _("Revert failed. "
- "No file name associated with this image."));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (display), GIMP_MESSAGE_ERROR,
+ _("Revert failed. "
+ "No file name associated with this image."));
}
else if (dialog)
{
Modified: trunk/app/actions/gradients-commands.c
==============================================================================
--- trunk/app/actions/gradients-commands.c (original)
+++ trunk/app/actions/gradients-commands.c Tue Nov 4 12:33:09 2008
@@ -130,10 +130,9 @@
if (! gimp_gradient_save_pov (gradient, filename, &error))
{
- gimp_message (g_object_get_data (G_OBJECT (dialog), "gimp"),
- G_OBJECT (dialog),
- GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (g_object_get_data (G_OBJECT (dialog), "gimp"),
+ G_OBJECT (dialog), GIMP_MESSAGE_ERROR,
+ error->message);
g_clear_error (&error);
return;
}
Modified: trunk/app/actions/image-commands.c
==============================================================================
--- trunk/app/actions/image-commands.c (original)
+++ trunk/app/actions/image-commands.c Tue Nov 4 12:33:09 2008
@@ -174,8 +174,9 @@
if (! gimp_image_convert (image, value, 0, 0, FALSE, FALSE, 0, NULL,
NULL, &error))
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- error->message);
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
return;
}
@@ -405,8 +406,9 @@
if (! gimp_channel_bounds (gimp_image_get_mask (image),
&x1, &y1, &x2, &y2))
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- _("Cannot crop because the current selection is empty."));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ _("Cannot crop because the current selection is empty."));
return;
}
Modified: trunk/app/actions/layers-commands.c
==============================================================================
--- trunk/app/actions/layers-commands.c (original)
+++ trunk/app/actions/layers-commands.c Tue Nov 4 12:33:09 2008
@@ -234,8 +234,9 @@
if (! floating_sel_to_layer (floating_sel, &error))
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- error->message);
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
return;
}
@@ -286,8 +287,8 @@
if (! floating_sel_to_layer (floating_sel, &error))
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- error->message);
+ gimp_message_literal (image->gimp, G_OBJECT (widget),
+ GIMP_MESSAGE_WARNING, error->message);
g_clear_error (&error);
return;
}
@@ -636,8 +637,9 @@
if (! gimp_channel_bounds (gimp_image_get_mask (image),
&x1, &y1, &x2, &y2))
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- _("Cannot crop because the current selection is empty."));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ _("Cannot crop because the current selection is empty."));
return;
}
@@ -997,9 +999,9 @@
}
else
{
- gimp_message (dialog->image->gimp, G_OBJECT (widget),
- GIMP_MESSAGE_WARNING,
- "%s", error->message);
+ gimp_message_literal (dialog->image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
return;
@@ -1033,8 +1035,9 @@
if (dialog->add_mask_type == GIMP_ADD_CHANNEL_MASK &&
! dialog->channel)
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- _("Please select a channel first"));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ _("Please select a channel first"));
return;
}
Modified: trunk/app/actions/palettes-commands.c
==============================================================================
--- trunk/app/actions/palettes-commands.c (original)
+++ trunk/app/actions/palettes-commands.c Tue Nov 4 12:33:09 2008
@@ -107,9 +107,10 @@
if (! sel_list)
{
- gimp_message (gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- "Can't merge palettes because "
- "there are no palettes selected.");
+ gimp_message_literal (gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ "Can't merge palettes because "
+ "there are no palettes selected.");
return;
}
Modified: trunk/app/actions/plug-in-commands.c
==============================================================================
--- trunk/app/actions/plug-in-commands.c (original)
+++ trunk/app/actions/plug-in-commands.c Tue Nov 4 12:33:09 2008
@@ -307,8 +307,9 @@
if (error)
{
- gimp_message (gimp, G_OBJECT (display), GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (display), GIMP_MESSAGE_ERROR,
+ error->message);
g_error_free (error);
}
else
Modified: trunk/app/actions/select-commands.c
==============================================================================
--- trunk/app/actions/select-commands.c (original)
+++ trunk/app/actions/select-commands.c Tue Nov 4 12:33:09 2008
@@ -133,8 +133,9 @@
}
else
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- "%s", error->message);
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
}
}
@@ -327,8 +328,9 @@
if (! drawable)
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- _("There is no active layer or channel to stroke to."));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ _("There is no active layer or channel to stroke to."));
return;
}
@@ -359,8 +361,9 @@
if (! drawable)
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- _("There is no active layer or channel to stroke to."));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ _("There is no active layer or channel to stroke to."));
return;
}
@@ -374,8 +377,9 @@
if (! gimp_item_stroke (GIMP_ITEM (gimp_image_get_mask (image)),
drawable, context, options, FALSE, TRUE, NULL, &error))
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- error->message);
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
}
else
Modified: trunk/app/actions/vectors-commands.c
==============================================================================
--- trunk/app/actions/vectors-commands.c (original)
+++ trunk/app/actions/vectors-commands.c Tue Nov 4 12:33:09 2008
@@ -281,8 +281,9 @@
if (! gimp_image_merge_visible_vectors (image, &error))
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- error->message);
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
return;
}
@@ -332,8 +333,9 @@
if (! procedure)
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_ERROR,
- "Selection to path procedure lookup failed.");
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_ERROR,
+ "Selection to path procedure lookup failed.");
return;
}
@@ -354,8 +356,9 @@
if (error)
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_ERROR,
+ error->message);
g_error_free (error);
}
}
@@ -376,8 +379,9 @@
if (! drawable)
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- _("There is no active layer or channel to stroke to."));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ _("There is no active layer or channel to stroke to."));
return;
}
@@ -409,8 +413,9 @@
if (! drawable)
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- _("There is no active layer or channel to stroke to."));
+ gimp_message_literal (image->gimp,
+ G_OBJECT (widget), GIMP_MESSAGE_WARNING,
+ _("There is no active layer or channel to stroke to."));
return;
}
@@ -425,8 +430,8 @@
if (! gimp_item_stroke (GIMP_ITEM (vectors), drawable, context, options, FALSE,
TRUE, NULL, &error))
{
- gimp_message (image->gimp, G_OBJECT (widget), GIMP_MESSAGE_WARNING,
- error->message);
+ gimp_message_literal (image->gimp, G_OBJECT (widget),
+ GIMP_MESSAGE_WARNING, error->message);
g_clear_error (&error);
}
else
Modified: trunk/app/config/gimprc.c
==============================================================================
--- trunk/app/config/gimprc.c (original)
+++ trunk/app/config/gimprc.c Tue Nov 4 12:33:09 2008
@@ -264,7 +264,7 @@
rc->system_gimprc, NULL, &error))
{
if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
- g_message (error->message);
+ g_message ("%s", error->message);
g_clear_error (&error);
}
@@ -278,7 +278,7 @@
{
if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
{
- g_message (error->message);
+ g_message ("%s", error->message);
gimp_config_file_backup_on_error (rc->user_gimprc, "gimprc", NULL);
}
@@ -524,7 +524,7 @@
header, footer, global,
&error))
{
- g_message (error->message);
+ g_message ("%s", error->message);
g_error_free (error);
}
Modified: trunk/app/core/gimp-modules.c
==============================================================================
--- trunk/app/core/gimp-modules.c (original)
+++ trunk/app/core/gimp-modules.c Tue Nov 4 12:33:09 2008
@@ -138,7 +138,7 @@
if (error)
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error);
}
@@ -214,7 +214,7 @@
if (error)
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error);
}
}
Modified: trunk/app/core/gimp-parasites.c
==============================================================================
--- trunk/app/core/gimp-parasites.c (original)
+++ trunk/app/core/gimp-parasites.c Tue Nov 4 12:33:09 2008
@@ -117,7 +117,7 @@
filename, NULL, &error))
{
if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_error_free (error);
}
@@ -151,7 +151,7 @@
header, footer, NULL,
&error))
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_error_free (error);
}
Modified: trunk/app/core/gimp-templates.c
==============================================================================
--- trunk/app/core/gimp-templates.c (original)
+++ trunk/app/core/gimp-templates.c Tue Nov 4 12:33:09 2008
@@ -63,13 +63,13 @@
if (! gimp_config_deserialize_file (GIMP_CONFIG (gimp->templates),
filename, NULL, &error))
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR,
+ error->message);
}
}
else
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
}
g_clear_error (&error);
@@ -106,7 +106,7 @@
header, footer, NULL,
&error))
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_error_free (error);
}
Modified: trunk/app/core/gimp-units.c
==============================================================================
--- trunk/app/core/gimp-units.c (original)
+++ trunk/app/core/gimp-units.c Tue Nov 4 12:33:09 2008
@@ -163,7 +163,7 @@
g_scanner_unexp_token (scanner, token, NULL, NULL, NULL,
_("fatal parse error"), TRUE);
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error);
gimp_config_file_backup_on_error (filename, "unitrc", NULL);
@@ -256,7 +256,7 @@
if (! gimp_config_writer_finish (writer, "end of units", &error))
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error);
}
}
Modified: trunk/app/core/gimp.c
==============================================================================
--- trunk/app/core/gimp.c (original)
+++ trunk/app/core/gimp.c Tue Nov 4 12:33:09 2008
@@ -1107,6 +1107,19 @@
}
void
+gimp_message_literal (Gimp *gimp,
+ GObject *handler,
+ GimpMessageSeverity severity,
+ const gchar *message)
+{
+ g_return_if_fail (GIMP_IS_GIMP (gimp));
+ g_return_if_fail (handler == NULL || G_IS_OBJECT (handler));
+ g_return_if_fail (message != NULL);
+
+ gimp_show_message (gimp, handler, severity, NULL, message);
+}
+
+void
gimp_image_opened (Gimp *gimp,
const gchar *uri)
{
Modified: trunk/app/core/gimp.h
==============================================================================
--- trunk/app/core/gimp.h (original)
+++ trunk/app/core/gimp.h Tue Nov 4 12:33:09 2008
@@ -195,6 +195,10 @@
GimpMessageSeverity severity,
const gchar *format,
va_list args);
+void gimp_message_literal (Gimp *gimp,
+ GObject *handler,
+ GimpMessageSeverity severity,
+ const gchar *message);
void gimp_image_opened (Gimp *gimp,
const gchar *uri);
Modified: trunk/app/core/gimpchannel.c
==============================================================================
--- trunk/app/core/gimpchannel.c (original)
+++ trunk/app/core/gimpchannel.c Tue Nov 4 12:33:09 2008
@@ -712,8 +712,8 @@
&n_segs_in, &n_segs_out,
0, 0, 0, 0))
{
- g_set_error (error, 0, 0,
- _("Cannot stroke empty channel."));
+ g_set_error_literal (error, 0, 0,
+ _("Cannot stroke empty channel."));
return FALSE;
}
Modified: trunk/app/core/gimpcontainer-filter.c
==============================================================================
--- trunk/app/core/gimpcontainer-filter.c (original)
+++ trunk/app/core/gimpcontainer-filter.c Tue Nov 4 12:33:09 2008
@@ -166,7 +166,7 @@
}
else
{
- g_warning (error->message);
+ g_warning ("%s", error->message);
g_error_free (error);
*length = 0;
Modified: trunk/app/core/gimpdrawable-bucket-fill.c
==============================================================================
--- trunk/app/core/gimpdrawable-bucket-fill.c (original)
+++ trunk/app/core/gimpdrawable-bucket-fill.c Tue Nov 4 12:33:09 2008
@@ -87,8 +87,8 @@
if (! pattern)
{
- g_set_error (error, 0, 0,
- _("No patterns available for this operation."));
+ g_set_error_literal (error, 0, 0,
+ _("No patterns available for this operation."));
return FALSE;
}
}
Modified: trunk/app/core/gimpimage-convert.c
==============================================================================
--- trunk/app/core/gimpimage-convert.c (original)
+++ trunk/app/core/gimpimage-convert.c Tue Nov 4 12:33:09 2008
@@ -788,8 +788,8 @@
if (custom_palette->n_colors < 1)
{
- g_set_error (error, 0, 0,
- _("Cannot convert image: palette is empty."));
+ g_set_error_literal (error, 0, 0,
+ _("Cannot convert image: palette is empty."));
return FALSE;
}
}
Modified: trunk/app/core/gimpimage-merge.c
==============================================================================
--- trunk/app/core/gimpimage-merge.c (original)
+++ trunk/app/core/gimpimage-merge.c Tue Nov 4 12:33:09 2008
@@ -285,9 +285,9 @@
}
else
{
- g_set_error (error, 0, 0,
- _("Not enough visible paths for a merge. "
- "There must be at least two."));
+ g_set_error_literal (error, 0, 0,
+ _("Not enough visible paths for a merge. "
+ "There must be at least two."));
return NULL;
}
}
Modified: trunk/app/core/gimpimage.c
==============================================================================
--- trunk/app/core/gimpimage.c (original)
+++ trunk/app/core/gimpimage.c Tue Nov 4 12:33:09 2008
@@ -3113,7 +3113,7 @@
if (index == 0)
{
- g_set_error (error, 0, 0, "%s", _("Layer cannot be raised higher."));
+ g_set_error_literal (error, 0, 0, _("Layer cannot be raised higher."));
return FALSE;
}
@@ -3137,7 +3137,7 @@
if (index == gimp_container_num_children (image->layers) - 1)
{
- g_set_error (error, 0, 0, "%s", _("Layer cannot be lowered more."));
+ g_set_error_literal (error, 0, 0, _("Layer cannot be lowered more."));
return FALSE;
}
@@ -3343,7 +3343,7 @@
if (index == 0)
{
- g_set_error (error, 0, 0, "%s", _("Channel cannot be raised higher."));
+ g_set_error_literal (error, 0, 0, _("Channel cannot be raised higher."));
return FALSE;
}
@@ -3379,7 +3379,7 @@
if (index == gimp_container_num_children (image->channels) - 1)
{
- g_set_error (error, 0, 0, "%s", _("Channel cannot be lowered more."));
+ g_set_error_literal (error, 0, 0, _("Channel cannot be lowered more."));
return FALSE;
}
@@ -3551,7 +3551,7 @@
if (index == 0)
{
- g_set_error (error, 0, 0, "%s", _("Path cannot be raised higher."));
+ g_set_error_literal (error, 0, 0, _("Path cannot be raised higher."));
return FALSE;
}
@@ -3586,7 +3586,7 @@
if (index == gimp_container_num_children (image->vectors) - 1)
{
- g_set_error (error, 0, 0, "%s", _("Path cannot be lowered more."));
+ g_set_error_literal (error, 0, 0, _("Path cannot be lowered more."));
return FALSE;
}
Modified: trunk/app/core/gimpimagefile.c
==============================================================================
--- trunk/app/core/gimpimagefile.c (original)
+++ trunk/app/core/gimpimagefile.c Tue Nov 4 12:33:09 2008
@@ -301,9 +301,9 @@
if (! success)
{
- gimp_message (imagefile->gimp, G_OBJECT (progress),
- GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (imagefile->gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_ERROR,
+ error->message);
g_clear_error (&error);
}
}
@@ -401,8 +401,8 @@
&error);
if (! success)
{
- gimp_message (imagefile->gimp, NULL, GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (imagefile->gimp, NULL, GIMP_MESSAGE_ERROR,
+ error->message);
g_clear_error (&error);
}
}
Modified: trunk/app/core/gimplayer-floating-sel.c
==============================================================================
--- trunk/app/core/gimplayer-floating-sel.c (original)
+++ trunk/app/core/gimplayer-floating-sel.c Tue Nov 4 12:33:09 2008
@@ -201,9 +201,10 @@
/* Check if the floating layer belongs to a channel... */
if (GIMP_IS_CHANNEL (layer->fs.drawable))
{
- g_set_error (error, 0, 0,
- _("Cannot create a new layer from the floating selection "
- "because it belongs to a layer mask or channel."));
+ g_set_error_literal (error, 0, 0,
+ _("Cannot create a new layer from the floating "
+ "selection because it belongs to a layer mask "
+ "or channel."));
return FALSE;
}
Modified: trunk/app/core/gimplayer.c
==============================================================================
--- trunk/app/core/gimplayer.c (original)
+++ trunk/app/core/gimplayer.c Tue Nov 4 12:33:09 2008
@@ -705,9 +705,10 @@
{
if (GIMP_IS_CHANNEL (layer->fs.drawable))
{
- g_set_error (error, 0, 0,
- _("Cannot create a new layer from the floating selection "
- "because it belongs to a layer mask or channel."));
+ g_set_error_literal (error, 0, 0,
+ _("Cannot create a new layer from the floating "
+ "selection because it belongs to a layer mask "
+ "or channel."));
return FALSE;
}
@@ -1329,9 +1330,9 @@
if (layer->mask)
{
- g_set_error (error, 0, 0,
- _("Unable to add a layer mask since "
- "the layer already has one."));
+ g_set_error_literal (error, 0, 0,
+ _("Unable to add a layer mask since "
+ "the layer already has one."));
return NULL;
}
@@ -1340,9 +1341,9 @@
(gimp_item_get_height (GIMP_ITEM (layer)) !=
gimp_item_get_height (GIMP_ITEM (mask))))
{
- g_set_error (error, 0, 0,
- _("Cannot add layer mask of different "
- "dimensions than specified layer."));
+ g_set_error_literal (error, 0, 0,
+ _("Cannot add layer mask of different "
+ "dimensions than specified layer."));
return NULL;
}
Modified: trunk/app/core/gimpselection.c
==============================================================================
--- trunk/app/core/gimpselection.c (original)
+++ trunk/app/core/gimpselection.c Tue Nov 4 12:33:09 2008
@@ -271,8 +271,8 @@
&num_dummy_in, &num_dummy_out,
0, 0, 0, 0))
{
- g_set_error (error, 0, 0,
- _("There is no selection to stroke."));
+ g_set_error_literal (error, 0, 0,
+ _("There is no selection to stroke."));
return FALSE;
}
@@ -659,9 +659,9 @@
if (non_empty && ((x1 == x2) || (y1 == y2)))
{
- g_set_error (error, 0, 0,
- _("Unable to cut or copy because the "
- "selected region is empty."));
+ g_set_error_literal (error, 0, 0,
+ _("Unable to cut or copy because the "
+ "selected region is empty."));
return NULL;
}
@@ -835,9 +835,9 @@
if (! gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2) ||
(x1 == x2 || y1 == y2))
{
- g_set_error (error, 0, 0,
- _("Cannot float selection because the selected region "
- "is empty."));
+ g_set_error_literal (error, 0, 0,
+ _("Cannot float selection because the selected "
+ "region is empty."));
return NULL;
}
Modified: trunk/app/dialogs/convert-dialog.c
==============================================================================
--- trunk/app/dialogs/convert-dialog.c (original)
+++ trunk/app/dialogs/convert-dialog.c Tue Nov 4 12:33:09 2008
@@ -298,9 +298,8 @@
dialog->custom_palette,
progress, &error))
{
- gimp_message (dialog->image->gimp, G_OBJECT (dialog->dialog),
- GIMP_MESSAGE_WARNING,
- error->message);
+ gimp_message_literal (dialog->image->gimp, G_OBJECT (dialog->dialog),
+ GIMP_MESSAGE_WARNING, error->message);
g_clear_error (&error);
if (progress)
Modified: trunk/app/dialogs/dialogs.c
==============================================================================
--- trunk/app/dialogs/dialogs.c (original)
+++ trunk/app/dialogs/dialogs.c Tue Nov 4 12:33:09 2008
@@ -376,7 +376,7 @@
NULL, &error))
{
if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error);
}
@@ -405,7 +405,7 @@
"end of recently closed docks",
NULL, &error))
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error);
}
Modified: trunk/app/dialogs/palette-import-dialog.c
==============================================================================
--- trunk/app/dialogs/palette-import-dialog.c (original)
+++ trunk/app/dialogs/palette-import-dialog.c Tue Nov 4 12:33:09 2008
@@ -850,9 +850,9 @@
if (! palette)
{
- gimp_message (dialog->context->gimp, G_OBJECT (dialog->dialog),
- GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (dialog->context->gimp,
+ G_OBJECT (dialog->dialog), GIMP_MESSAGE_ERROR,
+ error->message);
g_error_free (error);
}
}
Modified: trunk/app/dialogs/preferences-dialog.c
==============================================================================
--- trunk/app/dialogs/preferences-dialog.c (original)
+++ trunk/app/dialogs/preferences-dialog.c Tue Nov 4 12:33:09 2008
@@ -1356,7 +1356,7 @@
destroy_with_parent ?
GTK_DIALOG_DESTROY_WITH_PARENT : 0,
type, GTK_BUTTONS_OK,
- message);
+ "%s", message);
g_signal_connect (dialog, "response",
G_CALLBACK (gtk_widget_destroy),
Modified: trunk/app/dialogs/quit-dialog.c
==============================================================================
--- trunk/app/dialogs/quit-dialog.c (original)
+++ trunk/app/dialogs/quit-dialog.c Tue Nov 4 12:33:09 2008
@@ -211,13 +211,12 @@
GtkWidget *dialog = gtk_widget_get_toplevel (button);
gboolean do_quit = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (box),
"do-quit"));
- gchar *text;
-
- text = g_strdup_printf (ngettext ("There is one image with unsaved changes:",
- "There are %d images with unsaved changes:",
- num_images), num_images);
- gimp_message_box_set_primary_text (box, text);
- g_free (text);
+ gimp_message_box_set_primary_text (box,
+ ngettext ("There is one image with "
+ "unsaved changes:",
+ "There are %d images with "
+ "unsaved changes:",
+ num_images), num_images);
if (num_images == 0)
{
Modified: trunk/app/dialogs/stroke-dialog.c
==============================================================================
--- trunk/app/dialogs/stroke-dialog.c (original)
+++ trunk/app/dialogs/stroke-dialog.c Tue Nov 4 12:33:09 2008
@@ -294,10 +294,10 @@
if (! drawable)
{
- gimp_message (context->gimp, G_OBJECT (widget),
- GIMP_MESSAGE_WARNING,
- _("There is no active layer or channel "
- "to stroke to."));
+ gimp_message_literal (context->gimp, G_OBJECT (widget),
+ GIMP_MESSAGE_WARNING,
+ _("There is no active layer or channel "
+ "to stroke to."));
return;
}
@@ -318,9 +318,8 @@
if (! gimp_item_stroke (item, drawable, context, options, FALSE, TRUE,
NULL, &error))
{
- gimp_message (context->gimp, G_OBJECT (widget),
- GIMP_MESSAGE_WARNING,
- error->message);
+ gimp_message_literal (context->gimp, G_OBJECT (widget),
+ GIMP_MESSAGE_WARNING, error->message);
g_clear_error (&error);
return;
}
Modified: trunk/app/display/gimpdisplayshell-dnd.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-dnd.c (original)
+++ trunk/app/display/gimpdisplayshell-dnd.c Tue Nov 4 12:33:09 2008
@@ -333,9 +333,9 @@
(const gchar *) svg_data, svg_data_len,
TRUE, TRUE, -1, NULL, &error))
{
- gimp_message (shell->display->gimp, G_OBJECT (shell->display),
- GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (shell->display->gimp, G_OBJECT (shell->display),
+ GIMP_MESSAGE_ERROR,
+ error->message);
g_clear_error (&error);
}
else
Modified: trunk/app/errors.c
==============================================================================
--- trunk/app/errors.c (original)
+++ trunk/app/errors.c Tue Nov 4 12:33:09 2008
@@ -132,28 +132,14 @@
}
void
-gimp_fatal_error (const gchar *fmt, ...)
+gimp_fatal_error (const gchar *message)
{
- va_list args;
- gchar *message;
-
- va_start (args, fmt);
- message = g_strdup_vprintf (fmt, args);
- va_end (args);
-
gimp_eek ("fatal error", message, TRUE);
}
void
-gimp_terminate (const gchar *fmt, ...)
+gimp_terminate (const gchar *message)
{
- va_list args;
- gchar *message;
-
- va_start (args, fmt);
- message = g_strdup_vprintf (fmt, args);
- va_end (args);
-
gimp_eek ("terminated", message, use_debug_handler);
}
Modified: trunk/app/errors.h
==============================================================================
--- trunk/app/errors.h (original)
+++ trunk/app/errors.h Tue Nov 4 12:33:09 2008
@@ -30,10 +30,8 @@
GimpStackTraceMode stack_trace_mode);
void errors_exit (void);
-void gimp_fatal_error (const gchar *format,
- ...) G_GNUC_PRINTF (1, 2) G_GNUC_NORETURN;
-void gimp_terminate (const gchar *format,
- ...) G_GNUC_PRINTF (1, 2) G_GNUC_NORETURN;
+void gimp_fatal_error (const gchar *message) G_GNUC_NORETURN;
+void gimp_terminate (const gchar *message) G_GNUC_NORETURN;
#endif /* __ERRORS_H__ */
Modified: trunk/app/file/file-open.c
==============================================================================
--- trunk/app/file/file-open.c (original)
+++ trunk/app/file/file-open.c Tue Nov 4 12:33:09 2008
@@ -127,16 +127,16 @@
if (! g_file_test (filename, G_FILE_TEST_IS_REGULAR))
{
g_free (filename);
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("Not a regular file"));
+ g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+ _("Not a regular file"));
return NULL;
}
if (g_access (filename, R_OK) != 0)
{
g_free (filename);
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_ACCES,
- g_strerror (errno));
+ g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_ACCES,
+ g_strerror (errno));
return NULL;
}
}
@@ -451,8 +451,8 @@
}
else
{
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("Image doesn't contain any layers"));
+ g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+ _("Image doesn't contain any layers"));
*status = GIMP_PDB_EXECUTION_ERROR;
}
@@ -616,14 +616,14 @@
g_object_set (config, "mode", GIMP_COLOR_MANAGEMENT_OFF, NULL);
- gimp_message (image->gimp, G_OBJECT (progress),
- GIMP_MESSAGE_WARNING, msg);
+ gimp_message_literal (image->gimp, G_OBJECT (progress),
+ GIMP_MESSAGE_WARNING, msg);
g_free (msg);
}
else
{
- gimp_message (image->gimp, G_OBJECT (progress),
- GIMP_MESSAGE_ERROR, error->message);
+ gimp_message_literal (image->gimp, G_OBJECT (progress),
+ GIMP_MESSAGE_ERROR, error->message);
}
g_error_free (error);
Modified: trunk/app/file/file-procedure.c
==============================================================================
--- trunk/app/file/file-procedure.c (original)
+++ trunk/app/file/file-procedure.c Tue Nov 4 12:33:09 2008
@@ -135,10 +135,10 @@
}
else
{
- g_set_error (error,
- G_FILE_ERROR,
- g_file_error_from_errno (errno),
- g_strerror (errno));
+ g_set_error_literal (error,
+ G_FILE_ERROR,
+ g_file_error_from_errno (errno),
+ g_strerror (errno));
}
}
@@ -170,10 +170,9 @@
if (ifp)
{
if (ferror (ifp))
- g_set_error (error,
- G_FILE_ERROR,
- g_file_error_from_errno (errno),
- g_strerror (errno));
+ g_set_error_literal (error, G_FILE_ERROR,
+ g_file_error_from_errno (errno),
+ g_strerror (errno));
fclose (ifp);
}
@@ -196,8 +195,8 @@
{
/* set an error message unless one was already set */
if (error && *error == NULL)
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("Unknown file type"));
+ g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+ _("Unknown file type"));
}
return file_proc;
Modified: trunk/app/file/file-save.c
==============================================================================
--- trunk/app/file/file-save.c (original)
+++ trunk/app/file/file-save.c Tue Nov 4 12:33:09 2008
@@ -107,16 +107,16 @@
{
if (! g_file_test (filename, G_FILE_TEST_IS_REGULAR))
{
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("Not a regular file"));
+ g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+ _("Not a regular file"));
status = GIMP_PDB_EXECUTION_ERROR;
goto out;
}
if (g_access (filename, W_OK) != 0)
{
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_ACCES,
- g_strerror (errno));
+ g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_ACCES,
+ g_strerror (errno));
status = GIMP_PDB_EXECUTION_ERROR;
goto out;
}
Modified: trunk/app/file/file-utils.c
==============================================================================
--- trunk/app/file/file-utils.c (original)
+++ trunk/app/file/file-utils.c Tue Nov 4 12:33:09 2008
@@ -83,8 +83,10 @@
if (! g_utf8_validate (filename, -1, NULL))
{
- g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
- _("Invalid character sequence in URI"));
+ g_set_error_literal (error,
+ G_CONVERT_ERROR,
+ G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
+ _("Invalid character sequence in URI"));
return FALSE;
}
@@ -117,8 +119,10 @@
}
else
{
- g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
- _("Invalid character sequence in URI"));
+ g_set_error_literal (error,
+ G_CONVERT_ERROR,
+ G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
+ _("Invalid character sequence in URI"));
return NULL;
}
}
Modified: trunk/app/gegl/gimpcurvesconfig.c
==============================================================================
--- trunk/app/gegl/gimpcurvesconfig.c (original)
+++ trunk/app/gegl/gimpcurvesconfig.c Tue Nov 4 12:33:09 2008
@@ -380,8 +380,9 @@
if (! fgets (buf, sizeof (buf), file) ||
strcmp (buf, "# GIMP Curves File\n") != 0)
{
- g_set_error (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
- _("not a GIMP Curves file"));
+ g_set_error_literal (error,
+ GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
+ _("not a GIMP Curves file"));
return FALSE;
}
@@ -394,8 +395,9 @@
{
/* FIXME: should have a helpful error message here */
g_printerr ("fields != 2");
- g_set_error (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
- _("parse error"));
+ g_set_error_literal (error,
+ GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
+ _("parse error"));
return FALSE;
}
}
Modified: trunk/app/gegl/gimplevelsconfig.c
==============================================================================
--- trunk/app/gegl/gimplevelsconfig.c (original)
+++ trunk/app/gegl/gimplevelsconfig.c Tue Nov 4 12:33:09 2008
@@ -660,8 +660,8 @@
if (! fgets (buf, sizeof (buf), file) ||
strcmp (buf, "# GIMP Levels File\n") != 0)
{
- g_set_error (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
- _("not a GIMP Levels file"));
+ g_set_error_literal (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
+ _("not a GIMP Levels file"));
return FALSE;
}
@@ -707,8 +707,8 @@
return TRUE;
error:
- g_set_error (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
- _("parse error"));
+ g_set_error_literal (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
+ _("parse error"));
return FALSE;
}
Modified: trunk/app/gui/gui-message.c
==============================================================================
--- trunk/app/gui/gui-message.c (original)
+++ trunk/app/gui/gui-message.c Tue Nov 4 12:33:09 2008
@@ -219,7 +219,7 @@
gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (parent)),
GTK_DIALOG_DESTROY_WITH_PARENT,
type, GTK_BUTTONS_OK,
- message);
+ "%s", message);
g_signal_connect (dialog, "response",
G_CALLBACK (gtk_widget_destroy),
Modified: trunk/app/gui/gui.c
==============================================================================
--- trunk/app/gui/gui.c (original)
+++ trunk/app/gui/gui.c Tue Nov 4 12:33:09 2008
@@ -167,7 +167,7 @@
"border-width", 12,
NULL);
- gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), abort_message);
+ gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), "%s", abort_message);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), box);
gtk_widget_show (box);
Modified: trunk/app/gui/session.c
==============================================================================
--- trunk/app/gui/session.c (original)
+++ trunk/app/gui/session.c Tue Nov 4 12:33:09 2008
@@ -208,7 +208,7 @@
if (error)
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error);
gimp_config_file_backup_on_error (filename, "sessionrc", NULL);
@@ -281,7 +281,7 @@
if (! gimp_config_writer_finish (writer, "end of sessionrc", &error))
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error);
}
Modified: trunk/app/paint/gimpbrushcore.c
==============================================================================
--- trunk/app/paint/gimpbrushcore.c (original)
+++ trunk/app/paint/gimpbrushcore.c Tue Nov 4 12:33:09 2008
@@ -349,8 +349,8 @@
if (! core->main_brush)
{
- g_set_error (error, 0, 0,
- _("No brushes available for use with this tool."));
+ g_set_error_literal (error, 0, 0,
+ _("No brushes available for use with this tool."));
return FALSE;
}
Modified: trunk/app/paint/gimpclone.c
==============================================================================
--- trunk/app/paint/gimpclone.c (original)
+++ trunk/app/paint/gimpclone.c Tue Nov 4 12:33:09 2008
@@ -136,8 +136,8 @@
{
if (! gimp_context_get_pattern (GIMP_CONTEXT (options)))
{
- g_set_error (error, 0, 0,
- _("No patterns available for use with this tool."));
+ g_set_error_literal (error, 0, 0,
+ _("No patterns available for use with this tool."));
return FALSE;
}
}
Modified: trunk/app/paint/gimpheal.c
==============================================================================
--- trunk/app/paint/gimpheal.c (original)
+++ trunk/app/paint/gimpheal.c Tue Nov 4 12:33:09 2008
@@ -150,8 +150,8 @@
if (! source_core->set_source && gimp_drawable_is_indexed (drawable))
{
- g_set_error (error, 0, 0,
- _("Healing does not operate on indexed layers."));
+ g_set_error_literal (error, 0, 0,
+ _("Healing does not operate on indexed layers."));
return FALSE;
}
Modified: trunk/app/paint/gimpperspectiveclone.c
==============================================================================
--- trunk/app/paint/gimpperspectiveclone.c (original)
+++ trunk/app/paint/gimpperspectiveclone.c Tue Nov 4 12:33:09 2008
@@ -158,8 +158,8 @@
if (! source_core->set_source && gimp_drawable_is_indexed (drawable))
{
- g_set_error (error, 0, 0,
- _("Perspective Clone does not operate on indexed layers."));
+ g_set_error_literal (error, 0, 0,
+ _("Perspective Clone does not operate on indexed layers."));
return FALSE;
}
Modified: trunk/app/paint/gimpsourcecore.c
==============================================================================
--- trunk/app/paint/gimpsourcecore.c (original)
+++ trunk/app/paint/gimpsourcecore.c Tue Nov 4 12:33:09 2008
@@ -224,7 +224,7 @@
{
if (! source_core->src_drawable)
{
- g_set_error (error, 0, 0, _("Set a source image first."));
+ g_set_error_literal (error, 0, 0, _("Set a source image first."));
return FALSE;
}
Modified: trunk/app/pdb/convert-cmds.c
==============================================================================
--- trunk/app/pdb/convert-cmds.c (original)
+++ trunk/app/pdb/convert-cmds.c Tue Nov 4 12:33:09 2008
@@ -146,9 +146,10 @@
}
else if (pal->n_colors > MAXNUMCOLORS)
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Cannot convert to a palette "
- "with more than 256 colors."));
+ g_set_error_literal (error,
+ GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Cannot convert to a palette "
+ "with more than 256 colors."));
success = FALSE;
}
break;
Modified: trunk/app/pdb/edit-cmds.c
==============================================================================
--- trunk/app/pdb/edit-cmds.c (original)
+++ trunk/app/pdb/edit-cmds.c Tue Nov 4 12:33:09 2008
@@ -73,8 +73,9 @@
if (! non_empty)
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
- "%s", my_error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+ my_error->message);
g_clear_error (&my_error);
}
}
@@ -117,8 +118,9 @@
if (! non_empty)
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
- "%s", my_error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+ my_error->message);
g_clear_error (&my_error);
}
}
@@ -158,8 +160,9 @@
if (! non_empty)
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
- "%s", my_error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+ my_error->message);
g_clear_error (&my_error);
}
}
@@ -281,8 +284,9 @@
}
else
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
- "%s", my_error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+ my_error->message);
g_clear_error (&my_error);
}
}
@@ -332,8 +336,9 @@
}
else
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
- "%s", my_error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+ my_error->message);
g_clear_error (&my_error);
}
}
@@ -380,8 +385,9 @@
}
else
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
- "%s", my_error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+ my_error->message);
g_clear_error (&my_error);
}
}
Modified: trunk/app/pdb/floating-sel-cmds.c
==============================================================================
--- trunk/app/pdb/floating-sel-cmds.c (original)
+++ trunk/app/pdb/floating-sel-cmds.c Tue Nov 4 12:33:09 2008
@@ -59,9 +59,9 @@
}
else
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Cannot remove this layer because "
- "it is not a floating selection."));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Cannot remove this layer because "
+ "it is not a floating selection."));
success = FALSE;
}
}
@@ -91,9 +91,9 @@
}
else
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Cannot anchor this layer because "
- "it is not a floating selection."));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Cannot anchor this layer because "
+ "it is not a floating selection."));
success = FALSE;
}
}
@@ -123,9 +123,9 @@
}
else
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Cannot convert this layer to a normal layer because "
- "it is not a floating selection."));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Cannot convert this layer to a normal layer "
+ "because it is not a floating selection."));
success = FALSE;
}
}
@@ -184,9 +184,9 @@
}
else
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Cannot rigor this layer because "
- "it is not a floating selection."));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Cannot rigor this layer because "
+ "it is not a floating selection."));
success = FALSE;
}
}
@@ -218,9 +218,9 @@
}
else
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Cannot relax this layer because "
- "it is not a floating selection."));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Cannot relax this layer because "
+ "it is not a floating selection."));
success = FALSE;
}
}
Modified: trunk/app/pdb/gimppdb-utils.c
==============================================================================
--- trunk/app/pdb/gimppdb-utils.c (original)
+++ trunk/app/pdb/gimppdb-utils.c Tue Nov 4 12:33:09 2008
@@ -55,8 +55,8 @@
if (! name || ! strlen (name))
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Invalid empty brush name"));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Invalid empty brush name"));
return NULL;
}
@@ -116,8 +116,8 @@
if (! name || ! strlen (name))
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Invalid empty pattern name"));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Invalid empty pattern name"));
return NULL;
}
@@ -146,8 +146,8 @@
if (! name || ! strlen (name))
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Invalid empty gradient name"));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Invalid empty gradient name"));
return NULL;
}
@@ -182,8 +182,8 @@
if (! name || ! strlen (name))
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Invalid empty palette name"));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Invalid empty palette name"));
return NULL;
}
@@ -217,8 +217,8 @@
if (! name || ! strlen (name))
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Invalid empty font name"));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Invalid empty font name"));
return NULL;
}
@@ -246,8 +246,8 @@
if (! name || ! strlen (name))
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Invalid empty buffer name"));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Invalid empty buffer name"));
return NULL;
}
@@ -275,8 +275,8 @@
if (! name || ! strlen (name))
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Invalid empty paint method name"));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Invalid empty paint method name"));
return NULL;
}
Modified: trunk/app/pdb/gimpprocedure.c
==============================================================================
--- trunk/app/pdb/gimpprocedure.c (original)
+++ trunk/app/pdb/gimpprocedure.c Tue Nov 4 12:33:09 2008
@@ -197,8 +197,8 @@
if (error)
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
+ error->message);
g_error_free (error);
}
}
@@ -346,8 +346,8 @@
if (return_vals->n_values > 1 &&
G_VALUE_HOLDS_STRING (&return_vals->values[1]))
{
- g_set_error (error, 0, 0,
- g_value_get_string (&return_vals->values[1]));
+ g_set_error_literal (error, 0, 0,
+ g_value_get_string (&return_vals->values[1]));
}
}
}
Modified: trunk/app/pdb/image-cmds.c
==============================================================================
--- trunk/app/pdb/image-cmds.c (original)
+++ trunk/app/pdb/image-cmds.c Tue Nov 4 12:33:09 2008
@@ -2264,9 +2264,9 @@
! FINITE (yresolution) ||
yresolution < GIMP_MIN_RESOLUTION || yresolution > GIMP_MAX_RESOLUTION)
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Image resolution is out of bounds, "
- "using the default resolution instead."));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Image resolution is out of bounds, "
+ "using the default resolution instead."));
success = FALSE;
}
else
Modified: trunk/app/plug-in/gimpplugin-message.c
==============================================================================
--- trunk/app/plug-in/gimpplugin-message.c (original)
+++ trunk/app/plug-in/gimpplugin-message.c Tue Nov 4 12:33:09 2008
@@ -803,8 +803,9 @@
proc_install->menu_path,
&error))
{
- gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_WARNING,
- "%s", error->message);
+ gimp_message_literal (plug_in->manager->gimp,
+ NULL, GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
}
}
Modified: trunk/app/plug-in/gimpplugin.c
==============================================================================
--- trunk/app/plug-in/gimpplugin.c (original)
+++ trunk/app/plug-in/gimpplugin.c Tue Nov 4 12:33:09 2008
@@ -932,8 +932,8 @@
if (! gimp_plug_in_procedure_add_menu_path (proc, menu_path, &error))
{
- gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+ error->message);
g_clear_error (&error);
return FALSE;
Modified: trunk/app/plug-in/gimppluginmanager-restore.c
==============================================================================
--- trunk/app/plug-in/gimppluginmanager-restore.c (original)
+++ trunk/app/plug-in/gimppluginmanager-restore.c Tue Nov 4 12:33:09 2008
@@ -129,7 +129,8 @@
if (! plug_in_rc_write (manager->plug_in_defs, pluginrc, &error))
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp,
+ NULL, GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error);
}
@@ -288,8 +289,8 @@
else if (error)
{
if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
- gimp_message (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+ error->message);
g_clear_error (&error);
}
@@ -450,8 +451,8 @@
if (error)
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR,
+ error->message);
g_clear_error (&error);
}
}
@@ -652,8 +653,8 @@
if (error)
{
- gimp_message (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (manager->gimp, NULL, GIMP_MESSAGE_ERROR,
+ error->message);
g_error_free (error);
}
}
Modified: trunk/app/plug-in/gimppluginprocedure.c
==============================================================================
--- trunk/app/plug-in/gimppluginprocedure.c (original)
+++ trunk/app/plug-in/gimppluginprocedure.c Tue Nov 4 12:33:09 2008
@@ -658,7 +658,7 @@
if (! pixbuf && error)
{
- g_printerr (error->message);
+ g_printerr ("%s\n", error->message);
g_clear_error (&error);
}
Modified: trunk/app/text/gimptextlayer.c
==============================================================================
--- trunk/app/text/gimptextlayer.c (original)
+++ trunk/app/text/gimptextlayer.c Tue Nov 4 12:33:09 2008
@@ -541,9 +541,9 @@
if (gimp_container_is_empty (image->gimp->fonts))
{
- gimp_message (image->gimp, NULL, GIMP_MESSAGE_ERROR,
- _("Due to lack of any fonts, "
- "text functionality is not available."));
+ gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR,
+ _("Due to lack of any fonts, "
+ "text functionality is not available."));
return FALSE;
}
Modified: trunk/app/tools/gimp-tools.c
==============================================================================
--- trunk/app/tools/gimp-tools.c (original)
+++ trunk/app/tools/gimp-tools.c Tue Nov 4 12:33:09 2008
@@ -292,8 +292,7 @@
if (! gimp_contexts_load (gimp, &error))
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_WARNING,
- "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING, error->message);
g_clear_error (&error);
}
@@ -357,8 +356,8 @@
if (! gimp_contexts_save (gimp, &error))
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_WARNING,
- "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
}
Modified: trunk/app/tools/gimpaligntool.c
==============================================================================
--- trunk/app/tools/gimpaligntool.c (original)
+++ trunk/app/tools/gimpaligntool.c Tue Nov 4 12:33:09 2008
@@ -633,7 +633,7 @@
}
if (status)
- gimp_tool_push_status (tool, display, status);
+ gimp_tool_push_status (tool, display, "%s", status);
if (free_status)
g_free ((gchar *) status);
Modified: trunk/app/tools/gimpblendtool.c
==============================================================================
--- trunk/app/tools/gimpblendtool.c (original)
+++ trunk/app/tools/gimpblendtool.c Tue Nov 4 12:33:09 2008
@@ -159,8 +159,8 @@
if (gimp_drawable_is_indexed (drawable))
{
- g_set_error (error, 0, 0,
- _("Blend does not operate on indexed layers."));
+ g_set_error_literal (error, 0, 0,
+ _("Blend does not operate on indexed layers."));
return FALSE;
}
Modified: trunk/app/tools/gimpbrightnesscontrasttool.c
==============================================================================
--- trunk/app/tools/gimpbrightnesscontrasttool.c (original)
+++ trunk/app/tools/gimpbrightnesscontrasttool.c Tue Nov 4 12:33:09 2008
@@ -179,8 +179,9 @@
if (gimp_drawable_is_indexed (drawable))
{
- g_set_error (error, 0, 0,
- _("Brightness-Contrast does not operate on indexed layers."));
+ g_set_error_literal (error, 0, 0,
+ _("Brightness-Contrast does not operate "
+ "on indexed layers."));
return FALSE;
}
Modified: trunk/app/tools/gimpbucketfilltool.c
==============================================================================
--- trunk/app/tools/gimpbucketfilltool.c (original)
+++ trunk/app/tools/gimpbucketfilltool.c Tue Nov 4 12:33:09 2008
@@ -157,9 +157,8 @@
options->sample_merged,
x, y, &error))
{
- gimp_message (display->image->gimp, G_OBJECT (display),
- GIMP_MESSAGE_WARNING,
- error->message);
+ gimp_message_literal (display->image->gimp, G_OBJECT (display),
+ GIMP_MESSAGE_WARNING, error->message);
g_clear_error (&error);
}
else
Modified: trunk/app/tools/gimpcolorbalancetool.c
==============================================================================
--- trunk/app/tools/gimpcolorbalancetool.c (original)
+++ trunk/app/tools/gimpcolorbalancetool.c Tue Nov 4 12:33:09 2008
@@ -159,8 +159,8 @@
if (! gimp_drawable_is_rgb (drawable))
{
- g_set_error (error, 0, 0,
- _("Color Balance operates only on RGB color layers."));
+ g_set_error_literal (error, 0, 0,
+ _("Color Balance operates only on RGB color layers."));
return FALSE;
}
Modified: trunk/app/tools/gimpcolorpickertool.c
==============================================================================
--- trunk/app/tools/gimpcolorpickertool.c (original)
+++ trunk/app/tools/gimpcolorpickertool.c Tue Nov 4 12:33:09 2008
@@ -271,7 +271,7 @@
}
if (status_help != NULL)
{
- gimp_tool_push_status (tool, display, status_help);
+ gimp_tool_push_status (tool, display, "%s", status_help);
g_free (status_help);
}
}
Modified: trunk/app/tools/gimpcurvestool.c
==============================================================================
--- trunk/app/tools/gimpcurvestool.c (original)
+++ trunk/app/tools/gimpcurvestool.c Tue Nov 4 12:33:09 2008
@@ -217,8 +217,8 @@
if (gimp_drawable_is_indexed (drawable))
{
- g_set_error (error, 0, 0,
- _("Curves does not operate on indexed layers."));
+ g_set_error_literal (error, 0, 0,
+ _("Curves does not operate on indexed layers."));
return FALSE;
}
@@ -331,7 +331,7 @@
GIMP_COLOR_TOOL (tool)->pick_mode = mode;
if (status && proximity)
- gimp_tool_push_status (tool, display, status);
+ gimp_tool_push_status (tool, display, "%s", status);
}
static void
Modified: trunk/app/tools/gimpdesaturatetool.c
==============================================================================
--- trunk/app/tools/gimpdesaturatetool.c (original)
+++ trunk/app/tools/gimpdesaturatetool.c Tue Nov 4 12:33:09 2008
@@ -121,8 +121,8 @@
if (! gimp_drawable_is_rgb (drawable))
{
- g_set_error (error, 0, 0,
- _("Desaturate does only operate on RGB layers."));
+ g_set_error_literal (error, 0, 0,
+ _("Desaturate does only operate on RGB layers."));
return FALSE;
}
Modified: trunk/app/tools/gimpeditselectiontool.c
==============================================================================
--- trunk/app/tools/gimpeditselectiontool.c (original)
+++ trunk/app/tools/gimpeditselectiontool.c Tue Nov 4 12:33:09 2008
@@ -690,9 +690,9 @@
0, 0, &error))
{
/* no region to float, abort safely */
- gimp_message (display->image->gimp, G_OBJECT (display),
- GIMP_MESSAGE_WARNING,
- "%s", error->message);
+ gimp_message_literal (display->image->gimp, G_OBJECT (display),
+ GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
gimp_draw_tool_resume (draw_tool);
Modified: trunk/app/tools/gimpforegroundselecttool.c
==============================================================================
--- trunk/app/tools/gimpforegroundselecttool.c (original)
+++ trunk/app/tools/gimpforegroundselecttool.c Tue Nov 4 12:33:09 2008
@@ -335,7 +335,7 @@
if (proximity)
{
if (status)
- gimp_tool_replace_status (tool, display, status);
+ gimp_tool_replace_status (tool, display, "%s", status);
gimp_draw_tool_start (draw_tool, display);
}
Modified: trunk/app/tools/gimpfreeselecttool.c
==============================================================================
--- trunk/app/tools/gimpfreeselecttool.c (original)
+++ trunk/app/tools/gimpfreeselecttool.c Tue Nov 4 12:33:09 2008
@@ -1132,7 +1132,7 @@
if (status_text)
{
- gimp_tool_push_status (tool, display, status_text);
+ gimp_tool_push_status (tool, display, "%s", status_text);
}
}
}
Modified: trunk/app/tools/gimpgegltool.c
==============================================================================
--- trunk/app/tools/gimpgegltool.c (original)
+++ trunk/app/tools/gimpgegltool.c Tue Nov 4 12:33:09 2008
@@ -154,8 +154,8 @@
if (gimp_drawable_is_indexed (drawable))
{
- g_set_error (error, 0, 0,
- _("GEGL operations do not operate on indexed layers."));
+ g_set_error_literal (error, 0, 0,
+ _("GEGL operations do not operate on indexed layers."));
return FALSE;
}
Modified: trunk/app/tools/gimphuesaturationtool.c
==============================================================================
--- trunk/app/tools/gimphuesaturationtool.c (original)
+++ trunk/app/tools/gimphuesaturationtool.c Tue Nov 4 12:33:09 2008
@@ -167,8 +167,8 @@
if (! gimp_drawable_is_rgb (drawable))
{
- g_set_error (error, 0, 0,
- _("Hue-Saturation operates only on RGB color layers."));
+ g_set_error_literal (error, 0, 0,
+ _("Hue-Saturation operates only on RGB color layers."));
return FALSE;
}
Modified: trunk/app/tools/gimpimagemaptool-settings.c
==============================================================================
--- trunk/app/tools/gimpimagemaptool-settings.c (original)
+++ trunk/app/tools/gimpimagemaptool-settings.c Tue Nov 4 12:33:09 2008
@@ -178,8 +178,9 @@
if (! tool_class->settings_import (tool, filename, &error))
{
- gimp_message (GIMP_TOOL (tool)->tool_info->gimp, G_OBJECT (tool->shell),
- GIMP_MESSAGE_ERROR, error->message);
+ gimp_message_literal (GIMP_TOOL (tool)->tool_info->gimp,
+ G_OBJECT (tool->shell),
+ GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error);
return FALSE;
@@ -207,8 +208,9 @@
if (! tool_class->settings_export (tool, filename, &error))
{
- gimp_message (GIMP_TOOL (tool)->tool_info->gimp, G_OBJECT (tool->shell),
- GIMP_MESSAGE_ERROR, error->message);
+ gimp_message_literal (GIMP_TOOL (tool)->tool_info->gimp,
+ G_OBJECT (tool->shell),
+ GIMP_MESSAGE_ERROR, error->message);
g_clear_error (&error);
return FALSE;
Modified: trunk/app/tools/gimpiscissorstool.c
==============================================================================
--- trunk/app/tools/gimpiscissorstool.c (original)
+++ trunk/app/tools/gimpiscissorstool.c Tue Nov 4 12:33:09 2008
@@ -941,7 +941,7 @@
status = gimp_suggest_modifiers (_("Click-Drag to move this point"),
GDK_SHIFT_MASK & ~state,
_("%s: disable auto-snap"), NULL, NULL);
- gimp_tool_replace_status (tool, display, status);
+ gimp_tool_replace_status (tool, display, "%s", status);
g_free (status);
iscissors->op = ISCISSORS_OP_MOVE_POINT;
}
@@ -1007,7 +1007,7 @@
GDK_SHIFT_MASK & ~state,
_("%s: disable auto-snap"),
NULL, NULL);
- gimp_tool_replace_status (tool, display, status);
+ gimp_tool_replace_status (tool, display, "%s", status);
g_free (status);
}
iscissors->op = ISCISSORS_OP_ADD_POINT;
Modified: trunk/app/tools/gimplevelstool.c
==============================================================================
--- trunk/app/tools/gimplevelstool.c (original)
+++ trunk/app/tools/gimplevelstool.c Tue Nov 4 12:33:09 2008
@@ -224,8 +224,8 @@
if (gimp_drawable_is_indexed (drawable))
{
- g_set_error (error, 0, 0,
- _("Levels does not operate on indexed layers."));
+ g_set_error_literal (error, 0, 0,
+ _("Levels does not operate on indexed layers."));
return FALSE;
}
Modified: trunk/app/tools/gimpmeasuretool.c
==============================================================================
--- trunk/app/tools/gimpmeasuretool.c (original)
+++ trunk/app/tools/gimpmeasuretool.c Tue Nov 4 12:33:09 2008
@@ -570,7 +570,8 @@
GDK_MOD1_MASK & ~state,
NULL, NULL, NULL);
}
- gimp_tool_replace_status (tool, display, status);
+
+ gimp_tool_replace_status (tool, display, "%s", status);
g_free (status);
measure->status_help = TRUE;
break;
@@ -583,7 +584,7 @@
"vertical guide"),
GDK_CONTROL_MASK & ~state,
NULL, NULL, NULL);
- gimp_tool_replace_status (tool, display, status);
+ gimp_tool_replace_status (tool, display, "%s", status);
g_free (status);
measure->status_help = TRUE;
break;
@@ -611,7 +612,8 @@
| GDK_MOD1_MASK) & ~state,
NULL, NULL, NULL);
}
- gimp_tool_replace_status (tool, display, status);
+
+ gimp_tool_replace_status (tool, display, "%s", status);
g_free (status);
measure->status_help = TRUE;
break;
Modified: trunk/app/tools/gimppainttool.c
==============================================================================
--- trunk/app/tools/gimppainttool.c (original)
+++ trunk/app/tools/gimppainttool.c Tue Nov 4 12:33:09 2008
@@ -326,7 +326,7 @@
if (! gimp_paint_core_start (core, drawable, paint_options, &curr_coords,
&error))
{
- gimp_tool_message (tool, display, error->message);
+ gimp_tool_message_literal (tool, display, error->message);
g_clear_error (&error);
return;
}
@@ -663,7 +663,7 @@
_("%s for a straight line"),
paint_tool->status_ctrl,
NULL);
- gimp_tool_push_status (tool, display, status);
+ gimp_tool_push_status (tool, display, "%s", status);
g_free (status);
paint_tool->draw_line = FALSE;
Modified: trunk/app/tools/gimpposterizetool.c
==============================================================================
--- trunk/app/tools/gimpposterizetool.c (original)
+++ trunk/app/tools/gimpposterizetool.c Tue Nov 4 12:33:09 2008
@@ -147,8 +147,8 @@
if (gimp_drawable_is_indexed (drawable))
{
- g_set_error (error, 0, 0,
- _("Posterize does not operate on indexed layers."));
+ g_set_error_literal (error, 0, 0,
+ _("Posterize does not operate on indexed layers."));
return FALSE;
}
Modified: trunk/app/tools/gimpselectiontool.c
==============================================================================
--- trunk/app/tools/gimpselectiontool.c (original)
+++ trunk/app/tools/gimpselectiontool.c Tue Nov 4 12:33:09 2008
@@ -314,7 +314,7 @@
}
if (status)
- gimp_tool_push_status (tool, display, status);
+ gimp_tool_push_status (tool, display, "%s", status);
if (free_status)
g_free ((gchar *) status);
Modified: trunk/app/tools/gimpsourcetool.c
==============================================================================
--- trunk/app/tools/gimpsourcetool.c (original)
+++ trunk/app/tools/gimpsourcetool.c Tue Nov 4 12:33:09 2008
@@ -313,18 +313,16 @@
if (source->src_drawable == NULL)
{
if (state & GDK_CONTROL_MASK)
- gimp_tool_replace_status (tool, display,
- source_tool->status_set_source);
+ {
+ gimp_tool_replace_status (tool, display, "%s",
+ source_tool->status_set_source);
+ }
else
{
- gchar *status;
-
- status = g_strconcat (gimp_get_mod_name_control (),
- gimp_get_mod_separator (),
- source_tool->status_set_source,
- NULL);
- gimp_tool_replace_status (tool, display, status);
- g_free (status);
+ gimp_tool_replace_status (tool, display, "%s%s%s",
+ gimp_get_mod_name_control (),
+ gimp_get_mod_separator (),
+ source_tool->status_set_source);
}
}
else
Modified: trunk/app/tools/gimpthresholdtool.c
==============================================================================
--- trunk/app/tools/gimpthresholdtool.c (original)
+++ trunk/app/tools/gimpthresholdtool.c Tue Nov 4 12:33:09 2008
@@ -157,8 +157,8 @@
if (gimp_drawable_is_indexed (drawable))
{
- g_set_error (error, 0, 0,
- _("Threshold does not operate on indexed layers."));
+ g_set_error_literal (error, 0, 0,
+ _("Threshold does not operate on indexed layers."));
return FALSE;
}
Modified: trunk/app/tools/gimptool.c
==============================================================================
--- trunk/app/tools/gimptool.c (original)
+++ trunk/app/tools/gimptool.c Tue Nov 4 12:33:09 2008
@@ -446,7 +446,7 @@
if (! GIMP_TOOL_GET_CLASS (tool)->initialize (tool, display, &error))
{
- gimp_tool_message (tool, display, error->message);
+ gimp_tool_message_literal (tool, display, error->message);
g_clear_error (&error);
return FALSE;
}
@@ -1021,6 +1021,19 @@
}
void
+gimp_tool_message_literal (GimpTool *tool,
+ GimpDisplay *display,
+ const gchar *message)
+{
+ g_return_if_fail (GIMP_IS_TOOL (tool));
+ g_return_if_fail (GIMP_IS_DISPLAY (display));
+ g_return_if_fail (message != NULL);
+
+ gimp_message_literal (display->image->gimp, G_OBJECT (display),
+ GIMP_MESSAGE_WARNING, message);
+}
+
+void
gimp_tool_set_cursor (GimpTool *tool,
GimpDisplay *display,
GimpCursorType cursor,
Modified: trunk/app/tools/gimptool.h
==============================================================================
--- trunk/app/tools/gimptool.h (original)
+++ trunk/app/tools/gimptool.h Tue Nov 4 12:33:09 2008
@@ -226,6 +226,9 @@
GimpDisplay *display,
const gchar *format,
...) G_GNUC_PRINTF(3,4);
+void gimp_tool_message_literal (GimpTool *tool,
+ GimpDisplay *display,
+ const gchar *message);
void gimp_tool_set_cursor (GimpTool *tool,
GimpDisplay *display,
Modified: trunk/app/tools/gimptransformtool.c
==============================================================================
--- trunk/app/tools/gimptransformtool.c (original)
+++ trunk/app/tools/gimptransformtool.c Tue Nov 4 12:33:09 2008
@@ -1180,7 +1180,7 @@
if (! active_item)
{
- gimp_tool_message (tool, display, message);
+ gimp_tool_message_literal (tool, display, message);
return;
}
Modified: trunk/app/tools/gimpvectortool.c
==============================================================================
--- trunk/app/tools/gimpvectortool.c (original)
+++ trunk/app/tools/gimpvectortool.c Tue Nov 4 12:33:09 2008
@@ -1266,7 +1266,7 @@
}
if (status)
- gimp_tool_push_status (tool, display, status);
+ gimp_tool_push_status (tool, display, "%s", status);
if (free_status)
g_free ((gchar *) status);
Modified: trunk/app/widgets/gimpactionview.c
==============================================================================
--- trunk/app/widgets/gimpactionview.c (original)
+++ trunk/app/widgets/gimpactionview.c Tue Nov 4 12:33:09 2008
@@ -636,9 +636,9 @@
confirm_data->accel_mask,
TRUE))
{
- gimp_message (confirm_data->manager->gimp, G_OBJECT (dialog),
- GIMP_MESSAGE_ERROR,
- _("Changing shortcut failed."));
+ gimp_message_literal (confirm_data->manager->gimp, G_OBJECT (dialog),
+ GIMP_MESSAGE_ERROR,
+ _("Changing shortcut failed."));
}
}
@@ -776,9 +776,9 @@
if (! accel_key)
{
- gimp_message (view->manager->gimp, G_OBJECT (view),
- GIMP_MESSAGE_ERROR,
- _("Invalid shortcut."));
+ gimp_message_literal (view->manager->gimp,
+ G_OBJECT (view), GIMP_MESSAGE_ERROR,
+ _("Invalid shortcut."));
}
else if (! gtk_accel_map_change_entry (accel_path,
accel_key, accel_mask, FALSE))
@@ -841,9 +841,9 @@
}
else
{
- gimp_message (view->manager->gimp, G_OBJECT (view),
- GIMP_MESSAGE_ERROR,
- _("Changing shortcut failed."));
+ gimp_message_literal (view->manager->gimp,
+ G_OBJECT (view), GIMP_MESSAGE_ERROR,
+ _("Changing shortcut failed."));
}
}
}
@@ -865,8 +865,8 @@
if (! gtk_accel_map_change_entry (accel_path, 0, 0, FALSE))
{
- gimp_message (view->manager->gimp, G_OBJECT (view),
- GIMP_MESSAGE_ERROR,
- _("Removing shortcut failed."));
+ gimp_message_literal (view->manager->gimp,
+ G_OBJECT (view), GIMP_MESSAGE_ERROR,
+ _("Removing shortcut failed."));
}
}
Modified: trunk/app/widgets/gimpcontrollerlist.c
==============================================================================
--- trunk/app/widgets/gimpcontrollerlist.c (original)
+++ trunk/app/widgets/gimpcontrollerlist.c Tue Nov 4 12:33:09 2008
@@ -510,21 +510,23 @@
if (list->src_gtype == GIMP_TYPE_CONTROLLER_KEYBOARD &&
gimp_controllers_get_keyboard (list->gimp) != NULL)
{
- gimp_message (list->gimp, G_OBJECT (button), GIMP_MESSAGE_WARNING,
- _("There can only be one active keyboard "
- "controller.\n\n"
- "You already have a keyboard controller in "
- "your list of active controllers."));
+ gimp_message_literal (list->gimp,
+ G_OBJECT (button), GIMP_MESSAGE_WARNING,
+ _("There can only be one active keyboard "
+ "controller.\n\n"
+ "You already have a keyboard controller in "
+ "your list of active controllers."));
return;
}
else if (list->src_gtype == GIMP_TYPE_CONTROLLER_WHEEL &&
gimp_controllers_get_wheel (list->gimp) != NULL)
{
- gimp_message (list->gimp, G_OBJECT (button), GIMP_MESSAGE_WARNING,
- _("There can only be one active wheel "
- "controller.\n\n"
- "You already have a wheel controller in "
- "your list of active controllers."));
+ gimp_message_literal (list->gimp,
+ G_OBJECT (button), GIMP_MESSAGE_WARNING,
+ _("There can only be one active wheel "
+ "controller.\n\n"
+ "You already have a wheel controller in "
+ "your list of active controllers."));
return;
}
@@ -542,9 +544,8 @@
gimp_controller_list_remove_clicked (GtkWidget *button,
GimpControllerList *list)
{
- GtkWidget *dialog;
- gchar *primary;
- gchar *secondary;
+ GtkWidget *dialog;
+ const gchar *name;
#define RESPONSE_DISABLE 1
@@ -565,24 +566,17 @@
RESPONSE_DISABLE,
-1);
- primary =
- g_strdup_printf (_("Remove Controller '%s'?"),
- gimp_object_get_name (GIMP_OBJECT (list->dest_info)));
-
- secondary =
- g_strdup_printf (_("Removing this controller from the list of "
- "active controllers will permanently delete "
- "all event mappings you have configured.\n\n"
- "Selecting \"Disable Controller\" will disable "
- "the controller without removing it."));
-
+ name = gimp_object_get_name (GIMP_OBJECT (list->dest_info));
gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
- primary);
- gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
- secondary);
+ _("Remove Controller '%s'?"), name);
- g_free (primary);
- g_free (secondary);
+ gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box,
+ "%s",
+ _("Removing this controller from the list of "
+ "active controllers will permanently delete "
+ "all event mappings you have configured.\n\n"
+ "Selecting \"Disable Controller\" will disable "
+ "the controller without removing it."));
switch (gimp_dialog_run (GIMP_DIALOG (dialog)))
{
Modified: trunk/app/widgets/gimpcontrollers.c
==============================================================================
--- trunk/app/widgets/gimpcontrollers.c (original)
+++ trunk/app/widgets/gimpcontrollers.c Tue Nov 4 12:33:09 2008
@@ -159,13 +159,13 @@
if (! gimp_config_deserialize_file (GIMP_CONFIG (manager->controllers),
filename, NULL, &error))
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR,
+ error->message);
}
}
else
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
}
g_clear_error (&error);
@@ -206,7 +206,7 @@
header, footer, NULL,
&error))
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_error_free (error);
}
Modified: trunk/app/widgets/gimpdataeditor.c
==============================================================================
--- trunk/app/widgets/gimpdataeditor.c (original)
+++ trunk/app/widgets/gimpdataeditor.c Tue Nov 4 12:33:09 2008
@@ -645,9 +645,9 @@
if (! gimp_data_factory_data_save_single (editor->data_factory, data,
&error))
{
- gimp_message (editor->data_factory->gimp, G_OBJECT (editor),
- GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (editor->data_factory->gimp, G_OBJECT (editor),
+ GIMP_MESSAGE_ERROR,
+ error->message);
g_clear_error (&error);
}
}
Modified: trunk/app/widgets/gimpdevices.c
==============================================================================
--- trunk/app/widgets/gimpdevices.c (original)
+++ trunk/app/widgets/gimpdevices.c Tue Nov 4 12:33:09 2008
@@ -180,7 +180,7 @@
&error))
{
if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_error_free (error);
/* don't bail out here */
@@ -228,7 +228,7 @@
NULL,
&error))
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR, "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_error_free (error);
}
Modified: trunk/app/widgets/gimpdnd-xds.c
==============================================================================
--- trunk/app/widgets/gimpdnd-xds.c (original)
+++ trunk/app/widgets/gimpdnd-xds.c Tue Nov 4 12:33:09 2008
@@ -187,9 +187,9 @@
gtk_selection_data_set (selection, selection->target, 8,
(const guchar *) "E", 1);
- gimp_message (image->gimp, NULL, GIMP_MESSAGE_ERROR,
- _("The given filename does not have any known "
- "file extension."));
+ gimp_message_literal (image->gimp, NULL, GIMP_MESSAGE_ERROR,
+ _("The given filename does not have any known "
+ "file extension."));
}
g_free (uri);
Modified: trunk/app/widgets/gimperrordialog.c
==============================================================================
--- trunk/app/widgets/gimperrordialog.c (original)
+++ trunk/app/widgets/gimperrordialog.c Tue Nov 4 12:33:09 2008
@@ -165,7 +165,7 @@
dialog->num_messages++;
if (overflow)
- gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box), domain);
+ gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box), "%s", domain);
else
gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box),
_("%s Message"), domain);
Modified: trunk/app/widgets/gimphelp.c
==============================================================================
--- trunk/app/widgets/gimphelp.c (original)
+++ trunk/app/widgets/gimphelp.c Tue Nov 4 12:33:09 2008
@@ -303,8 +303,8 @@
if (error)
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (gimp, G_OBJECT (progress), GIMP_MESSAGE_ERROR,
+ error->message);
g_error_free (error);
}
}
@@ -362,8 +362,8 @@
}
gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
- primary);
- gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, text);
+ "%s", primary);
+ gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (dialog)->box, "%s", text);
if (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK)
{
@@ -411,8 +411,7 @@
if (error)
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_error_free (error);
}
@@ -454,8 +453,7 @@
if (error)
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_error_free (error);
}
}
@@ -489,8 +487,7 @@
if (error)
{
- gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (gimp, NULL, GIMP_MESSAGE_ERROR, error->message);
g_error_free (error);
}
}
Modified: trunk/app/widgets/gimpitemtreeview.c
==============================================================================
--- trunk/app/widgets/gimpitemtreeview.c (original)
+++ trunk/app/widgets/gimpitemtreeview.c Tue Nov 4 12:33:09 2008
@@ -871,9 +871,9 @@
if (error)
{
- gimp_message (view->image->gimp, G_OBJECT (view),
- GIMP_MESSAGE_WARNING,
- "%s", error->message);
+ gimp_message_literal (view->image->gimp, G_OBJECT (view),
+ GIMP_MESSAGE_WARNING,
+ error->message);
g_clear_error (&error);
}
}
Modified: trunk/app/widgets/gimppdbdialog.c
==============================================================================
--- trunk/app/widgets/gimppdbdialog.c (original)
+++ trunk/app/widgets/gimppdbdialog.c Tue Nov 4 12:33:09 2008
@@ -356,9 +356,9 @@
}
else if (error)
{
- gimp_message (dialog->context->gimp, G_OBJECT (dialog),
- GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (dialog->context->gimp, G_OBJECT (dialog),
+ GIMP_MESSAGE_ERROR,
+ error->message);
g_error_free (error);
}
Modified: trunk/app/widgets/gimpsettingsbox.c
==============================================================================
--- trunk/app/widgets/gimpsettingsbox.c (original)
+++ trunk/app/widgets/gimpsettingsbox.c Tue Nov 4 12:33:09 2008
@@ -458,8 +458,8 @@
NULL, &error))
{
if (error->code != GIMP_CONFIG_ERROR_OPEN_ENOENT)
- gimp_message (box->gimp, NULL, GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (box->gimp, NULL, GIMP_MESSAGE_ERROR,
+ error->message);
g_clear_error (&error);
}
@@ -483,8 +483,8 @@
"end of settings",
NULL, &error))
{
- gimp_message (box->gimp, NULL, GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (box->gimp, NULL, GIMP_MESSAGE_ERROR,
+ error->message);
g_clear_error (&error);
}
Modified: trunk/app/widgets/gimpvectorstreeview.c
==============================================================================
--- trunk/app/widgets/gimpvectorstreeview.c (original)
+++ trunk/app/widgets/gimpvectorstreeview.c Tue Nov 4 12:33:09 2008
@@ -236,8 +236,9 @@
if (! gimp_vectors_import_buffer (image, svg_data, svg_data_len,
TRUE, TRUE, index, NULL, &error))
{
- gimp_message (image->gimp, G_OBJECT (tree_view), GIMP_MESSAGE_ERROR,
- "%s", error->message);
+ gimp_message_literal (image->gimp,
+ G_OBJECT (tree_view), GIMP_MESSAGE_ERROR,
+ error->message);
g_clear_error (&error);
}
else
Modified: trunk/app/widgets/gimpwidgets-utils.c
==============================================================================
--- trunk/app/widgets/gimpwidgets-utils.c (original)
+++ trunk/app/widgets/gimpwidgets-utils.c Tue Nov 4 12:33:09 2008
@@ -893,8 +893,9 @@
if (! file)
{
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
- g_strerror (errno));
+ g_set_error_literal (error, G_FILE_ERROR,
+ g_file_error_from_errno (errno),
+ g_strerror (errno));
return FALSE;
}
@@ -950,8 +951,9 @@
if (fd == -1)
{
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
- g_strerror (errno));
+ g_set_error_literal (error, G_FILE_ERROR,
+ g_file_error_from_errno (errno),
+ g_strerror (errno));
return FALSE;
}
@@ -977,8 +979,9 @@
{
g_free (text_contents);
close (fd);
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
- g_strerror (errno));
+ g_set_error_literal (error, G_FILE_ERROR,
+ g_file_error_from_errno (errno),
+ g_strerror (errno));
return FALSE;
}
}
Modified: trunk/app/xcf/xcf-load.c
==============================================================================
--- trunk/app/xcf/xcf-load.c (original)
+++ trunk/app/xcf/xcf-load.c Tue Nov 4 12:33:09 2008
@@ -275,18 +275,18 @@
if (num_successful_elements == 0)
goto hard_error;
- gimp_message (gimp, G_OBJECT (info->progress), GIMP_MESSAGE_WARNING,
- _("This XCF file is corrupt! I have loaded as much "
- "of it as I can, but it is incomplete."));
+ gimp_message_literal (gimp, G_OBJECT (info->progress), GIMP_MESSAGE_WARNING,
+ _("This XCF file is corrupt! I have loaded as much "
+ "of it as I can, but it is incomplete."));
gimp_image_undo_enable (image);
return image;
hard_error:
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
- _("This XCF file is corrupt! I could not even "
- "salvage any partial image data from it."));
+ g_set_error_literal (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+ _("This XCF file is corrupt! I could not even "
+ "salvage any partial image data from it."));
g_object_unref (image);
@@ -321,11 +321,11 @@
{
gint i;
- gimp_message (info->gimp, G_OBJECT (info->progress),
- GIMP_MESSAGE_WARNING,
- _("XCF warning: version 0 of XCF file format\n"
- "did not save indexed colormaps correctly.\n"
- "Substituting grayscale map."));
+ gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+ GIMP_MESSAGE_WARNING,
+ _("XCF warning: version 0 of XCF file format\n"
+ "did not save indexed colormaps correctly.\n"
+ "Substituting grayscale map."));
if (! xcf_seek_pos (info, info->cp + n_colors, NULL))
return FALSE;
@@ -365,7 +365,7 @@
gimp_message (info->gimp, G_OBJECT (info->progress),
GIMP_MESSAGE_ERROR,
"Unknown compression type: %d",
- (int) compression);
+ (gint) compression);
return FALSE;
}
@@ -402,9 +402,9 @@
break;
default:
- gimp_message (info->gimp, G_OBJECT (info->progress),
- GIMP_MESSAGE_WARNING,
- "Guide orientation out of range in XCF file");
+ gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+ GIMP_MESSAGE_WARNING,
+ "Guide orientation out of range in XCF file");
continue;
}
}
@@ -443,9 +443,9 @@
if (xres < GIMP_MIN_RESOLUTION || xres > GIMP_MAX_RESOLUTION ||
yres < GIMP_MIN_RESOLUTION || yres > GIMP_MAX_RESOLUTION)
{
- gimp_message (info->gimp, G_OBJECT (info->progress),
- GIMP_MESSAGE_WARNING,
- "Warning, resolution out of range in XCF file");
+ gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+ GIMP_MESSAGE_WARNING,
+ "Warning, resolution out of range in XCF file");
xres = image->gimp->config->default_image->xresolution;
yres = image->gimp->config->default_image->yresolution;
}
@@ -473,9 +473,9 @@
}
if (info->cp - base != prop_size)
- gimp_message (info->gimp, G_OBJECT (info->progress),
- GIMP_MESSAGE_WARNING,
- "Error while loading an image's parasites");
+ gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+ GIMP_MESSAGE_WARNING,
+ "Error while loading an image's parasites");
}
break;
@@ -488,10 +488,10 @@
if ((unit <= GIMP_UNIT_PIXEL) ||
(unit >= _gimp_unit_get_number_of_built_in_units (image->gimp)))
{
- gimp_message (info->gimp, G_OBJECT (info->progress),
- GIMP_MESSAGE_WARNING,
- "Warning, unit out of range in XCF file, "
- "falling back to inches");
+ gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+ GIMP_MESSAGE_WARNING,
+ "Warning, unit out of range in XCF file, "
+ "falling back to inches");
unit = GIMP_UNIT_INCH;
}
@@ -731,9 +731,9 @@
}
if (info->cp - base != prop_size)
- gimp_message (info->gimp, G_OBJECT (info->progress),
- GIMP_MESSAGE_WARNING,
- "Error while loading a layer's parasites");
+ gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+ GIMP_MESSAGE_WARNING,
+ "Error while loading a layer's parasites");
}
break;
@@ -882,9 +882,9 @@
}
if (info->cp - base != prop_size)
- gimp_message (info->gimp, G_OBJECT (info->progress),
- GIMP_MESSAGE_WARNING,
- "Error while loading a channel's parasites");
+ gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+ GIMP_MESSAGE_WARNING,
+ "Error while loading a channel's parasites");
}
break;
@@ -1256,9 +1256,9 @@
if (offset == 0)
{
- gimp_message (info->gimp, G_OBJECT (info->progress),
- GIMP_MESSAGE_ERROR,
- "not enough tiles found in level");
+ gimp_message_literal (info->gimp, G_OBJECT (info->progress),
+ GIMP_MESSAGE_ERROR,
+ "not enough tiles found in level");
return FALSE;
}
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Tue Nov 4 12:33:09 2008
@@ -42,7 +42,7 @@
# required versions of other packages
m4_define([babl_required_version], [0.0.22])
m4_define([gegl_required_version], [0.0.21])
-m4_define([glib_required_version], [2.16.1])
+m4_define([glib_required_version], [2.18.0])
m4_define([gtk_required_version], [2.12.5])
m4_define([gdk_pixbuf_required_version], [gtk_required_version])
m4_define([cairo_required_version], [1.6.0])
Modified: trunk/tools/pdbgen/pdb/convert.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/convert.pdb (original)
+++ trunk/tools/pdbgen/pdb/convert.pdb Tue Nov 4 12:33:09 2008
@@ -148,9 +148,10 @@
}
else if (pal->n_colors > MAXNUMCOLORS)
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Cannot convert to a palette "
- "with more than 256 colors."));
+ g_set_error_literal (error,
+ GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Cannot convert to a palette "
+ "with more than 256 colors."));
success = FALSE;
}
break;
Modified: trunk/tools/pdbgen/pdb/edit.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/edit.pdb (original)
+++ trunk/tools/pdbgen/pdb/edit.pdb Tue Nov 4 12:33:09 2008
@@ -56,8 +56,9 @@
if (! non_empty)
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
- "%s", my_error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+ my_error->message);
g_clear_error (&my_error);
}
}
@@ -107,8 +108,9 @@
if (! non_empty)
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
- "%s", my_error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+ my_error->message);
g_clear_error (&my_error);
}
}
@@ -151,8 +153,9 @@
if (! non_empty)
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
- "%s", my_error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+ my_error->message);
g_clear_error (&my_error);
}
}
@@ -289,8 +292,9 @@
}
else
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
- "%s", my_error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+ my_error->message);
g_clear_error (&my_error);
}
}
@@ -341,8 +345,9 @@
}
else
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
- "%s", my_error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+ my_error->message);
g_clear_error (&my_error);
}
}
@@ -392,8 +397,9 @@
}
else
{
- gimp_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
- "%s", my_error->message);
+ gimp_message_literal (gimp,
+ G_OBJECT (progress), GIMP_MESSAGE_WARNING,
+ my_error->message);
g_clear_error (&my_error);
}
}
Modified: trunk/tools/pdbgen/pdb/floating_sel.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/floating_sel.pdb (original)
+++ trunk/tools/pdbgen/pdb/floating_sel.pdb Tue Nov 4 12:33:09 2008
@@ -43,9 +43,9 @@
}
else
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Cannot remove this layer because "
- "it is not a floating selection."));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Cannot remove this layer because "
+ "it is not a floating selection."));
success = FALSE;
}
}
@@ -80,9 +80,9 @@
}
else
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Cannot anchor this layer because "
- "it is not a floating selection."));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Cannot anchor this layer because "
+ "it is not a floating selection."));
success = FALSE;
}
}
@@ -119,9 +119,9 @@
}
else
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Cannot convert this layer to a normal layer because "
- "it is not a floating selection."));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Cannot convert this layer to a normal layer "
+ "because it is not a floating selection."));
success = FALSE;
}
}
@@ -180,9 +180,9 @@
}
else
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Cannot rigor this layer because "
- "it is not a floating selection."));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Cannot rigor this layer because "
+ "it is not a floating selection."));
success = FALSE;
}
}
@@ -211,9 +211,9 @@
}
else
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Cannot relax this layer because "
- "it is not a floating selection."));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Cannot relax this layer because "
+ "it is not a floating selection."));
success = FALSE;
}
}
Modified: trunk/tools/pdbgen/pdb/image.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/image.pdb (original)
+++ trunk/tools/pdbgen/pdb/image.pdb Tue Nov 4 12:33:09 2008
@@ -2300,9 +2300,9 @@
! FINITE (yresolution) ||
yresolution < GIMP_MIN_RESOLUTION || yresolution > GIMP_MAX_RESOLUTION)
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("Image resolution is out of bounds, "
- "using the default resolution instead."));
+ g_set_error_literal (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Image resolution is out of bounds, "
+ "using the default resolution instead."));
success = FALSE;
}
else
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
