new method for loading menu files etc

[chaz/openbox] / plugins / menu / client_list_menu.c

diff --git a/plugins/menu/client_list_menu.c b/plugins/menu/client_list_menu.c
index 054353fd7b6673d5cd038f7ad8ea9ea79e39a11d..5b9637bf2c04e59510be7f27ad18f466c190e1fe 100644 (file)
--- a/plugins/menu/client_list_menu.c
+++ b/plugins/menu/client_list_menu.c
@@ -44,11 +44,10 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
             act = action_from_string("activate");
             act->data.activate.c = c;
             acts = g_slist_prepend(NULL, act);
-            menu_add_normal(menu->name, i,
-                            (c->iconic ? c->icon_title : c->title), acts);
+            e = menu_add_normal(menu->name, i,
+                                (c->iconic ? c->icon_title : c->title), acts);
 
             if ((icon = client_icon(c, 32, 32))) {
-                e = menu_find_entry_id(menu, i);
                 e->data.normal.icon_width = icon->width;
                 e->data.normal.icon_height = icon->height;
                 e->data.normal.icon_data = icon->data;