X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fdock.c;fp=openbox%2Fdock.c;h=dba74f684923d53ffb28ea04844f7bb18c6bcebc;hb=0fcf5ead0fb38710e6277da8b59c6ad19f907092;hp=38b7122ddfec88d2a46f7ee5bf40abd55120d758;hpb=e2ddfaf9fff1fb9dd6ebdc1a95f2b228d6baedb2;p=chaz%2Fopenbox

diff --git a/openbox/dock.c b/openbox/dock.c
index 38b7122d..dba74f68 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -20,11 +20,11 @@
 #include "debug.h"
 #include "dock.h"
 #include "screen.h"
-#include "prop.h"
 #include "config.h"
 #include "grab.h"
 #include "openbox.h"
 #include "render/theme.h"
+#include "obt/prop.h"
 
 #define DOCK_EVENT_MASK (ButtonPressMask | ButtonReleaseMask | \
                          EnterWindowMask | LeaveWindowMask)
@@ -99,8 +99,8 @@ void dock_startup(gboolean reconfig)
     XSetWindowBorderWidth(obt_display, dock->frame, ob_rr_theme->obwidth);
 
     /* Setting the window type so xcompmgr can tell what it is */
-    PROP_SET32(dock->frame, net_wm_window_type, atom,
-               prop_atoms.net_wm_window_type_dock);
+    OBT_PROP_SET32(dock->frame, NET_WM_WINDOW_TYPE, ATOM,
+                   OBT_PROP_ATOM(NET_WM_WINDOW_TYPE_DOCK));
 
     g_hash_table_insert(window_map, &dock->frame, dock);
     stacking_add(DOCK_AS_WINDOW(dock));
@@ -136,7 +136,7 @@ void dock_add(Window win, XWMHints *wmhints)
     app->icon_win = (wmhints->flags & IconWindowHint) ?
         wmhints->icon_window : win;
 
-    if (PROP_GETSS(app->win, wm_class, locale, &data)) {
+    if (OBT_PROP_GETSS(app->win, WM_CLASS, locale, &data)) {
         if (data[0]) {
             app->name = g_strdup(data[0]);
             if (data[1])