[gnome-menus] libmenu, util: Rename gmenu_tree_get_menu_path()

[Vincent Untz <vuntz src gnome org>]

commit 6f4cf16ec2633ebc62cb91759dbfd01923cd3c73
Author: Vincent Untz <vuntz gnome org>
Date:   Thu Jul 21 18:09:25 2011 +0200

    libmenu, util: Rename gmenu_tree_get_menu_path()
    
    Renamed to gmenu_tree_get_canonical_menu_path(), to avoid any potential
    confusion with the menu-path property.

 libmenu/gmenu-tree.c  |    6 +++---
 libmenu/gmenu-tree.h  |    2 +-
 util/test-menu-spec.c |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
index 64b96dd..8aa420e 100644
--- a/libmenu/gmenu-tree.c
+++ b/libmenu/gmenu-tree.c
@@ -638,16 +638,16 @@ gmenu_tree_class_init (GMenuTreeClass *klass)
 }
 
 /**
- * gmenu_tree_get_menu_path:
+ * gmenu_tree_get_canonical_menu_path:
  * @tree: a #GMenuTree
  *
  * This function is only available if the tree has been loaded via
  * gmenu_tree_load_sync() or a variant thereof.
  *
- * Returns: The absolute path to the loaded menu file
+ * Returns: The absolute and canonicalized path to the loaded menu file
  */
 const char *
-gmenu_tree_get_menu_path (GMenuTree *tree)
+gmenu_tree_get_canonical_menu_path (GMenuTree *tree)
 {
   g_return_val_if_fail (GMENU_IS_TREE (tree), NULL);
   g_return_val_if_fail (tree->loaded, NULL);
diff --git a/libmenu/gmenu-tree.h b/libmenu/gmenu-tree.h
index 5a2a4c9..1d9cd0d 100644
--- a/libmenu/gmenu-tree.h
+++ b/libmenu/gmenu-tree.h
@@ -92,7 +92,7 @@ GMenuTree *gmenu_tree_new_for_path (const char     *menu_path,
 gboolean   gmenu_tree_load_sync (GMenuTree  *tree,
                                  GError    **error);
 
-const char         *gmenu_tree_get_menu_path           (GMenuTree  *tree);
+const char         *gmenu_tree_get_canonical_menu_path (GMenuTree  *tree);
 GMenuTreeDirectory *gmenu_tree_get_root_directory      (GMenuTree  *tree);
 GMenuTreeDirectory *gmenu_tree_get_directory_from_path (GMenuTree  *tree,
 							const char *path);
diff --git a/util/test-menu-spec.c b/util/test-menu-spec.c
index 1a61da3..f8e6eb6 100644
--- a/util/test-menu-spec.c
+++ b/util/test-menu-spec.c
@@ -234,7 +234,7 @@ main (int argc, char **argv)
       return 1;
     }
 
-  g_print ("Loaded menu from %s\n", gmenu_tree_get_menu_path (tree));
+  g_print ("Loaded menu from %s\n", gmenu_tree_get_canonical_menu_path (tree));
 
   root = gmenu_tree_get_root_directory (tree);
   if (root != NULL)