X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=plugins%2Fmenu%2Fclient_list_menu.c;h=5b9637bf2c04e59510be7f27ad18f466c190e1fe;hb=1ce196c4f3576eaeaf1d23be1a24a5ef98183e38;hp=5b0141164f629e7112813ff0318a0b8f51b91f26;hpb=15386e86d42898664f682d03d3f510452e2d9f69;p=chaz%2Fopenbox

diff --git a/plugins/menu/client_list_menu.c b/plugins/menu/client_list_menu.c
index 5b014116..5b9637bf 100644
--- 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;
@@ -60,11 +59,11 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
 
 /* executes it without changing the client in the actions, since we set that
    when we make the actions! */
-static void desk_menu_execute(ObMenuEntryFrame *self, gpointer data)
+static void desk_menu_execute(ObMenuEntry *self, gpointer data)
 {
     GSList *it;
 
-    for (it = self->entry->data.normal.actions; it; it = g_slist_next(it))
+    for (it = self->data.normal.actions; it; it = g_slist_next(it))
     {
         ObAction *act = it->data;
         act->func(&act->data);