summaryrefslogtreecommitdiff
path: root/legacy/ecore/src/lib
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--legacy/ecore/src/lib/ecore_imf/ecore_imf.c3
-rw-r--r--legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c4
-rw-r--r--legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c5
3 files changed, 8 insertions, 4 deletions
diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf.c b/legacy/ecore/src/lib/ecore_imf/ecore_imf.c
index acf7e8d693..593cadc254 100644
--- a/legacy/ecore/src/lib/ecore_imf/ecore_imf.c
+++ b/legacy/ecore/src/lib/ecore_imf/ecore_imf.c
@@ -5,6 +5,9 @@
5#include "config.h" 5#include "config.h"
6 6
7#include "Ecore_IMF.h" 7#include "Ecore_IMF.h"
8#include "ecore_imf_private.h"
9
10#include <Ecore.h>
8 11
9EAPI int ECORE_IMF_EVENT_PREEDIT_START = 0; 12EAPI int ECORE_IMF_EVENT_PREEDIT_START = 0;
10EAPI int ECORE_IMF_EVENT_PREEDIT_END = 0; 13EAPI int ECORE_IMF_EVENT_PREEDIT_END = 0;
diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c b/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c
index 875bb2a8ec..cf5bf1a3d7 100644
--- a/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c
+++ b/legacy/ecore/src/lib/ecore_imf/ecore_imf_context.c
@@ -10,6 +10,8 @@
10#include "Ecore_IMF.h" 10#include "Ecore_IMF.h"
11#include "ecore_imf_private.h" 11#include "ecore_imf_private.h"
12 12
13#include <Ecore.h>
14
13/** 15/**
14 * @defgroup Ecore_IMF_Context_Group Ecore Input Method Context Functions 16 * @defgroup Ecore_IMF_Context_Group Ecore Input Method Context Functions
15 * 17 *
@@ -598,7 +600,7 @@ EAPI void *ecore_imf_context_data_get(Ecore_IMF_Context *ctx)
598 { 600 {
599 ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, 601 ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT,
600 "ecore_imf_context_data_get"); 602 "ecore_imf_context_data_get");
601 return; 603 return NULL;
602 } 604 }
603 return ctx->data; 605 return ctx->data;
604} 606}
diff --git a/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c b/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c
index 7b7bc2e400..d6b0be120f 100644
--- a/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c
+++ b/legacy/ecore/src/lib/ecore_imf/ecore_imf_module.c
@@ -157,13 +157,12 @@ _ecore_imf_module_load_all(void)
157 const Ecore_IMF_Context_Info *info = NULL; 157 const Ecore_IMF_Context_Info *info = NULL;
158 int (*imf_module_init)(const Ecore_IMF_Context_Info **info); 158 int (*imf_module_init)(const Ecore_IMF_Context_Info **info);
159 Ecore_IMF_Context *(*imf_module_create)(void); 159 Ecore_IMF_Context *(*imf_module_create)(void);
160 Ecore_IMF_Module *module;
161 160
162 avail = ecore_plugin_available_get(ecore_imf_modules_path); 161 avail = ecore_plugin_available_get(ecore_imf_modules_path);
163 if (!avail) return; 162 if (!avail) return;
164 163
165 ecore_list_first_goto(avail); 164 ecore_list_first_goto(avail);
166 while (filename = ecore_list_next(avail)) 165 while ((filename = ecore_list_next(avail)))
167 { 166 {
168 plugin = ecore_plugin_load(ecore_imf_modules_path, filename, NULL); 167 plugin = ecore_plugin_load(ecore_imf_modules_path, filename, NULL);
169 if (!plugin) 168 if (!plugin)
@@ -187,7 +186,7 @@ _ecore_imf_module_load_all(void)
187 { 186 {
188 fprintf(stderr, "** ecore_imf: Error loading input method plugin %s! " 187 fprintf(stderr, "** ecore_imf: Error loading input method plugin %s! "
189 "Plugin with id='%s' already exists!", 188 "Plugin with id='%s' already exists!",
190 info->id); 189 filename, info->id);
191 ecore_plugin_unload(plugin); 190 ecore_plugin_unload(plugin);
192 continue; 191 continue;
193 } 192 }