Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*fix* valgrind invalid read/write and memleaks

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@572 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85
2010-10-08 21:45:14 +00:00
parent 1161b0921b
commit eae7223ddf
6 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/config.c
View File

@@ -375,10 +375,13 @@ void add_entry (char *key, char *value)
else if (strcmp (key, "time1_format") == 0) {
if (new_config_file == 0) {
clock_enabled = 1;
if (panel_items_order)
panel_items_order = strcat(panel_items_order, "C");
if (panel_items_order) {
char* tmp = g_strconcat(panel_items_order, "C", NULL);
g_free( panel_items_order );
panel_items_order = tmp;
}
else
panel_items_order = strdup("C");
panel_items_order = g_strdup("C");
}
if (strlen(value) > 0) {
time1_format = strdup (value);
@@ -658,10 +661,13 @@ void add_entry (char *key, char *value)
if (new_config_file == 0) {
systray_enabled = atoi(value);
if (systray_enabled) {
if (panel_items_order)
panel_items_order = strcat(panel_items_order, "S");
else
panel_items_order = strdup("S");
if (panel_items_order) {
char* tmp = g_strconcat(panel_items_order, "S", NULL);
g_free( panel_items_order );
panel_items_order = tmp;
}
else
panel_items_order = g_strdup("S");
}
}
}
@@ -669,10 +675,13 @@ void add_entry (char *key, char *value)
if (new_config_file == 0) {
battery_enabled = atoi(value);
if (battery_enabled) {
if (panel_items_order)
panel_items_order = strcat(panel_items_order, "B");
else
panel_items_order = strdup("B");
if (panel_items_order) {
char* tmp = g_strconcat(panel_items_order, "B", NULL);
g_free( panel_items_order );
panel_items_order = tmp;
}
else
panel_items_order = g_strdup("B");
}
}
}
@@ -753,11 +762,12 @@ int config_read_file (const char *path)
if (new_config_file == 0) {
taskbar_enabled = 1;
if (panel_items_order) {
char *tmp = strdup("T");
panel_items_order = strcat(tmp, panel_items_order);
char* tmp = g_strconcat( "T", panel_items_order, NULL );
g_free(panel_items_order);
panel_items_order = tmp;
}
else
panel_items_order = strdup("T");
panel_items_order = g_strdup("T");
}
return 1;