X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fconfig.c;h=50f6aef6d4fd8ec16ab45fffdb390561b31c3283;hb=ee0477d167a3b87618b82d1080fd37e4403e6d2e;hp=7ec2b3e055ba921110b066071d8c50b22721ca7d;hpb=c2e495c720d93521bdb0e1bfd7e76584a1b329b7;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index 7ec2b3e0..50f6aef6 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -55,13 +55,12 @@ RrFont *config_font_menuitem;
 RrFont *config_font_menutitle;
 RrFont *config_font_osd;
 
-gint    config_desktops_num;
+guint   config_desktops_num;
 GSList *config_desktops_names;
 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 +226,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)))
@@ -606,7 +605,7 @@ static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
     if ((n = parse_find_node("number", node))) {
         gint d = parse_int(doc, n);
         if (d > 0)
-            config_desktops_num = d;
+            config_desktops_num = (unsigned) d;
     }
     if ((n = parse_find_node("firstdesk", node))) {
         gint d = parse_int(doc, n);
@@ -916,7 +915,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);
@@ -984,6 +982,7 @@ void config_shutdown(void)
     RrFontClose(config_font_inactivewindow);
     RrFontClose(config_font_menuitem);
     RrFontClose(config_font_menutitle);
+    RrFontClose(config_font_osd);
 
     for (it = config_desktops_names; it; it = g_slist_next(it))
         g_free(it->data);