Rename illume-bar to illume-buttonbar to avoid confusion.

SVN revision: 43908

configure.ac

@@ -609,8 +609,8 @@ src/modules/illume2/Makefile
 src/modules/illume2/module.desktop
 src/modules/illume-home/Makefile
 src/modules/illume-home/module.desktop
-src/modules/illume-bar/Makefile
-src/modules/illume-bar/module.desktop
+src/modules/illume-buttonbar/Makefile
+src/modules/illume-buttonbar/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-bar illume-keyboard
+SUBDIRS += illume illume2 illume-home illume-buttonbar illume-keyboard
 endif
 
 if USE_MODULE_SYSCON

src/modules/illume/e_kbd_dict.c

@@ -7,8 +7,8 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-
 #define MAXLATIN 0x100
+
 static unsigned char _e_kbd_normalise_base[MAXLATIN];
 static unsigned char _e_kbd_normalise_ready = 0;
 

src/modules/illume2/e_mod_layout.c

@@ -138,8 +138,7 @@ illume_border_is_dialog(E_Border *bd)
 {
    int isdialog = 0, i;
 
-   if (bd->client.icccm.transient_for != 0)
-     isdialog = 1;
+   if (bd->client.icccm.transient_for != 0) isdialog = 1;
    if (bd->client.netwm.type == ECORE_X_WINDOW_TYPE_DIALOG)
      {
 	isdialog = 1;

src/modules/illume2/e_mod_main.c

@@ -17,7 +17,7 @@ EAPI void *
 e_modapi_init(E_Module *m) 
 {
    /* set up the virtual keyboard */
-   //e_kbd_init(m);
+   e_kbd_init(m);
    e_mod_layout_init(m);
    return m; /* return NULL on failure, anything else on success. the pointer
 	      * returned will be set as m->data for convenience tracking */
@@ -28,7 +28,7 @@ EAPI int
 e_modapi_shutdown(E_Module *m) 
 {
    e_mod_layout_shutdown();
-   //e_kbd_shutdown();
+   e_kbd_shutdown();
    return 1; /* 1 for success, 0 for failure */
 }
 

x-ui.sh

@@ -6,7 +6,7 @@
 #Xephyr :1 -noreset -ac -br -dpi 186 -screen 480x272x16 &
 #Xephyr :1 -noreset -ac -br -dpi 181 -screen 320x320x16 &
 Xephyr :1 -noreset -ac -br -dpi 183 -screen 320x480x16 -host-cursor &
-#Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x320x16 &
+#Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x320x16 -host-cursor &
 #Xephyr :1 -noreset -ac -br -dpi 183 -screen 480x800x16 &
 #Xephyr :1 -noreset -ac -br -dpi 183 -screen 800x480x16 &
 #Xephyr :1 -noreset -ac -br -dpi 284 -screen 480x640x16 &