make openbox use the obt prop.c/h stuff

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index 7ec2b3e055ba921110b066071d8c50b22721ca7d..420ac5532fc574ce25e95d9883218e65f1374bb0 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -21,7 +21,6 @@
 #include "keyboard.h"
 #include "mouse.h"
 #include "actions.h"
-#include "prop.h"
 #include "translate.h"
 #include "client.h"
 #include "screen.h"
@@ -61,7 +60,6 @@ guint   config_screen_firstdesk;
 guint   config_desktop_popup_time;
 
 gboolean         config_resize_redraw;
-gboolean         config_resize_four_corners;
 gint             config_resize_popup_show;
 ObResizePopupPos config_resize_popup_pos;
 GravityPoint     config_resize_popup_fixed;
@@ -227,7 +225,7 @@ static void parse_per_app_settings(ObParseInst *inst, xmlDocPtr doc,
                     if (!parse_contains("default", doc, c)) {
                         config_parse_gravity_coord(doc, c,
                                                    &settings->position.x);
-                        settings->pos_given = TRUE;
+                        x_pos_given = TRUE;
                     }
 
                 if (x_pos_given && (c = parse_find_node("y", n->children)))
@@ -916,7 +914,6 @@ void config_startup(ObParseInst *i)
     parse_register(i, "desktops", parse_desktops, NULL);
 
     config_resize_redraw = TRUE;
-    config_resize_four_corners = FALSE;
     config_resize_popup_show = 1; /* nonpixel increments */
     config_resize_popup_pos = OB_RESIZE_POS_CENTER;
     GRAVITY_COORD_SET(config_resize_popup_fixed.x, 0, FALSE, FALSE);