summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
Diffstat (limited to 'openbox')
-rw-r--r--openbox/client_menu.c4
-rw-r--r--openbox/prompt.c8
2 files changed, 6 insertions, 6 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);
diff --git a/openbox/prompt.c b/openbox/prompt.c
index 77398c5f..ae7f38f0 100644
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -59,10 +59,10 @@ void prompt_startup(gboolean reconfig)
/* note: this is not a copy, don't free it */
prompt_a_bg = ob_rr_theme->osd_bg;
- prompt_a_button = RrAppearanceCopy(ob_rr_theme->a_focused_unpressed_close);
- prompt_a_focus = RrAppearanceCopy(ob_rr_theme->a_hover_focused_close);
- prompt_a_press = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close);
- prompt_a_pfocus = RrAppearanceCopy(ob_rr_theme->a_focused_pressed_close);
+ prompt_a_button = RrAppearanceCopy(ob_rr_theme->btn_close->a_focused_unpressed);
+ prompt_a_focus = RrAppearanceCopy(ob_rr_theme->btn_close->a_hover_focused);
+ prompt_a_press = RrAppearanceCopy(ob_rr_theme->btn_close->a_focused_pressed);
+ prompt_a_pfocus = RrAppearanceCopy(ob_rr_theme->btn_close->a_focused_pressed);
c_button = prompt_a_button->texture[0].data.mask.color;
c_focus = prompt_a_focus->texture[0].data.mask.color;