takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make color parsing more robust

This commit is contained in:
Daniel Micay 2012-06-07 15:26:37 -04:00
parent c1ca040f4f
commit 83e8399111
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
termite.c
View File

@ -337,19 +337,17 @@ static void load_config(GtkWindow *window, VteTerminal *vte,
bool fail = false; bool fail = false;
for (unsigned i = 0; i < 8; i++) { for (unsigned i = 0; i < 8; i++) {
fail = true;
gsize length; gsize length;
gchar **pair = g_key_file_get_string_list(config, "colors", color_names[i], &length, &error); gchar **pair = g_key_file_get_string_list(config, "colors", color_names[i], &length, &error);
if (error) { if (error) {
fail = true;
g_clear_error(&error); g_clear_error(&error);
break; break;
} }
if (length != 2) { if ((length == 2 && gdk_color_parse(pair[0], &palette[i]) &&
fail = true; gdk_color_parse(pair[1], &palette[i+8]))) {
break; fail = false;
} }
gdk_color_parse(pair[0], &palette[i]);
gdk_color_parse(pair[1], &palette[i+8]);
g_strfreev(pair); g_strfreev(pair);
} }