From 12cec658443d5b619f51235f44aa523aab74a04f Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Mon, 7 Jan 2013 11:00:47 +0000
Subject: [PATCH] prevent load of conf module if conf2 is already loaded

SVN revision: 82336
---
 src/modules/conf/e_mod_main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/modules/conf/e_mod_main.c b/src/modules/conf/e_mod_main.c
index 591531421..2b14bc5a9 100644
--- a/src/modules/conf/e_mod_main.c
+++ b/src/modules/conf/e_mod_main.c
@@ -264,6 +264,11 @@ e_modapi_init(E_Module *m)
 
    conf_module = m;
 
+   if (e_action_find("configuration"))
+     {
+        e_util_dialog_show(_("Error"), _("conf module cannot be loaded when conf2 module is already loaded!"));
+        return NULL;
+     }
    /* add module supplied action */
    act = e_action_add("configuration");
    if (act)