diff options
| author | Dave Foster <daf@minuslab.net> | 2010-10-12 23:59:51 -0400 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@gmail.com> | 2010-10-14 15:54:48 +0200 |
| commit | 95ed8437020ca3070d7cafcdfef78f8b3985fb5f (patch) | |
| tree | 500a4f1a95246d7ea92d63f426b860e30655e6c4 /openbox/client_menu.c | |
| parent | 464ee8996e6478e8bd6fc8c8e9df220187c51786 (diff) | |
cleaning up remnants of bad rebase merges and modernizing some sections
Diffstat (limited to 'openbox/client_menu.c')
| -rw-r--r-- | openbox/client_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openbox/client_menu.c b/openbox/client_menu.c index cf41ded7..ed62a323 100644 --- a/openbox/client_menu.c +++ b/openbox/client_menu.c @@ -276,7 +276,7 @@ static gboolean send_to_menu_update(ObMenuFrame *frame, gpointer data) if ((desk == DESKTOP_ALL && c->desktop != DESKTOP_ALL) || (c->desktop == DESKTOP_ALL && desk == screen_desktop)) { - e->data.normal.mask = ob_rr_theme->desk_mask; + e->data.normal.mask = ob_rr_theme->btn_desk->mask; set_icon_color(e); } else e->data.normal.mask = NULL; @@ -392,7 +392,7 @@ void client_menu_startup(void) menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME); e = menu_add_normal(menu, CLIENT_RESTORE, _("R_estore"), NULL, TRUE); - e->data.normal.mask = ob_rr_theme->max_toggled_mask; + e->data.normal.mask = ob_rr_theme->btn_max->toggled_mask; set_icon_color(e); menu_add_normal(menu, CLIENT_MOVE, _("_Move"), NULL, TRUE); |