From df5160aaf3e349c9aa6f5470d639b227274a3c50 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 19 May 2009 10:22:17 +0300 Subject: [PATCH] Revert "Added check for glib version in mc_config_del_param and mc_config_del_group functions" This reverts commit 483a1a05aa33b99ae4c0f11ac308c247044ddc10. --- configure.ac | 2 +- src/mcconfig/common.c | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index c9201ed91..f5251d8ec 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) diff --git a/src/mcconfig/common.c b/src/mcconfig/common.c index 2407d6a6b..da03bd8d0 100644 --- a/src/mcconfig/common.c +++ b/src/mcconfig/common.c @@ -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 } /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -- 2.11.4.GIT