[gnome-menus] Rename gmenu_tree_item_get_type() to _get_item_type()

[Vincent Untz <vuntz src gnome org>]

commit 8eaf04da66be9437c518ac21e27cbbb67abcd3f5
Author: Colin Walters <walters verbum org>
Date:   Sun Apr 17 08:44:02 2011 -0400

    Rename gmenu_tree_item_get_type() to _get_item_type()
    
    The _get_type() namespace suffix is reserved for GType.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=647968

 libmenu/gmenu-tree.c  |    6 +++---
 libmenu/gmenu-tree.h  |    2 +-
 util/test-menu-spec.c |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
index 2303a37..ec499bf 100644
--- a/libmenu/gmenu-tree.c
+++ b/libmenu/gmenu-tree.c
@@ -623,7 +623,7 @@ find_path (GMenuTreeDirectory *directory,
     {
       GMenuTreeItem *item = tmp->data;
 
-      if (gmenu_tree_item_get_type (item) != GMENU_TREE_ITEM_DIRECTORY)
+      if (gmenu_tree_item_get_item_type (item) != GMENU_TREE_ITEM_DIRECTORY)
         {
           tmp = tmp->next;
           continue;
@@ -677,7 +677,7 @@ gmenu_tree_invoke_monitors (GMenuTree *tree)
 }
 
 GMenuTreeItemType
-gmenu_tree_item_get_type (GMenuTreeItem *item)
+gmenu_tree_item_get_item_type (GMenuTreeItem *item)
 {
   g_return_val_if_fail (item != NULL, 0);
 
@@ -3868,7 +3868,7 @@ merge_subdirs_and_entries (GMenuTree          *tree,
       GMenuTreeItem     *item = tmp->data;
       GMenuTreeItemType  type;
 
-      type = gmenu_tree_item_get_type (item);
+      type = gmenu_tree_item_get_item_type (item);
 
       if (type == GMENU_TREE_ITEM_ALIAS)
         {
diff --git a/libmenu/gmenu-tree.h b/libmenu/gmenu-tree.h
index 02fcad4..7539466 100644
--- a/libmenu/gmenu-tree.h
+++ b/libmenu/gmenu-tree.h
@@ -97,7 +97,7 @@ void     gmenu_tree_item_set_user_data (GMenuTreeItem   *item,
 					GDestroyNotify  dnotify);
 gpointer gmenu_tree_item_get_user_data (GMenuTreeItem   *item);
 
-GMenuTreeItemType   gmenu_tree_item_get_type   (GMenuTreeItem *item);
+GMenuTreeItemType   gmenu_tree_item_get_item_type   (GMenuTreeItem *item);
 GMenuTreeDirectory *gmenu_tree_item_get_parent (GMenuTreeItem *item);
 
 
diff --git a/util/test-menu-spec.c b/util/test-menu-spec.c
index fdf14ac..c7b5d20 100644
--- a/util/test-menu-spec.c
+++ b/util/test-menu-spec.c
@@ -123,7 +123,7 @@ print_directory (GMenuTreeDirectory *directory)
     {
       GMenuTreeItem *item = tmp->data;
 
-      switch (gmenu_tree_item_get_type (item))
+      switch (gmenu_tree_item_get_item_type (item))
 	{
 	case GMENU_TREE_ITEM_ENTRY:
 	  print_entry (GMENU_TREE_ENTRY (item), path);
@@ -142,7 +142,7 @@ print_directory (GMenuTreeDirectory *directory)
 	    GMenuTreeItem *aliased_item;
 
 	    aliased_item = gmenu_tree_alias_get_item (GMENU_TREE_ALIAS (item));
-	    if (gmenu_tree_item_get_type (aliased_item) == GMENU_TREE_ITEM_ENTRY)
+	    if (gmenu_tree_item_get_item_type (aliased_item) == GMENU_TREE_ITEM_ENTRY)
 	      print_entry (GMENU_TREE_ENTRY (aliased_item), path);
 	  }
 	  break;