summaryrefslogtreecommitdiff
path: root/src/modules/ecore/immodules/xim/ecore_imf_xim.c
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-12-02 22:35:45 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-12-02 22:35:45 +0000
commit7d6010b12c47a20e492da808e3192c3f87dab619 (patch)
tree26c6fd189e046a76560c0bc740b85f4d767ae399 /src/modules/ecore/immodules/xim/ecore_imf_xim.c
parent53fc441d5475155965d92da89502fe4634a561b2 (diff)
merge: add escape ecore, fix several bugs
SVN revision: 79995
Diffstat (limited to '')
-rw-r--r--src/modules/ecore/immodules/xim/ecore_imf_xim.c (renamed from legacy/ecore/src/modules/immodules/xim/ecore_imf_xim.c)24
1 files changed, 12 insertions, 12 deletions
diff --git a/legacy/ecore/src/modules/immodules/xim/ecore_imf_xim.c b/src/modules/ecore/immodules/xim/ecore_imf_xim.c
index bab1aa7cee..64fc46c122 100644
--- a/legacy/ecore/src/modules/immodules/xim/ecore_imf_xim.c
+++ b/src/modules/ecore/immodules/xim/ecore_imf_xim.c
@@ -912,9 +912,9 @@ imf_context_data_destroy(Ecore_IMF_Context_Data *imf_context_data)
912} 912}
913 913
914static int 914static int
915preedit_start_callback(XIC xic __UNUSED__, 915preedit_start_callback(XIC xic EINA_UNUSED,
916 XPointer client_data, 916 XPointer client_data,
917 XPointer call_data __UNUSED__) 917 XPointer call_data EINA_UNUSED)
918{ 918{
919 EINA_LOG_DBG("in"); 919 EINA_LOG_DBG("in");
920 Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)client_data; 920 Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)client_data;
@@ -931,9 +931,9 @@ preedit_start_callback(XIC xic __UNUSED__,
931} 931}
932 932
933static void 933static void
934preedit_done_callback(XIC xic __UNUSED__, 934preedit_done_callback(XIC xic EINA_UNUSED,
935 XPointer client_data, 935 XPointer client_data,
936 XPointer call_data __UNUSED__) 936 XPointer call_data EINA_UNUSED)
937{ 937{
938 EINA_LOG_DBG("in"); 938 EINA_LOG_DBG("in");
939 Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)client_data; 939 Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)client_data;
@@ -959,7 +959,7 @@ preedit_done_callback(XIC xic __UNUSED__,
959 959
960/* FIXME */ 960/* FIXME */
961static int 961static int
962xim_text_to_utf8(Ecore_IMF_Context *ctx __UNUSED__, 962xim_text_to_utf8(Ecore_IMF_Context *ctx EINA_UNUSED,
963 XIMText *xim_text, 963 XIMText *xim_text,
964 char **text) 964 char **text)
965{ 965{
@@ -1003,7 +1003,7 @@ xim_text_to_utf8(Ecore_IMF_Context *ctx __UNUSED__,
1003} 1003}
1004 1004
1005static void 1005static void
1006preedit_draw_callback(XIC xic __UNUSED__, 1006preedit_draw_callback(XIC xic EINA_UNUSED,
1007 XPointer client_data, 1007 XPointer client_data,
1008 XIMPreeditDrawCallbackStruct *call_data) 1008 XIMPreeditDrawCallbackStruct *call_data)
1009{ 1009{
@@ -1094,7 +1094,7 @@ done:
1094} 1094}
1095 1095
1096static void 1096static void
1097preedit_caret_callback(XIC xic __UNUSED__, 1097preedit_caret_callback(XIC xic EINA_UNUSED,
1098 XPointer client_data, 1098 XPointer client_data,
1099 XIMPreeditCaretCallbackStruct *call_data) 1099 XIMPreeditCaretCallbackStruct *call_data)
1100{ 1100{
@@ -1437,8 +1437,8 @@ xim_info_try_im(XIM_Im_Info *info)
1437} 1437}
1438 1438
1439static void 1439static void
1440xim_info_display_closed(Ecore_X_Display *display __UNUSED__, 1440xim_info_display_closed(Ecore_X_Display *display EINA_UNUSED,
1441 int is_error __UNUSED__, 1441 int is_error EINA_UNUSED,
1442 XIM_Im_Info *info) 1442 XIM_Im_Info *info)
1443{ 1443{
1444 Eina_List *ics, *tmp_list; 1444 Eina_List *ics, *tmp_list;
@@ -1470,7 +1470,7 @@ xim_info_display_closed(Ecore_X_Display *display __UNUSED__,
1470static void 1470static void
1471xim_instantiate_callback(Display *display, 1471xim_instantiate_callback(Display *display,
1472 XPointer client_data, 1472 XPointer client_data,
1473 XPointer call_data __UNUSED__) 1473 XPointer call_data EINA_UNUSED)
1474{ 1474{
1475 XIM_Im_Info *info = (XIM_Im_Info *)client_data; 1475 XIM_Im_Info *info = (XIM_Im_Info *)client_data;
1476 XIM im = NULL; 1476 XIM im = NULL;
@@ -1538,9 +1538,9 @@ setup_im(XIM_Im_Info *info)
1538} 1538}
1539 1539
1540static void 1540static void
1541xim_destroy_callback(XIM xim __UNUSED__, 1541xim_destroy_callback(XIM xim EINA_UNUSED,
1542 XPointer client_data, 1542 XPointer client_data,
1543 XPointer call_data __UNUSED__) 1543 XPointer call_data EINA_UNUSED)
1544{ 1544{
1545 XIM_Im_Info *info = (XIM_Im_Info *)client_data; 1545 XIM_Im_Info *info = (XIM_Im_Info *)client_data;
1546 1546