prefix the Timer->ObTimer and TimeoutHandler->ObTimeoutHandler shitz

[chaz/openbox] / openbox / dock.c

diff --git a/openbox/dock.c b/openbox/dock.c
index cb41f7ee2d16454725d596cf96fc355f6e318d43..ccea0ad03428451d4c3eaa25c84858a058bc39f0 100644 (file)
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -33,7 +33,8 @@ void dock_startup()
                                 CWOverrideRedirect | CWEventMask,
                                 &attrib);
     dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
-    XSetWindowBorder(ob_display, dock->frame, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, dock->frame,
+                     RrColorPixel(ob_rr_theme->b_color));
     XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth);
 
     g_hash_table_insert(window_map, &dock->frame, dock);
@@ -517,7 +518,7 @@ void dock_hide(gboolean hide)
     } else {
         g_assert(!dock->hide_timer);
         dock->hide_timer = timer_start(config_dock_hide_timeout * 1000,
-                                       (TimeoutHandler)hide_timeout,
+                                       (ObTimeoutHandler)hide_timeout,
                                        NULL);
     }
 }