dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/core/gimp-gui.[ch] renamed gimp_message() to gimp_show_message() 

2006-08-08  Sven Neumann  <sven@gimp.org>

	* 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.
This commit is contained in:
Sven Neumann 2006-08-08 18:18:40 +00:00 committed by Sven Neumann
parent 9f1b9a81a0
commit 504fe2ccac
7 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-08-08 Sven Neumann <sven@gimp.org>
* 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 <sven@gimp.org>
* plug-ins/common/warp.c (diff_prepare_row): applied patch from

17
app/core/gimp-gui.c
View File

@ -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
{

4
app/core/gimp-gui.h
View File

@ -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);

10
app/errors.c
View File

@ -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

2
app/gui/gui-vtable.c
View File

@ -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;

2
app/pdb/message_cmds.c
View File

@ -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);
}

2
tools/pdbgen/pdb/message.pdb
View File

@ -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);
}