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

color parsing fixes

This commit is contained in:
Daniel Micay 2012-06-07 16:50:52 -04:00
parent 00b1b26b59
commit f2ffa77845
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
termite.c
View File

@ -333,24 +333,25 @@ static void load_config(GtkWindow *window, VteTerminal *vte,
static const char *color_names[8] = {"black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"}; static const char *color_names[8] = {"black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"};
bool fail = false; bool success = true;
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) {
success = false;
g_clear_error(&error); g_clear_error(&error);
break; break;
} }
if ((length == 2 && gdk_color_parse(pair[0], &palette[i]) && if ((length != 2 || !gdk_color_parse(pair[0], &palette[i]) ||
gdk_color_parse(pair[1], &palette[i+8]))) { !gdk_color_parse(pair[1], &palette[i+8]))) {
fail = false; success = false;
g_strfreev(pair);
break;
} }
g_strfreev(pair); g_strfreev(pair);
} }
if (!fail) { if (success) {
vte_terminal_set_colors(vte, NULL, NULL, palette, 16); vte_terminal_set_colors(vte, NULL, NULL, palette, 16);
} }