Ticket #1861: 1861-rearranging-some-lines-in-src_skin_colors.c.patch

File 1861-rearranging-some-lines-in-src_skin_colors.c.patch, 1.3 KB (added by vit_r, 14 years ago)

  • src/skin/colors.c 

    From c40aa7b9647152427485ee3fb97955d8e6325fb8 Mon Sep 17 00:00:00 2001
From: Vit Rosin <vit_r@list.ru>
Date: Fri, 4 Dec 2009 23:45:19 +0000
Subject: [PATCH]  rearranging some lines in src_skin_colors.c mc_skin_color_parse_ini_file()

---
 src/skin/colors.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/skin/colors.c b/src/skin/colors.c
index e4dd66b..8ae5b79 100644
    a b mc_skin_color_parse_ini_file (mc_skin_t * mc_skin) 
    285285 
    286286    orig_groups = groups = mc_config_get_groups (mc_skin->config, &items_count); 
    287287 
    288     if (groups == NULL || *groups == NULL) { 
    289         if (groups != NULL) 
    290             g_strfreev (groups); 
     288    if (groups == NULL) { 
     289        return FALSE; 
     290    } else if (*groups == NULL) { 
     291        g_strfreev (groups); 
    291292        return FALSE; 
    292293    } 
    293294 
    … … mc_skin_color_parse_ini_file (mc_skin_t * mc_skin) 
    305306            continue; 
    306307 
    307308        orig_keys = keys = mc_config_get_keys (mc_skin->config, *groups, &items_count); 
    308         if (keys == NULL || *keys == NULL) { 
    309             if (keys != NULL) 
    310                 g_strfreev (keys); 
     309 
     310        if (keys == NULL) { 
     311            continue; 
     312        } else if (*keys == NULL) { 
     313            g_strfreev (keys); 
    311314            continue; 
    312315        } 
    313316