[gnome-menus/wip/gobject-review: 34/38] libmenu: Rename desktop_entry_desktop_get_icon to desktop_entry_get_icon

[Vincent Untz <vuntz src gnome org>]

commit d1572cd45f33b1bafb9d69f68eb2794911c335e6
Author: Vincent Untz <vuntz gnome org>
Date:   Sun Jun 12 11:05:52 2011 +0200

    libmenu: Rename desktop_entry_desktop_get_icon to desktop_entry_get_icon
    
    The additional desktop in the name was confusing.

 libmenu/desktop-entries.c |    2 +-
 libmenu/desktop-entries.h |    2 +-
 libmenu/gmenu-tree.c      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
index 578e9a0..5d06b0c 100644
--- a/libmenu/desktop-entries.c
+++ b/libmenu/desktop-entries.c
@@ -455,7 +455,7 @@ desktop_entry_get_comment (DesktopEntry *entry)
 }
 
 const char *
-desktop_entry_desktop_get_icon (DesktopEntry *entry)
+desktop_entry_get_icon (DesktopEntry *entry)
 {
   g_return_val_if_fail (entry->type == DESKTOP_ENTRY_DIRECTORY, NULL);
   return ((DesktopEntryDirectory*)entry)->icon;
diff --git a/libmenu/desktop-entries.h b/libmenu/desktop-entries.h
index ae0dfd5..ab4edce 100644
--- a/libmenu/desktop-entries.h
+++ b/libmenu/desktop-entries.h
@@ -49,7 +49,7 @@ gboolean          desktop_entry_get_hidden   (DesktopEntry *entry);
 gboolean          desktop_entry_get_no_display (DesktopEntry *entry);
 
 /* Only valid for DESKTOP_ENTRY_DIRECTORY */
-const char       *desktop_entry_desktop_get_icon (DesktopEntry *entry);
+const char       *desktop_entry_get_icon     (DesktopEntry *entry);
 
 /* Only valid for DESKTOP_ENTRY_DESKTOP */
 GDesktopAppInfo  *desktop_entry_get_app_info (DesktopEntry *entry);
diff --git a/libmenu/gmenu-tree.c b/libmenu/gmenu-tree.c
index 68ebbac..d92c2b0 100644
--- a/libmenu/gmenu-tree.c
+++ b/libmenu/gmenu-tree.c
@@ -956,7 +956,7 @@ gmenu_tree_directory_get_icon (GMenuTreeDirectory *directory)
   if (!directory->directory_entry)
     return NULL;
 
-  return desktop_entry_desktop_get_icon (directory->directory_entry);
+  return desktop_entry_get_icon (directory->directory_entry);
 }
 
 const char *