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

app: rename GimpToolInfo::menu_path to ::menu_label 

"path" is a really ancient pre-GtkAction terminology here.
This commit is contained in:
Michael Natterer 2012-02-14 10:00:26 +01:00
parent f2fc342101
commit 7f5a43f3e1
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/actions/tools-actions.c
View File

@ -738,7 +738,7 @@ tools_actions_setup (GimpActionGroup *group)
{ {
GimpToolInfo *tool_info = list->data; GimpToolInfo *tool_info = list->data;
if (tool_info->menu_path) if (tool_info->menu_label)
{ {
GimpStringActionEntry entry; GimpStringActionEntry entry;
const gchar *stock_id; const gchar *stock_id;
@ -756,7 +756,7 @@ tools_actions_setup (GimpActionGroup *group)
entry.name = name; entry.name = name;
entry.stock_id = stock_id; entry.stock_id = stock_id;
entry.label = tool_info->menu_path; entry.label = tool_info->menu_label;
entry.accelerator = tool_info->menu_accel; entry.accelerator = tool_info->menu_accel;
entry.tooltip = tool_info->help; entry.tooltip = tool_info->help;
entry.help_id = tool_info->help_id; entry.help_id = tool_info->help_id;

14
app/core/gimptoolinfo.c
View File

@ -93,7 +93,7 @@ gimp_tool_info_init (GimpToolInfo *tool_info)
tool_info->blurb = NULL; tool_info->blurb = NULL;
tool_info->help = NULL; tool_info->help = NULL;
tool_info->menu_path = NULL; tool_info->menu_label = NULL;
tool_info->menu_accel = NULL; tool_info->menu_accel = NULL;
tool_info->help_domain = NULL; tool_info->help_domain = NULL;
@ -141,10 +141,10 @@ gimp_tool_info_finalize (GObject *object)
tool_info->blurb = NULL; tool_info->blurb = NULL;
} }
if (tool_info->menu_path) if (tool_info->menu_label)
{ {
g_free (tool_info->menu_path); g_free (tool_info->menu_label);
tool_info->menu_path = NULL; tool_info->menu_label = NULL;
} }
if (tool_info->menu_accel) if (tool_info->menu_accel)
{ {
@ -231,7 +231,7 @@ gimp_tool_info_new (Gimp *gimp,
const gchar *identifier, const gchar *identifier,
const gchar *blurb, const gchar *blurb,
const gchar *help, const gchar *help,
const gchar *menu_path, const gchar *menu_label,
const gchar *menu_accel, const gchar *menu_accel,
const gchar *help_domain, const gchar *help_domain,
const gchar *help_id, const gchar *help_id,
@ -245,7 +245,7 @@ gimp_tool_info_new (Gimp *gimp,
g_return_val_if_fail (identifier != NULL, NULL); g_return_val_if_fail (identifier != NULL, NULL);
g_return_val_if_fail (blurb != NULL, NULL); g_return_val_if_fail (blurb != NULL, NULL);
g_return_val_if_fail (help != NULL, NULL); g_return_val_if_fail (help != NULL, NULL);
g_return_val_if_fail (menu_path != NULL, NULL); g_return_val_if_fail (menu_label != NULL, NULL);
g_return_val_if_fail (help_id != NULL, NULL); g_return_val_if_fail (help_id != NULL, NULL);
g_return_val_if_fail (paint_core_name != NULL, NULL); g_return_val_if_fail (paint_core_name != NULL, NULL);
g_return_val_if_fail (stock_id != NULL, NULL); g_return_val_if_fail (stock_id != NULL, NULL);
@ -268,7 +268,7 @@ gimp_tool_info_new (Gimp *gimp,
tool_info->blurb = g_strdup (blurb); tool_info->blurb = g_strdup (blurb);
tool_info->help = g_strdup (help); tool_info->help = g_strdup (help);
tool_info->menu_path = g_strdup (menu_path); tool_info->menu_label = g_strdup (menu_label);
tool_info->menu_accel = g_strdup (menu_accel); tool_info->menu_accel = g_strdup (menu_accel);
tool_info->help_domain = g_strdup (help_domain); tool_info->help_domain = g_strdup (help_domain);

4
app/core/gimptoolinfo.h
View File

@ -45,7 +45,7 @@ struct _GimpToolInfo
gchar *blurb; gchar *blurb;
gchar *help; gchar *help;
gchar *menu_path; gchar *menu_label;
gchar *menu_accel; gchar *menu_accel;
gchar *help_domain; gchar *help_domain;
@ -73,7 +73,7 @@ GimpToolInfo * gimp_tool_info_new (Gimp *gimp,
const gchar *identifier, const gchar *identifier,
const gchar *blurb, const gchar *blurb,
const gchar *help, const gchar *help,
const gchar *menu_path, const gchar *menu_label,
const gchar *menu_accel, const gchar *menu_accel,
const gchar *help_domain, const gchar *help_domain,
const gchar *help_id, const gchar *help_id,

6
app/tools/gimp-tools.c
View File

@ -95,7 +95,7 @@ static void gimp_tools_register (GType tool_type,
const gchar *identifier, const gchar *identifier,
const gchar *blurb, const gchar *blurb,
const gchar *help, const gchar *help,
const gchar *menu_path, const gchar *menu_label,
const gchar *menu_accel, const gchar *menu_accel,
const gchar *help_domain, const gchar *help_domain,
const gchar *help_data, const gchar *help_data,
@ -455,7 +455,7 @@ gimp_tools_register (GType tool_type,
const gchar *identifier, const gchar *identifier,
const gchar *blurb, const gchar *blurb,
const gchar *help, const gchar *help,
const gchar *menu_path, const gchar *menu_label,
const gchar *menu_accel, const gchar *menu_accel,
const gchar *help_domain, const gchar *help_domain,
const gchar *help_data, const gchar *help_data,
@ -531,7 +531,7 @@ gimp_tools_register (GType tool_type,
identifier, identifier,
blurb, blurb,
help, help,
menu_path, menu_label,
menu_accel, menu_accel,
help_domain, help_domain,
help_data, help_data,