qulogic/libgnt

Finch: fix glib warnings

2014-04-26, Tomasz Wasilczyk
52014b84442d
Parents 192e8ff66e5f
Children aaa89167e94b
Finch: fix glib warnings
1 files changed, 13 insertions(+), 4 deletions(-)
  • +13 -4
    gntcolors.c
    • --- a/gntcolors.c Sat Apr 26 20:39:33 2014 +0200
    +++ b/gntcolors.c Sat Apr 26 21:08:57 2014 +0200
    @@ -177,10 +177,15 @@
    {
    GError *error = NULL;
    gsize nkeys;
    - char **keys = g_key_file_get_keys(kfile, "colors", &nkeys, &error);
    + char **keys;
    - if (error)
    - {
    + if (!g_key_file_has_group(kfile, "colors")) {
    + gnt_color_pairs_parse(kfile);
    + return;
    + }
    +
    + keys = g_key_file_get_keys(kfile, "colors", &nkeys, &error);
    + if (error) {
    gnt_warning("%s", error->message);
    g_error_free(error);
    error = NULL;
    @@ -223,8 +228,12 @@
    {
    GError *error = NULL;
    gsize nkeys;
    - char **keys = g_key_file_get_keys(kfile, "colorpairs", &nkeys, &error);
    + char **keys;
    + if (!g_key_file_has_group(kfile, "colorpairs"))
    + return;
    +
    + keys = g_key_file_get_keys(kfile, "colorpairs", &nkeys, &error);
    if (error)
    {
    gnt_warning("%s", error->message);