From 46ae44406938ac3b0e9163013b345b445951446b Mon Sep 17 00:00:00 2001
From: Stephen 'Okra' Houston <smhouston88@gmail.com>
Date: Wed, 14 Dec 2016 11:51:11 -0600
Subject: [PATCH] E_Config: Auto load luncher if ibar is enabled and bump
 config.

---
 src/bin/e_config.c | 24 ++++++++++++++++++++++++
 src/bin/e_config.h |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index af0494f43..ae3ce8504 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1451,6 +1451,30 @@ e_config_load(void)
                e_config->window_maximize_transition = E_EFX_EFFECT_SPEED_SINUSOIDAL;
                e_config->window_maximize_time = 0.15;
             }
+          CONFIG_VERSION_CHECK(22)
+            {
+               Eina_List *l;
+               E_Config_Module *em, *module;
+               Eina_Bool ibar_en = EINA_FALSE, luncher_en = EINA_FALSE;
+
+               CONFIG_VERSION_UPDATE_INFO(22);
+
+               EINA_LIST_FOREACH(e_config->modules, l, em)
+               {
+                  if (!em->enabled) continue;
+                  if (eina_streq(em->name, "ibar"))
+                    ibar_en = EINA_TRUE;
+                  else if (eina_streq(em->name, "luncher"))
+                    luncher_en = EINA_TRUE;
+                  if (ibar_en && !luncher_en)
+                    {
+                       module = E_NEW(E_Config_Module, 1);
+                       module->name = eina_stringshare_add("luncher");
+                       module->enabled = 1;
+                       e_config->modules = eina_list_append(e_config->modules, module);
+                    }
+               }
+            }
      }
    if (!e_config->remember_internal_fm_windows)
      e_config->remember_internal_fm_windows = !!(e_config->remember_internal_windows & E_REMEMBER_INTERNAL_FM_WINS);
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index a93ee2ab6..2a157315f 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -46,7 +46,7 @@ typedef enum
 /* increment this whenever a new set of config values are added but the users
  * config doesn't need to be wiped - simply new values need to be put in
  */
-#define E_CONFIG_FILE_GENERATION 21
+#define E_CONFIG_FILE_GENERATION 22
 #define E_CONFIG_FILE_VERSION    ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION)
 
 #define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!!