X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=94ff1d7c8ad34b46358ac335fb57045b53fe5ef9;hb=d179d6428ae585a3b8a13479bfe4586e41de2ff9;hp=72d054693562528adf2a58f000d0245821e6b482;hpb=6cf3357036561134383198cc8b853abb3fe5a982;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index 72d05469..94ff1d7c 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -106,7 +106,7 @@ GSList *config_per_app_settings;
 
 ObAppSettings* config_create_app_settings(void)
 {
-    ObAppSettings *settings = g_new0(ObAppSettings, 1);
+    ObAppSettings *settings = g_slice_new0(ObAppSettings);
     settings->type = -1;
     settings->decor = -1;
     settings->shade = -1;
@@ -239,7 +239,7 @@ static void parse_per_app_settings(xmlNodePtr node, gpointer d)
 
         if (class_set || name_set || role_set || title_set || type_set) {
             xmlNodePtr n, c;
-            ObAppSettings *settings = config_create_app_settings();;
+            ObAppSettings *settings = config_create_app_settings();
 
             if (name_set)
                 settings->name = g_pattern_spec_new(name);
@@ -985,6 +985,8 @@ void config_startup(ObtXmlInst *i)
     config_font_inactivewindow = NULL;
     config_font_menuitem = NULL;
     config_font_menutitle = NULL;
+    config_font_activeosd = NULL;
+    config_font_inactiveosd = NULL;
 
     obt_xml_register(i, "theme", parse_theme, NULL);
 
@@ -1082,7 +1084,7 @@ void config_shutdown(void)
         if (itd->role)  g_pattern_spec_free(itd->role);
         if (itd->title) g_pattern_spec_free(itd->title);
         if (itd->class) g_pattern_spec_free(itd->class);
-        g_free(it->data);
+        g_slice_free(ObAppSettings, it->data);
     }
     g_slist_free(config_per_app_settings);
 }