mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Added check for glib version in mc_config_del_param and mc_config_del_group functions"

Browse Source 
This reverts commit 483a1a05aa.
This commit is contained in:
Sergei Trofimovich 2009-05-19 10:22:17 +03:00
parent c572352a04
commit df5160aaf3
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -48,7 +48,7 @@ AC_ARG_WITH([glib_static],
glib_found=no glib_found=no
if test "x$with_glib12" != "xyes"; then if test "x$with_glib12" != "xyes"; then
PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6], [glib_found=yes], [:]) PKG_CHECK_MODULES(GLIB, [glib-2.0], [glib_found=yes], [:])
fi fi
PKG_CHECK_MODULES(GMODULE, [gmodule-2.0], [gmodule_found=yes]) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0], [gmodule_found=yes])

11
src/mcconfig/common.c
View File

@ -112,12 +112,8 @@ mc_config_del_param (mc_config_t * mc_config, const char *group,
{ {
if (!mc_config || !group || !param) if (!mc_config || !group || !param)
return FALSE; return FALSE;
#if GLIB_CHECK_VERSION (2, 15, 0)
return g_key_file_remove_key (mc_config->handle, group, param, NULL); return g_key_file_remove_key (mc_config->handle, group, param, NULL);
#else
g_key_file_remove_key (mc_config->handle, group, param, NULL);
return TRUE;
#endif
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
@ -128,12 +124,7 @@ mc_config_del_group (mc_config_t * mc_config, const char *group)
if (!mc_config || !group) if (!mc_config || !group)
return FALSE; return FALSE;
#if GLIB_CHECK_VERSION (2, 15, 0)
return g_key_file_remove_group (mc_config->handle, group, NULL); return g_key_file_remove_group (mc_config->handle, group, NULL);
#else
g_key_file_remove_group (mc_config->handle, group, NULL);
return TRUE;
#endif
} }
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */