HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use utils_get_setting() to cleanup filetypes.c:load_settings()

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5896 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Colomban Wendling 2011-08-25 20:11:25 +00:00
parent fc6dc88772
commit 4652b74203
1 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/filetypes.c
View File

@ -1122,36 +1122,28 @@ static void load_settings(gint ft_id, GKeyFile *config, GKeyFile *configh)
{ {
GeanyFiletype *ft = filetypes[ft_id]; GeanyFiletype *ft = filetypes[ft_id];
gchar *result; gchar *result;
GError *error = NULL;
gboolean tmp;
/* default extension */ /* default extension */
result = g_key_file_get_string(configh, "settings", "extension", NULL); result = utils_get_setting(string, configh, config, "settings", "extension", NULL);
if (result == NULL) result = g_key_file_get_string(config, "settings", "extension", NULL);
if (result != NULL) if (result != NULL)
{ {
setptr(filetypes[ft_id]->extension, result); setptr(filetypes[ft_id]->extension, result);
} }
/* read comment notes */ /* read comment notes */
result = g_key_file_get_string(configh, "settings", "comment_open", NULL); result = utils_get_setting(string, configh, config, "settings", "comment_open", NULL);
if (result == NULL) result = g_key_file_get_string(config, "settings", "comment_open", NULL);
if (result != NULL) if (result != NULL)
{ {
g_free(filetypes[ft_id]->comment_open); setptr(filetypes[ft_id]->comment_open, result);
filetypes[ft_id]->comment_open = result;
} }
result = g_key_file_get_string(configh, "settings", "comment_close", NULL); result = utils_get_setting(string, configh, config, "settings", "comment_close", NULL);
if (result == NULL) result = g_key_file_get_string(config, "settings", "comment_close", NULL);
if (result != NULL) if (result != NULL)
{ {
g_free(filetypes[ft_id]->comment_close); setptr(filetypes[ft_id]->comment_close, result);
filetypes[ft_id]->comment_close = result;
} }
result = g_key_file_get_string(configh, "settings", "comment_single", NULL); result = utils_get_setting(string, configh, config, "settings", "comment_single", NULL);
if (result == NULL) result = g_key_file_get_string(config, "settings", "comment_single", NULL);
if (result != NULL) if (result != NULL)
{ {
setptr(filetypes[ft_id]->comment_single, result); setptr(filetypes[ft_id]->comment_single, result);
@ -1163,29 +1155,18 @@ static void load_settings(gint ft_id, GKeyFile *config, GKeyFile *configh)
filetypes[ft_id]->comment_open = NULL; filetypes[ft_id]->comment_open = NULL;
} }
tmp = g_key_file_get_boolean(configh, "settings", "comment_use_indent", &error); filetypes[ft_id]->comment_use_indent = utils_get_setting(boolean, configh, config,
if (error) "settings", "comment_use_indent", FALSE);
{
g_error_free(error);
error = NULL;
tmp = g_key_file_get_boolean(config, "settings", "comment_use_indent", &error);
if (error) g_error_free(error);
else filetypes[ft_id]->comment_use_indent = tmp;
}
else filetypes[ft_id]->comment_use_indent = tmp;
/* read context action */ /* read context action */
result = g_key_file_get_string(configh, "settings", "context_action_cmd", NULL); result = utils_get_setting(string, configh, config, "settings", "context_action_cmd", NULL);
if (result == NULL) result = g_key_file_get_string(config, "settings", "context_action_cmd", NULL);
if (result != NULL) if (result != NULL)
{ {
setptr(filetypes[ft_id]->context_action_cmd, result); setptr(filetypes[ft_id]->context_action_cmd, result);
} }
result = utils_get_setting_string(configh, "settings", "tag_parser", NULL); result = utils_get_setting(string, configh, config, "settings", "tag_parser", NULL);
if (!result) if (result != NULL)
result = utils_get_setting_string(config, "settings", "tag_parser", NULL);
if (result)
{ {
ft->lang = tm_source_file_get_named_lang(result); ft->lang = tm_source_file_get_named_lang(result);
if (ft->lang < 0) if (ft->lang < 0)
@ -1193,10 +1174,8 @@ static void load_settings(gint ft_id, GKeyFile *config, GKeyFile *configh)
g_free(result); g_free(result);
} }
result = utils_get_setting_string(configh, "settings", "lexer_filetype", NULL); result = utils_get_setting(string, configh, config, "settings", "lexer_filetype", NULL);
if (!result) if (result != NULL)
result = utils_get_setting_string(config, "settings", "lexer_filetype", NULL);
if (result)
{ {
ft->lexer_filetype = filetypes_lookup_by_name(result); ft->lexer_filetype = filetypes_lookup_by_name(result);
if (!ft->lexer_filetype) if (!ft->lexer_filetype)