aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog6
-rw-r--r--e-util/e-config.c5
-rw-r--r--e-util/e-config.h2
3 files changed, 11 insertions, 2 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 2fdda896d3..f04d27048b 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-26 Jeffrey Stedfast <fejj@novell.com>
+
+ * e-config.c (ech_check): If the plugin isn't enabled, return TRUE
+ so that the suer doesn't get locked in one of the account druid
+ pages.
+
2005-01-21 JP Rosevear <jpr@novell.com>
Fixes #46404
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 4f78218503..c628ae33dc 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -1245,7 +1245,10 @@ ech_check(EConfig *ec, const char *pageid, void *data)
{
struct _EConfigHookGroup *group = data;
EConfigHookPageCheckData hdata;
-
+
+ if (!group->hook->hook.plugin->enabled)
+ return TRUE;
+
hdata.config = ec;
hdata.target = ec->target;
hdata.pageid = pageid?pageid:"";
diff --git a/e-util/e-config.h b/e-util/e-config.h
index db8d437bdd..d2ba37ee5c 100644
--- a/e-util/e-config.h
+++ b/e-util/e-config.h
@@ -331,7 +331,7 @@ struct _EConfigHookPageCheckData {
* cancelling a configuration edit.
*
* Each plugin that hooks into a given configuration page will define
- * all of the tiems for that page in a single group.
+ * all of the items for that page in a single group.
**/
struct _EConfigHookGroup {
struct _EConfigHook *hook; /* parent pointer */