Use illume-softkey, not illume-buttonbar.

Don't need to build ibar twice in configure.ac.



SVN revision: 43910

configure.ac

@@ -411,7 +411,6 @@ fi
 AC_SUBST(SOUND_CFLAGS)
 AC_SUBST(SOUND_LIBS)
 
-AC_E_OPTIONAL_MODULE([ibar], true)
 AC_E_OPTIONAL_MODULE([ibar], true)
 AC_E_OPTIONAL_MODULE([dropshadow], true)
 AC_E_OPTIONAL_MODULE([clock], true)
@@ -609,8 +608,8 @@ src/modules/illume2/Makefile
 src/modules/illume2/module.desktop
 src/modules/illume-home/Makefile
 src/modules/illume-home/module.desktop
-src/modules/illume-buttonbar/Makefile
+src/modules/illume-softkey/Makefile
-src/modules/illume-buttonbar/module.desktop
+src/modules/illume-softkey/module.desktop
 src/modules/illume-keyboard/Makefile
 src/modules/illume-keyboard/module.desktop
 src/modules/illume-keyboard/keyboards/Makefile

src/modules/Makefile.am

@@ -239,7 +239,7 @@ SUBDIRS += connman
 endif
 
 if USE_MODULE_ILLUME
-SUBDIRS += illume illume2 illume-home illume-buttonbar illume-keyboard
+SUBDIRS += illume illume2 illume-home illume-softkey illume-keyboard
 endif
 
 if USE_MODULE_SYSCON

src/modules/illume-buttonbar/e_mod_config.h

@@ -1,20 +0,0 @@
-#ifndef E_MOD_CONFIG_H
-#define E_MOD_CONFIG_H
-
-#define IL_CONFIG_MIN 0
-#define IL_CONFIG_MAJ 0
-
-typedef struct _Il_Bar_Config Il_Bar_Config;
-struct _Il_Bar_Config 
-{
-   int version;
-};
-
-EAPI int il_bar_config_init(E_Module *m);
-EAPI int il_bar_config_shutdown(void);
-EAPI int il_bar_config_save(void);
-EAPI void il_bar_config_show(E_Container *con, const char *params);
-
-extern EAPI Il_Bar_Config *il_bar_cfg;
-
-#endif

src/modules/illume-softkey/Makefile.am

@@ -1,5 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume-bar
+MODULE = illume-softkey
 
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)

src/modules/illume-softkey/e_mod_config.c

@@ -2,17 +2,17 @@
 #include "e_mod_main.h"
 #include "e_mod_config.h"
 
-EAPI Il_Bar_Config *il_bar_cfg = NULL;
+EAPI Il_Sk_Config *il_sk_cfg = NULL;
 static E_Config_DD *conf_edd = NULL;
 
 /* public functions */
 EAPI int 
-il_bar_config_init(E_Module *m) 
+il_sk_config_init(E_Module *m) 
 {
-   conf_edd = E_CONFIG_DD_NEW("Illume-Bar_Cfg", Il_Bar_Config);
+   conf_edd = E_CONFIG_DD_NEW("Illume-Softkey_Cfg", Il_Sk_Config);
    #undef T
    #undef D
-   #define T Il_Bar_Config
+   #define T Il_Sk_Config
    #define D conf_edd
    E_CONFIG_VAL(D, T, version, INT);
 
@@ -20,23 +20,23 @@ il_bar_config_init(E_Module *m)
 }
 
 EAPI int 
-il_bar_config_shutdown(void) 
+il_sk_config_shutdown(void) 
 {
-   E_FREE(il_bar_cfg);
+   E_FREE(il_sk_cfg);
-   il_bar_cfg = NULL;
+   il_sk_cfg = NULL;
 
    E_CONFIG_DD_FREE(conf_edd);
    return 1;
 }
 
 EAPI int 
-il_bar_config_save(void) 
+il_sk_config_save(void) 
 {
    return 1;
 }
 
 EAPI void 
-il_bar_config_show(E_Container *con, const char *params) 
+il_sk_config_show(E_Container *con, const char *params) 
 {
 
 }

src/modules/illume-softkey/e_mod_config.h

@@ -0,0 +1,20 @@
+#ifndef E_MOD_CONFIG_H
+#define E_MOD_CONFIG_H
+
+#define IL_CONFIG_MIN 0
+#define IL_CONFIG_MAJ 0
+
+typedef struct _Il_Sk_Config Il_Sk_Config;
+struct _Il_Sk_Config 
+{
+   int version;
+};
+
+EAPI int il_sk_config_init(E_Module *m);
+EAPI int il_sk_config_shutdown(void);
+EAPI int il_sk_config_save(void);
+EAPI void il_sk_config_show(E_Container *con, const char *params);
+
+extern EAPI Il_Sk_Config *il_sk_cfg;
+
+#endif

src/modules/illume-softkey/e_mod_main.c

@@ -2,26 +2,25 @@
 #include "e_mod_main.h"
 #include "e_mod_config.h"
 
-EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume-Bar" };
+EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume-Softkey" };
 
 /* public functions */
 EAPI void *
 e_modapi_init(E_Module *m) 
 {
-   if (!il_bar_config_init(m)) return NULL;
+   if (!il_sk_config_init(m)) return NULL;
-
    return m;
 }
 
 EAPI int 
 e_modapi_shutdown(E_Module *m) 
 {
-   il_bar_config_shutdown();
+   il_sk_config_shutdown();
    return 1;
 }
 
 EAPI int 
 e_modapi_save(E_Module *m) 
 {
-   return il_bar_config_save();
+   return il_sk_config_save();
 }

src/modules/illume-softkey/module.desktop.in

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Link
-Name=Illume-Bar
+Name=Illume-Softkey
-Icon=e-module-illume-bar
+Icon=e-module-illume-softkey
 X-Enlightenment-ModuleType=system
 Comment=<title>Illume Home for Embedded</title>