From 504fe2ccaca4d11c2acb9eac7188247decafdcf9 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 8 Aug 2006 18:18:40 +0000 Subject: [PATCH] app/core/gimp-gui.[ch] renamed gimp_message() to gimp_show_message() 2006-08-08 Sven Neumann * app/core/gimp-gui.[ch] * app/gui/gui-vtable.c: renamed gimp_message() to gimp_show_message() * app/errors.c * tools/pdbgen/pdb/message.pdb: changed accordingly. * app/pdb/message_cmds.c: regenerated. --- ChangeLog | 10 ++++++++++ app/core/gimp-gui.c | 17 +++++++++-------- app/core/gimp-gui.h | 4 ++-- app/errors.c | 10 ++++++---- app/gui/gui-vtable.c | 2 +- app/pdb/message_cmds.c | 2 +- tools/pdbgen/pdb/message.pdb | 2 +- 7 files changed, 30 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12e2cdf422..93d985f0ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-08-08 Sven Neumann + + * app/core/gimp-gui.[ch] + * app/gui/gui-vtable.c: renamed gimp_message() to gimp_show_message() + + * app/errors.c + * tools/pdbgen/pdb/message.pdb: changed accordingly. + + * app/pdb/message_cmds.c: regenerated. + 2006-08-08 Sven Neumann * plug-ins/common/warp.c (diff_prepare_row): applied patch from diff --git a/app/core/gimp-gui.c b/app/core/gimp-gui.c index 392d967824..09dd08720d 100644 --- a/app/core/gimp-gui.c +++ b/app/core/gimp-gui.c @@ -45,7 +45,7 @@ gimp_gui_init (Gimp *gimp) gimp->gui.threads_leave = NULL; gimp->gui.set_busy = NULL; gimp->gui.unset_busy = NULL; - gimp->gui.message = NULL; + gimp->gui.show_message = NULL; gimp->gui.help = NULL; gimp->gui.get_program_class = NULL; gimp->gui.get_display_name = NULL; @@ -139,10 +139,10 @@ gimp_unset_busy (Gimp *gimp) } void -gimp_message (Gimp *gimp, - GimpProgress *progress, - const gchar *domain, - const gchar *message) +gimp_show_message (Gimp *gimp, + GimpProgress *progress, + const gchar *domain, + const gchar *message) { g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress)); @@ -151,13 +151,14 @@ gimp_message (Gimp *gimp, if (! domain) domain = GIMP_ACRONYM; - if (progress && gimp_progress_message (progress, gimp, domain, message)) + if (progress && + gimp_progress_message (progress, gimp, domain, message)) { /* message has already been handled by GimpProgress */ } - else if (gimp->gui.message && ! gimp->console_messages) + else if (gimp->gui.show_message && ! gimp->console_messages) { - gimp->gui.message (gimp, progress, domain, message); + gimp->gui.show_message (gimp, progress, domain, message); } else { diff --git a/app/core/gimp-gui.h b/app/core/gimp-gui.h index cb1d006694..30bd648ccd 100644 --- a/app/core/gimp-gui.h +++ b/app/core/gimp-gui.h @@ -30,7 +30,7 @@ struct _GimpGui void (* set_busy) (Gimp *gimp); void (* unset_busy) (Gimp *gimp); - void (* message) (Gimp *gimp, + void (* show_message) (Gimp *gimp, GimpProgress *progress, const gchar *domain, const gchar *message); @@ -104,7 +104,7 @@ void gimp_set_busy (Gimp *gimp); void gimp_set_busy_until_idle (Gimp *gimp); void gimp_unset_busy (Gimp *gimp); -void gimp_message (Gimp *gimp, +void gimp_show_message (Gimp *gimp, GimpProgress *progress, const gchar *domain, const gchar *message); diff --git a/app/errors.c b/app/errors.c index 7bd581efb3..bd807d3bc6 100644 --- a/app/errors.c +++ b/app/errors.c @@ -91,11 +91,13 @@ gimp_message_log_func (const gchar *log_domain, if (gimp && GIMP_IS_GIMP (*gimp)) { - gimp_message (*gimp, NULL, NULL, message); - return; + gimp_show_message (*gimp, NULL, NULL, message); + } + else + { + g_printerr ("%s: %s\n\n", + gimp_filename_to_utf8 (full_prog_name), message); } - - g_printerr ("%s: %s\n\n", gimp_filename_to_utf8 (full_prog_name), message); } void diff --git a/app/gui/gui-vtable.c b/app/gui/gui-vtable.c index 099fd7cec1..a5ed585ef6 100644 --- a/app/gui/gui-vtable.c +++ b/app/gui/gui-vtable.c @@ -125,7 +125,7 @@ gui_vtable_init (Gimp *gimp) gimp->gui.threads_leave = gui_threads_leave; gimp->gui.set_busy = gui_set_busy; gimp->gui.unset_busy = gui_unset_busy; - gimp->gui.message = gui_message; + gimp->gui.show_message = gui_message; gimp->gui.help = gui_help; gimp->gui.get_program_class = gui_get_program_class; gimp->gui.get_display_name = gui_get_display_name; diff --git a/app/pdb/message_cmds.c b/app/pdb/message_cmds.c index 907a72e077..d1580c6d1c 100644 --- a/app/pdb/message_cmds.c +++ b/app/pdb/message_cmds.c @@ -53,7 +53,7 @@ message_invoker (GimpProcedure *procedure, if (gimp->plug_in_manager->current_plug_in) domain = gimp_plug_in_get_undo_desc (gimp->plug_in_manager->current_plug_in); - gimp_message (gimp, progress, domain, message); + gimp_show_message (gimp, progress, domain, message); g_free (domain); } diff --git a/tools/pdbgen/pdb/message.pdb b/tools/pdbgen/pdb/message.pdb index 1002171ed6..aafea333b9 100644 --- a/tools/pdbgen/pdb/message.pdb +++ b/tools/pdbgen/pdb/message.pdb @@ -39,7 +39,7 @@ HELP if (gimp->plug_in_manager->current_plug_in) domain = gimp_plug_in_get_undo_desc (gimp->plug_in_manager->current_plug_in); - gimp_message (gimp, progress, domain, message); + gimp_show_message (gimp, progress, domain, message); g_free (domain); }