X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=5a627040b6e761e84ea169bcc47edab5761fb89a;hb=386f2fec6d8d7c3ebe1e2192f4632ed0b12f0df1;hp=0e7eae43f47a6374a4f356bf8bd8731cfe65b6b2;hpb=d1325f97fb4fb3267c4c8955d9f2bf4c165da928;p=chaz%2Ftint2

diff --git a/src/config.c b/src/config.c
index 0e7eae4..5a62704 100644
--- a/src/config.c
+++ b/src/config.c
@@ -32,6 +32,7 @@
 #include <ctype.h>
 #include <glib/gstdio.h>
 #include <pango/pangocairo.h>
+#include <pango/pangoxft.h>
 #include <Imlib2.h>
 
 #include "common.h"
@@ -56,10 +57,8 @@ char *thumbnail_path = 0;
 // --------------------------------------------------
 // backward compatibility
 static int old_task_icon_size;
-static char *old_task_font;
-static char *old_time1_font;
-static char *old_time2_font;
-static Area *area_task, *area_task_active;
+static Area *area_task;
+static Area *area_task_active;
 
 
 // temporary list of background
@@ -79,6 +78,9 @@ void init_config()
 	cleanup_tooltip();
 
 	// panel's default value
+	if (panel_config.g_task.font_desc) {
+		pango_font_description_free(panel_config.g_task.font_desc);
+	}
 	memset(&panel_config, 0, sizeof(Panel));
 	panel_config.g_task.alpha = 100;
 	panel_config.g_task.alpha_active = 100;
@@ -87,6 +89,11 @@ void init_config()
 	// window manager's menu default value == false
 	wm_menu = 0;
 	max_tick_urgent = 7;
+
+	// flush pango cache if possible
+	//pango_xft_shutdown_display(server.dsp, server.screen);
+	//PangoFontMap *font_map = pango_xft_get_font_map(server.dsp, server.screen);
+	//pango_fc_font_map_shutdown(font_map);
 }
 
 
@@ -645,7 +652,6 @@ int config_read ()
 	g_free(path1);
 
 	// copy tint2rc from system directory to user directory
-	g_free(path1);
 	char *path2 = 0;
 	system_dirs = g_get_system_config_dirs();
 	for (i = 0; system_dirs[i]; i++) {
@@ -682,9 +688,6 @@ int config_read_file (const char *path)
 	char *key, *value;
 
 	if ((fp = fopen(path, "r")) == NULL) return 0;
-	old_task_font = 0;
-	old_time1_font = 0;
-	old_time2_font = 0;
 
 	while (fgets(line, sizeof(line), fp) != NULL) {
 		if (parse_line(line, &key, &value)) {
@@ -698,18 +701,6 @@ int config_read_file (const char *path)
 	if (old_task_icon_size) {
 		panel_config.g_task.area.paddingy = ((int)panel_config.area.height - (2 * panel_config.area.paddingy) - old_task_icon_size) / 2;
 	}
-	if (old_task_font) {
-		g_free(old_task_font);
-		old_task_font = 0;
-	}
-	if (old_time1_font) {
-		g_free(old_time1_font);
-		old_time1_font = 0;
-	}
-	if (old_time2_font) {
-		g_free(old_time2_font);
-		old_time2_font = 0;
-	}
 	return 1;
 }