summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/modules/ecore_imf/xim/ecore_imf_xim.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/modules/ecore_imf/xim/ecore_imf_xim.c b/src/modules/ecore_imf/xim/ecore_imf_xim.c
index 5a10a7e539..30129a5274 100644
--- a/src/modules/ecore_imf/xim/ecore_imf_xim.c
+++ b/src/modules/ecore_imf/xim/ecore_imf_xim.c
@@ -739,7 +739,11 @@ static Ecore_IMF_Context_Class xim_class = {
739static Ecore_IMF_Context * 739static Ecore_IMF_Context *
740xim_imf_module_create(void) 740xim_imf_module_create(void)
741{ 741{
742 Ecore_IMF_Context *ctx = ecore_imf_context_new(&xim_class); 742 Ecore_IMF_Context *ctx;
743
744 if (!ecore_x_init(NULL))
745 return NULL;
746 ctx = ecore_imf_context_new(&xim_class);
743 DBG("ctx=%p", ctx); 747 DBG("ctx=%p", ctx);
744 return ctx; 748 return ctx;
745} 749}
@@ -747,6 +751,7 @@ xim_imf_module_create(void)
747static Ecore_IMF_Context * 751static Ecore_IMF_Context *
748xim_imf_module_exit(void) 752xim_imf_module_exit(void)
749{ 753{
754 ecore_x_shutdown();
750 DBG(" "); 755 DBG(" ");
751 return NULL; 756 return NULL;
752} 757}
@@ -771,12 +776,6 @@ _ecore_imf_xim_init(void)
771 776
772 DBG(" "); 777 DBG(" ");
773 778
774 if (!ecore_x_init(NULL))
775 {
776 eina_shutdown();
777 return EINA_FALSE;
778 }
779
780 ecore_imf_module_register(&xim_info, 779 ecore_imf_module_register(&xim_info,
781 xim_imf_module_create, 780 xim_imf_module_create,
782 xim_imf_module_exit); 781 xim_imf_module_exit);
@@ -795,8 +794,6 @@ _ecore_imf_xim_shutdown(void)
795 _ecore_imf_xim_info_im_shutdown(display, EINA_FALSE, info); 794 _ecore_imf_xim_info_im_shutdown(display, EINA_FALSE, info);
796 } 795 }
797 796
798 ecore_x_shutdown();
799
800 if (_ecore_imf_xim_log_dom >= 0) 797 if (_ecore_imf_xim_log_dom >= 0)
801 { 798 {
802 eina_log_domain_unregister(_ecore_imf_xim_log_dom); 799 eina_log_domain_unregister(_ecore_imf_xim_log_dom);