zmike

/*
 * Copyright © 2012 Ran Benita <ran234@gmail.com>
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 * and/or sell copies of the Software, and to permit persons to whom the
 * Software is furnished to do so, subject to the following conditions:
 *

zmike

diff --git a/test/state.c b/test/state.c
index 8ae718c..81bf473 100644
--- a/test/state.c
+++ b/test/state.c
@@ -678,6 +678,8 @@ main(void)
 {
     struct xkb_context *context = test_get_context(0);
     struct xkb_keymap *keymap;
+    xkb_keycode_t kc;
+    const char *keyname;

zmike

e/comp/border/default
e/comp/border/default/fast
e/comp/border/everything
e/comp/border/everything/fast
e/comp/border/flip
e/comp/border/flip/fast
e/comp/border/fullscreen
e/comp/border/fullscreen/fast
e/comp/border/menu
e/comp/border/menu/fast

zmike

#0  _eo_call_resolve (func_name=0x7ffff50ec092 "evas_obj_map_get", call=0x7ffffffc1910, 
    cache=0x7ffff5363ab0 <___cache.27669>, file=0x7ffff50ebef0 "../src/lib/evas/canvas/evas_object.eo.c", 
    line=114) at lib/eo/eo.c:525
#1  0x00007ffff4f6304f in evas_obj_map_get () at ../src/lib/evas/canvas/evas_object.eo.c:114
#2  0x00007ffff4f5d9fd in _evas_object_efl_gfx_base_position_set (eo_obj=0x800000d360001c04, obj=0x15d1c60, 
    x=899, y=586) at lib/evas/canvas/evas_object_main.c:794
#3  0x00007ffff3d81f54 in efl_gfx_position_set (x=899, y=586) at ../src/lib/efl/interfaces/efl_gfx_base.eo.c:1
#4  0x00007ffff4f5d8dc in evas_object_move (obj=0x800000d360001c04, x=899, y=586)
    at lib/evas/canvas/evas_object_main.c:767
#5  0x00007ffff4f73d4d in _evas_object_smart_move_children_relative (eo_obj=0x800000d0a0001c02, obj=0x11d5400, 

zmike

diff --git a/src/bin/test_image.c b/src/bin/test_image.c
index f8f3d85..19cf0ec 100644
--- a/src/bin/test_image.c
+++ b/src/bin/test_image.c
@@ -174,6 +174,7 @@ test_click_image(void *data EINA_UNUSED, Evas_Object *obj  EINA_UNUSED, void *ev
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get());
    elm_image_file_set(im, buf, NULL);
+   elm_image_file_set(im, NULL, NULL);
    evas_object_size_hint_weight_set(im, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

zmike

diff --git a/src/bin/termio.c b/src/bin/termio.c
index 8b04b81..d75f8ab 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -4821,7 +4821,7 @@ _smart_apply(Evas_Object *obj)
           evas_object_textgrid_update_add(sd->grid.obj, ch1, y,
                                           ch2 - ch1 + 1, 1);
      }
-   if (sd->preedit_str)
+   if (sd->preedit_str && sd->preedit_str[0])

zmike

[15:31:26.255] caught signal: 11
[15:31:26.256] 0: weston (on_caught_signal+0x2c) [0x4240ca]
[15:31:26.256] 1: /lib64/libpthread.so.0 (__restore_rt+0x0) [0x353861042f]
[15:31:26.257] 2: /lib64/libwayland-server.so.0 (wl_list_insert+0x3f) [0x7f0877c19192]
[15:31:26.257] 3: /usr/lib64/weston/desktop-shell.so (wl_signal_add+0x26) [0x7f0876192970]
[15:31:26.258] 4: /usr/lib64/weston/desktop-shell.so (focus_state_set_focus+0x6b) [0x7f087619425c]
[15:31:26.258] 5: /usr/lib64/weston/desktop-shell.so (activate+0xce) [0x7f087619cdfd]
[15:31:26.258] 6: /usr/lib64/weston/desktop-shell.so (activate_binding+0x77) [0x7f087619cf6a]
[15:31:26.259] 7: /usr/lib64/weston/desktop-shell.so (click_to_activate_binding+0x5c) [0x7f087619cfcb]
[15:31:26.259] 8: weston (weston_compositor_run_button_binding+0xd6) [0x41fc98]

zmike

ESTART: 0.00000 [0.00000] - Begin Startup
ESTART: 0.00002 [0.00002] - Signal Trap
ESTART: 0.00003 [0.00001] - Signal Trap Done
ESTART: 0.00004 [0.00001] - Eina Init
ESTART: 0.00026 [0.00022] - Eina Init Done
ESTART: 0.00026 [0.00000] - Determine Prefix
INF<e>src/bin/e_prefix.c:25 =================================
INF<e>src/bin/e_prefix.c:26 Enlightenment relocation handling
INF<e>src/bin/e_prefix.c:27 =================================
INF<e>src/bin/e_prefix.c:28 PREFIX:  /usr

zmike

ESTART: 0.00000 [0.00000] - Begin Startup
ESTART: 0.00004 [0.00004] - Signal Trap
ESTART: 0.00005 [0.00002] - Signal Trap Done
ESTART: 0.00008 [0.00003] - Eina Init
ESTART: 0.00049 [0.00041] - Eina Init Done
ESTART: 0.00049 [0.00000] - Determine Prefix
INF<e>src/bin/e_prefix.c:25 =================================
INF<e>src/bin/e_prefix.c:26 Enlightenment relocation handling
INF<e>src/bin/e_prefix.c:27 =================================
INF<e>src/bin/e_prefix.c:28 PREFIX:  /usr

zmike

ESTART: 0.00001 [0.00001] - Begin Startup
ESTART: 0.00004 [0.00004] - Signal Trap
ESTART: 0.00006 [0.00002] - Signal Trap Done
ESTART: 0.00008 [0.00003] - Eina Init
ESTART: 0.00052 [0.00044] - Eina Init Done
ESTART: 0.00053 [0.00000] - Determine Prefix
INF<e>src/bin/e_prefix.c:25 =================================
INF<e>src/bin/e_prefix.c:26 Enlightenment relocation handling
INF<e>src/bin/e_prefix.c:27 =================================
INF<e>src/bin/e_prefix.c:28 PREFIX:  /usr