[Xfce4-commits] <garcon:master> Make a previous commit a bit nicer.

[Nick Schermer]

Updating branch refs/heads/master
         to 82faf9ec8a1a24e678928596c5609991df1711e5 (commit)
       from 6f94f8b90ea802df19fb84e2e00b1d8fb3bb9c50 (commit)

commit 82faf9ec8a1a24e678928596c5609991df1711e5
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Jun 29 19:38:57 2011 +0200

    Make a previous commit a bit nicer.

 garcon/garcon-menu.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/garcon/garcon-menu.c b/garcon/garcon-menu.c
index 7e4c66e..f4cfd88 100644
--- a/garcon/garcon-menu.c
+++ b/garcon/garcon-menu.c
@@ -1582,13 +1582,12 @@ garcon_menu_get_elements (GarconMenu *menu)
 
           if (merge_type == GARCON_MENU_LAYOUT_MERGE_ALL)
             {
+              /* Get all the submenus */
+              menu_items = g_list_copy (menu->priv->submenus);
+
               /* Get all menu items of this menu */
-              menu_items = NULL;
               garcon_menu_item_pool_foreach (menu->priv->pool, (GHFunc) items_collect, &menu_items);
 
-              /* Append submenus */
-              menu_items = g_list_concat (menu_items, g_list_copy (menu->priv->submenus));
-
               /* Sort menu items */
               menu_items = g_list_sort (menu_items, (GCompareFunc) garcon_menu_compare_items);