[gimp] app: rename GimpToolInfo::menu_path to ::menu_label



commit 7f5a43f3e1301878edd0fa707681abcd92999dc3
Author: Michael Natterer <mitch gimp org>
Date:   Tue Feb 14 10:00:26 2012 +0100

    app: rename GimpToolInfo::menu_path to ::menu_label
    
    "path" is a really ancient pre-GtkAction terminology here.

 app/actions/tools-actions.c |    4 ++--
 app/core/gimptoolinfo.c     |   14 +++++++-------
 app/core/gimptoolinfo.h     |    4 ++--
 app/tools/gimp-tools.c      |    6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c
index b5f8452..0130396 100644
--- a/app/actions/tools-actions.c
+++ b/app/actions/tools-actions.c
@@ -738,7 +738,7 @@ tools_actions_setup (GimpActionGroup *group)
     {
       GimpToolInfo *tool_info = list->data;
 
-      if (tool_info->menu_path)
+      if (tool_info->menu_label)
         {
           GimpStringActionEntry  entry;
           const gchar           *stock_id;
@@ -756,7 +756,7 @@ tools_actions_setup (GimpActionGroup *group)
 
           entry.name        = name;
           entry.stock_id    = stock_id;
-          entry.label       = tool_info->menu_path;
+          entry.label       = tool_info->menu_label;
           entry.accelerator = tool_info->menu_accel;
           entry.tooltip     = tool_info->help;
           entry.help_id     = tool_info->help_id;
diff --git a/app/core/gimptoolinfo.c b/app/core/gimptoolinfo.c
index 57dc665..2a80c7f 100644
--- a/app/core/gimptoolinfo.c
+++ b/app/core/gimptoolinfo.c
@@ -93,7 +93,7 @@ gimp_tool_info_init (GimpToolInfo *tool_info)
   tool_info->blurb             = NULL;
   tool_info->help              = NULL;
 
-  tool_info->menu_path         = NULL;
+  tool_info->menu_label        = NULL;
   tool_info->menu_accel        = NULL;
 
   tool_info->help_domain       = NULL;
@@ -141,10 +141,10 @@ gimp_tool_info_finalize (GObject *object)
       tool_info->blurb = NULL;
     }
 
-  if (tool_info->menu_path)
+  if (tool_info->menu_label)
     {
-      g_free (tool_info->menu_path);
-      tool_info->menu_path = NULL;
+      g_free (tool_info->menu_label);
+      tool_info->menu_label = NULL;
     }
   if (tool_info->menu_accel)
     {
@@ -231,7 +231,7 @@ gimp_tool_info_new (Gimp                *gimp,
                     const gchar         *identifier,
                     const gchar         *blurb,
                     const gchar         *help,
-                    const gchar         *menu_path,
+                    const gchar         *menu_label,
                     const gchar         *menu_accel,
                     const gchar         *help_domain,
                     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 (blurb != 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 (paint_core_name != 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->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->help_domain       = g_strdup (help_domain);
diff --git a/app/core/gimptoolinfo.h b/app/core/gimptoolinfo.h
index aa6c6e4..93a0318 100644
--- a/app/core/gimptoolinfo.h
+++ b/app/core/gimptoolinfo.h
@@ -45,7 +45,7 @@ struct _GimpToolInfo
   gchar               *blurb;
   gchar               *help;
 
-  gchar               *menu_path;
+  gchar               *menu_label;
   gchar               *menu_accel;
 
   gchar               *help_domain;
@@ -73,7 +73,7 @@ GimpToolInfo * gimp_tool_info_new          (Gimp                *gimp,
                                             const gchar         *identifier,
                                             const gchar         *blurb,
                                             const gchar         *help,
-                                            const gchar         *menu_path,
+                                            const gchar         *menu_label,
                                             const gchar         *menu_accel,
                                             const gchar         *help_domain,
                                             const gchar         *help_id,
diff --git a/app/tools/gimp-tools.c b/app/tools/gimp-tools.c
index 56e027c..6959383 100644
--- a/app/tools/gimp-tools.c
+++ b/app/tools/gimp-tools.c
@@ -95,7 +95,7 @@ static void   gimp_tools_register (GType                   tool_type,
                                    const gchar            *identifier,
                                    const gchar            *blurb,
                                    const gchar            *help,
-                                   const gchar            *menu_path,
+                                   const gchar            *menu_label,
                                    const gchar            *menu_accel,
                                    const gchar            *help_domain,
                                    const gchar            *help_data,
@@ -455,7 +455,7 @@ gimp_tools_register (GType                   tool_type,
                      const gchar            *identifier,
                      const gchar            *blurb,
                      const gchar            *help,
-                     const gchar            *menu_path,
+                     const gchar            *menu_label,
                      const gchar            *menu_accel,
                      const gchar            *help_domain,
                      const gchar            *help_data,
@@ -531,7 +531,7 @@ gimp_tools_register (GType                   tool_type,
                                   identifier,
                                   blurb,
                                   help,
-                                  menu_path,
+                                  menu_label,
                                   menu_accel,
                                   help_domain,
                                   help_data,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]