diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-05-09 14:23:03 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-05-09 14:23:03 +0000 |
| commit | 2ea905d370dcfc9c2b4b7f2787cce58de531006e (patch) | |
| tree | d8411d06d995522e28aa474d880efcfe13379b66 /packages/openmoko-projects/illume | |
| parent | b308cdc3283673906ff273f82fcc7409557bcad3 (diff) | |
illume-theme_svn.bb, illume/keyboard.patch : illume fixes and theme from OM mtn
Diffstat (limited to 'packages/openmoko-projects/illume')
| -rw-r--r-- | packages/openmoko-projects/illume/keyboard.patch | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/packages/openmoko-projects/illume/keyboard.patch b/packages/openmoko-projects/illume/keyboard.patch new file mode 100644 index 0000000000..320e798a3e --- /dev/null +++ b/packages/openmoko-projects/illume/keyboard.patch @@ -0,0 +1,89 @@ +Index: configure.in +=================================================================== +--- configure.in (Revision 17) ++++ configure.in (Arbeitskopie) +@@ -28,6 +28,9 @@ + AC_SUBST(LOCALEDIR, "${localedir}") + AC_DEFINE_UNQUOTED(LOCALEDIR, "${localedir}", "Module Locale Directory") + ++keyboarddir="${datarootdir}/${PACKAGE}/keyboard" ++AC_SUBST(keyboarddir) ++ + # + # Check EFL Libs + # +Index: src/e_kbd.c +=================================================================== +--- src/e_kbd.c (Revision 17) ++++ src/e_kbd.c (Arbeitskopie) +@@ -57,6 +57,7 @@ + + static int _e_kbd_config_parse(E_Kbd *kbd, const char *config); + static Evas_Object *_theme_obj_new(Evas *e, const char *custom_dir, const char *group); ++static char* _e_kbd_get_default_path(void); + + /* state */ + +@@ -470,7 +471,7 @@ + edje_object_part_swallow(kbd->base_obj, "e.swallow.content", o); + evas_object_show(o); + kbd->layout_obj = o; +- _e_kbd_config_parse(kbd, "/home/raster/work/illume/default.kbd"); ++ _e_kbd_config_parse(kbd, _e_kbd_get_default_path()); + _e_kbd_layout_build(kbd); + + edje_object_size_min_calc(kbd->base_obj, &mw, &mh); +@@ -744,3 +745,26 @@ + } + return o; + } ++ ++/* ++ * Return the to be used keyboard file ++ */ ++static char * ++_e_kbd_get_default_path() ++{ ++ static char *buf = 0; ++ ++ if (getenv("ILLUME_KEYBOARD_DIR")) ++ { ++ if (!buf) ++ { ++ buf = (char*)malloc(sizeof(char)*PATH_MAX); ++ } ++ ++ snprintf(buf, PATH_MAX, "%s/default.kbd", getenv("ILLUME_KEYBOARD_DIR")); ++ return buf; ++ } ++ ++ ++ return KEYBOARDDIR"/default.kbd"; ++} +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am (Revision 17) ++++ src/Makefile.am (Arbeitskopie) +@@ -1,6 +1,8 @@ + ACLOCAL_AMFLAGS = -I m4 + MAINTAINERCLEANFILES = Makefile.in + ++AM_CPPFLAGS = -DKEYBOARDDIR=\"$(keyboarddir)\" ++ + INCLUDES = -I. \ + -I$(top_srcdir) \ + @e_cflags@ +Index: Makefile.am +=================================================================== +--- Makefile.am (Revision 17) ++++ Makefile.am (Arbeitskopie) +@@ -14,6 +14,9 @@ + files_DATA = module.desktop \ + e-module-illume.edj \ + illume.edj ++ ++keybddir = $(keyboarddir) ++keybd_DATA = default.kbd + + EXTRA_DIST = $(files_DATA) \ + illume.edc \ |