From 9561b38452c3d012d432a1c344bd5ea7ad0befbf Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Sun, 22 Nov 2009 21:50:24 +0000 Subject: [PATCH] Rename illume-bar to illume-buttonbar to avoid confusion. SVN revision: 43908 --- configure.ac | 4 ++-- src/modules/Makefile.am | 2 +- .../{illume-bar => illume-buttonbar}/Makefile.am | 0 .../e-module-illume-bar.edj | Bin .../{illume-bar => illume-buttonbar}/e_mod_config.c | 0 .../{illume-bar => illume-buttonbar}/e_mod_config.h | 0 .../{illume-bar => illume-buttonbar}/e_mod_main.c | 0 .../{illume-bar => illume-buttonbar}/e_mod_main.h | 0 .../module.desktop.in | 0 src/modules/illume/e_kbd_dict.c | 2 +- src/modules/illume2/e_mod_layout.c | 3 +-- src/modules/illume2/e_mod_main.c | 4 ++-- x-ui.sh | 2 +- 13 files changed, 8 insertions(+), 9 deletions(-) rename src/modules/{illume-bar => illume-buttonbar}/Makefile.am (100%) rename src/modules/{illume-bar => illume-buttonbar}/e-module-illume-bar.edj (100%) rename src/modules/{illume-bar => illume-buttonbar}/e_mod_config.c (100%) rename src/modules/{illume-bar => illume-buttonbar}/e_mod_config.h (100%) rename src/modules/{illume-bar => illume-buttonbar}/e_mod_main.c (100%) rename src/modules/{illume-bar => illume-buttonbar}/e_mod_main.h (100%) rename src/modules/{illume-bar => illume-buttonbar}/module.desktop.in (100%) diff --git a/configure.ac b/configure.ac index 234d02a2d..72b039f42 100644 --- a/configure.ac +++ b/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 diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index 15116c2fb..a7c30f6b8 100644 --- a/src/modules/Makefile.am +++ b/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 diff --git a/src/modules/illume-bar/Makefile.am b/src/modules/illume-buttonbar/Makefile.am similarity index 100% rename from src/modules/illume-bar/Makefile.am rename to src/modules/illume-buttonbar/Makefile.am diff --git a/src/modules/illume-bar/e-module-illume-bar.edj b/src/modules/illume-buttonbar/e-module-illume-bar.edj similarity index 100% rename from src/modules/illume-bar/e-module-illume-bar.edj rename to src/modules/illume-buttonbar/e-module-illume-bar.edj diff --git a/src/modules/illume-bar/e_mod_config.c b/src/modules/illume-buttonbar/e_mod_config.c similarity index 100% rename from src/modules/illume-bar/e_mod_config.c rename to src/modules/illume-buttonbar/e_mod_config.c diff --git a/src/modules/illume-bar/e_mod_config.h b/src/modules/illume-buttonbar/e_mod_config.h similarity index 100% rename from src/modules/illume-bar/e_mod_config.h rename to src/modules/illume-buttonbar/e_mod_config.h diff --git a/src/modules/illume-bar/e_mod_main.c b/src/modules/illume-buttonbar/e_mod_main.c similarity index 100% rename from src/modules/illume-bar/e_mod_main.c rename to src/modules/illume-buttonbar/e_mod_main.c diff --git a/src/modules/illume-bar/e_mod_main.h b/src/modules/illume-buttonbar/e_mod_main.h similarity index 100% rename from src/modules/illume-bar/e_mod_main.h rename to src/modules/illume-buttonbar/e_mod_main.h diff --git a/src/modules/illume-bar/module.desktop.in b/src/modules/illume-buttonbar/module.desktop.in similarity index 100% rename from src/modules/illume-bar/module.desktop.in rename to src/modules/illume-buttonbar/module.desktop.in diff --git a/src/modules/illume/e_kbd_dict.c b/src/modules/illume/e_kbd_dict.c index 9123db648..201a328da 100644 --- a/src/modules/illume/e_kbd_dict.c +++ b/src/modules/illume/e_kbd_dict.c @@ -7,8 +7,8 @@ #include #include - #define MAXLATIN 0x100 + static unsigned char _e_kbd_normalise_base[MAXLATIN]; static unsigned char _e_kbd_normalise_ready = 0; diff --git a/src/modules/illume2/e_mod_layout.c b/src/modules/illume2/e_mod_layout.c index bbd3d75b6..06bdedacd 100644 --- a/src/modules/illume2/e_mod_layout.c +++ b/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; diff --git a/src/modules/illume2/e_mod_main.c b/src/modules/illume2/e_mod_main.c index a70dd096c..a4b80a511 100644 --- a/src/modules/illume2/e_mod_main.c +++ b/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 */ } diff --git a/x-ui.sh b/x-ui.sh index b55d5fbbb..f94b4c52b 100755 --- a/x-ui.sh +++ b/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 &