Enlightenment CVS committal

Author  : andrunko
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_entry.c 


Log Message:
Do not crash when no input method context module is installed.

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- e_entry.c   21 Nov 2007 22:20:15 -0000      1.51
+++ e_entry.c   22 Nov 2007 14:55:43 -0000      1.52
@@ -1012,18 +1012,23 @@
    evas_object_smart_data_set(object, sd);
 
    ctx_id = ecore_imf_context_default_id_get();
-   ctx_info = ecore_imf_context_info_by_id_get(ctx_id);
-   if (!ctx_info->canvas_type ||
-       strcmp(ctx_info->canvas_type, "evas") == 0)
-     sd->imf_context = ecore_imf_context_add(ctx_id);
-   else
+   if (ctx_id)
      {
-       ctx_id = ecore_imf_context_default_id_by_canvas_type_get("evas");
-       if (ctx_id)
+       ctx_info = ecore_imf_context_info_by_id_get(ctx_id);
+       if (!ctx_info->canvas_type ||
+           strcmp(ctx_info->canvas_type, "evas") == 0)
          sd->imf_context = ecore_imf_context_add(ctx_id);
        else
-         sd->imf_context = NULL;
+         {
+            ctx_id = ecore_imf_context_default_id_by_canvas_type_get("evas");
+            if (ctx_id)
+              sd->imf_context = ecore_imf_context_add(ctx_id);
+            else
+              sd->imf_context = NULL;
+         }
      }
+   else
+     sd->imf_context = NULL;
 
    if (sd->imf_context)
      {



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to