* libxfce4menu/xfce-menu.c: Always use xfce_menu_get_element() when

	  comparing two menu elements instead of handling menus and items
	  in different ways.
	* libxfce4menu/xfce-menu-item.c: Minor cleanup of the
	  XfceMenuElement functions.
	* tests/test-display-menu.c: Always use xfce_menu_get_element(), never
	  use xfce_menu_item_get_name() directly.

git-svn-id: https://svn.xfce.org/svn/xfce/libxfce4menu/trunk@28979 a0aa69c2-05f4-0310-b83c-d5d913b14636

4 files changed, 15 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index ce96bad..4201ad5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-12-04	Jannis Pohlmann <jannis@xfce.org>
+
+	* libxfce4menu/xfce-menu.c: Always use xfce_menu_get_element() when
+	  comparing two menu elements instead of handling menus and items
+	  in different ways.
+	* libxfce4menu/xfce-menu-item.c: Minor cleanup of the
+	  XfceMenuElement functions.
+	* tests/test-display-menu.c: Always use xfce_menu_get_element(), never
+	  use xfce_menu_item_get_name() directly.
+
 2008-11-11	Jannis Pohlmann <jannis@xfce.org>
 
 	* == 4.5.92 released ==
diff --git a/libxfce4menu/xfce-menu-item.c b/libxfce4menu/xfce-menu-item.c
index db6ce39..f188e4f 100644
--- a/libxfce4menu/xfce-menu-item.c
+++ b/libxfce4menu/xfce-menu-item.c
@@ -1217,12 +1217,8 @@ xfce_menu_item_decrement_allocated (XfceMenuItem *item)
 static const gchar*
 xfce_menu_item_get_element_name (XfceMenuElement *element)
 {
-  XfceMenuItem *item;
-
   g_return_val_if_fail (XFCE_IS_MENU_ITEM (element), NULL);
-
-  item = XFCE_MENU_ITEM (element);
-  return item->priv->name;
+  return XFCE_MENU_ITEM (element)->priv->name;
 }
 
 
@@ -1230,10 +1226,6 @@ xfce_menu_item_get_element_name (XfceMenuElement *element)
 static const gchar*
 xfce_menu_item_get_element_icon_name (XfceMenuElement *element)
 {
-  XfceMenuItem *item;
-
   g_return_val_if_fail (XFCE_IS_MENU_ITEM (element), NULL);
-
-  item = XFCE_MENU_ITEM (element);
-  return item->priv->icon_name;
+  return XFCE_MENU_ITEM (element)->priv->icon_name;
 }
diff --git a/libxfce4menu/xfce-menu.c b/libxfce4menu/xfce-menu.c
index 1b7f62a..6da339b 100644
--- a/libxfce4menu/xfce-menu.c
+++ b/libxfce4menu/xfce-menu.c
@@ -3073,33 +3073,8 @@ static gint
 xfce_menu_compare_items (gconstpointer *a,
                          gconstpointer *b)
 {
-  const gchar *name1;
-  const gchar *name2;
-
-  /* Determining display name of a */
-  if (XFCE_IS_MENU (a))
-    {
-      if (G_LIKELY (xfce_menu_get_directory (XFCE_MENU (a)) != NULL))
-        name1 = xfce_menu_directory_get_name (xfce_menu_get_directory (XFCE_MENU (a)));
-      else
-        name1 = xfce_menu_get_name (XFCE_MENU (a));
-    }
-  else
-    name1 = xfce_menu_item_get_name (XFCE_MENU_ITEM (a));
-
-  /* Determining display name of b */
-  if (XFCE_IS_MENU (b))
-    {
-      if (G_LIKELY (xfce_menu_get_directory (XFCE_MENU (b)) != NULL))
-        name2 = xfce_menu_directory_get_name (xfce_menu_get_directory (XFCE_MENU (b)));
-      else
-        name2 = xfce_menu_get_name (XFCE_MENU (b));
-    }
-  else
-    name2 = xfce_menu_item_get_name (XFCE_MENU_ITEM (b));
-
-  /* Compare display names and return the result */
-  return g_utf8_collate (name1, name2);
+  return g_utf8_collate (xfce_menu_element_get_name (XFCE_MENU_ELEMENT (a)), 
+                         xfce_menu_element_get_name (XFCE_MENU_ELEMENT (b)));
 }
 
 
diff --git a/tests/test-display-menu.c b/tests/test-display-menu.c
index eaef8c6..f361d37 100644
--- a/tests/test-display-menu.c
+++ b/tests/test-display-menu.c
@@ -219,7 +219,7 @@ create_item_widgets (XfceMenuItem *item,
   else
     image = gtk_image_new_from_icon_name ("applications-other", ICON_SIZE);
 
-  gtk_item = gtk_image_menu_item_new_with_label (xfce_menu_item_get_name (item));
+  gtk_item = gtk_image_menu_item_new_with_label (xfce_menu_element_get_name (XFCE_MENU_ELEMENT (item)));
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (gtk_item), image);
   gtk_menu_shell_append (GTK_MENU_SHELL (parent_menu), gtk_item);
   gtk_widget_show (gtk_item);