X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=7379c0ee980224c1f67468405bc6c5d78718f2f1;hb=7317d17c76f3f38f92768541cb0fe370f9c88616;hp=eea3f9fcfc9d3ab70e926ac517cdf47d2cbc9014;hpb=60fa05f70c7bd4c63c31ebeebd63ea614a7a2bcd;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index eea3f9fc..7379c0ee 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -8,7 +8,6 @@ #include "frame.h" #include "screen.h" #include "action.h" -#include "dispatch.h" #include "openbox.h" #include @@ -705,13 +704,8 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) if ((n = parse_find_node("execute", node->xmlChildrenNode))) act->data.execute.path = parse_string(doc, n); } else if (act->func == action_showmenu) { - if ((n = parse_find_node("menu", node->xmlChildrenNode))) { - gchar *plugin; - + if ((n = parse_find_node("menu", node->xmlChildrenNode))) act->data.showmenu.name = parse_string(doc, n); - if (parse_attr_string("plugin", n, &plugin)) - menu_open_plugin(i, act->data.showmenu.name, plugin); - } } else if (act->func == action_desktop) { if ((n = parse_find_node("desktop", node->xmlChildrenNode))) act->data.desktop.desk = parse_int(doc, n); @@ -991,7 +985,7 @@ void action_send_to_desktop(union ActionData *data) if (data->sendto.desk < screen_num_desktops || data->sendto.desk == DESKTOP_ALL) { - client_set_desktop(c, data->sendto.desk, data->sendtodir.follow); + client_set_desktop(c, data->sendto.desk, data->sendto.follow); if (data->sendto.follow) screen_set_desktop(data->sendto.desk); }