cleaning up remnants of bad rebase merges and modernizing some sections

[chaz/openbox] / openbox / prompt.c

diff --git a/openbox/prompt.c b/openbox/prompt.c
index 77398c5fa7ba01c006e28d97fdaa081ab934dcfc..ae7f38f00c913d3802358de9029c5d7dd06f8fd3 100644 (file)
--- 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;