mirror of
https://github.com/MidnightCommander/mc
synced 2024-12-22 20:36:50 +03:00
Revert "Added check for glib version in mc_config_del_param and mc_config_del_group functions"
This reverts commit 483a1a05aa
.
This commit is contained in:
parent
c572352a04
commit
df5160aaf3
@ -48,7 +48,7 @@ AC_ARG_WITH([glib_static],
|
||||
glib_found=no
|
||||
|
||||
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
|
||||
|
||||
PKG_CHECK_MODULES(GMODULE, [gmodule-2.0], [gmodule_found=yes])
|
||||
|
@ -112,12 +112,8 @@ mc_config_del_param (mc_config_t * mc_config, const char *group,
|
||||
{
|
||||
if (!mc_config || !group || !param)
|
||||
return FALSE;
|
||||
#if GLIB_CHECK_VERSION (2, 15, 0)
|
||||
|
||||
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)
|
||||
return FALSE;
|
||||
|
||||
#if GLIB_CHECK_VERSION (2, 15, 0)
|
||||
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
|
||||
}
|
||||
|
||||
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
|
||||
|
Loading…
Reference in New Issue
Block a user