Fix warnings.

SVN revision: 32820
This commit is contained in:
Sebastian Dransfeld 2007-11-22 11:55:35 +00:00
parent ed930e98a2
commit 8ee02e0e2a
3 changed files with 8 additions and 4 deletions

View File

@ -5,6 +5,9 @@
#include "config.h" #include "config.h"
#include "Ecore_IMF.h" #include "Ecore_IMF.h"
#include "ecore_imf_private.h"
#include <Ecore.h>
EAPI int ECORE_IMF_EVENT_PREEDIT_START = 0; EAPI int ECORE_IMF_EVENT_PREEDIT_START = 0;
EAPI int ECORE_IMF_EVENT_PREEDIT_END = 0; EAPI int ECORE_IMF_EVENT_PREEDIT_END = 0;

View File

@ -10,6 +10,8 @@
#include "Ecore_IMF.h" #include "Ecore_IMF.h"
#include "ecore_imf_private.h" #include "ecore_imf_private.h"
#include <Ecore.h>
/** /**
* @defgroup Ecore_IMF_Context_Group Ecore Input Method Context Functions * @defgroup Ecore_IMF_Context_Group Ecore Input Method Context Functions
* *
@ -598,7 +600,7 @@ EAPI void *ecore_imf_context_data_get(Ecore_IMF_Context *ctx)
{ {
ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT, ECORE_MAGIC_FAIL(ctx, ECORE_MAGIC_CONTEXT,
"ecore_imf_context_data_get"); "ecore_imf_context_data_get");
return; return NULL;
} }
return ctx->data; return ctx->data;
} }

View File

@ -157,13 +157,12 @@ _ecore_imf_module_load_all(void)
const Ecore_IMF_Context_Info *info = NULL; const Ecore_IMF_Context_Info *info = NULL;
int (*imf_module_init)(const Ecore_IMF_Context_Info **info); int (*imf_module_init)(const Ecore_IMF_Context_Info **info);
Ecore_IMF_Context *(*imf_module_create)(void); Ecore_IMF_Context *(*imf_module_create)(void);
Ecore_IMF_Module *module;
avail = ecore_plugin_available_get(ecore_imf_modules_path); avail = ecore_plugin_available_get(ecore_imf_modules_path);
if (!avail) return; if (!avail) return;
ecore_list_first_goto(avail); ecore_list_first_goto(avail);
while (filename = ecore_list_next(avail)) while ((filename = ecore_list_next(avail)))
{ {
plugin = ecore_plugin_load(ecore_imf_modules_path, filename, NULL); plugin = ecore_plugin_load(ecore_imf_modules_path, filename, NULL);
if (!plugin) if (!plugin)
@ -187,7 +186,7 @@ _ecore_imf_module_load_all(void)
{ {
fprintf(stderr, "** ecore_imf: Error loading input method plugin %s! " fprintf(stderr, "** ecore_imf: Error loading input method plugin %s! "
"Plugin with id='%s' already exists!", "Plugin with id='%s' already exists!",
info->id); filename, info->id);
ecore_plugin_unload(plugin); ecore_plugin_unload(plugin);
continue; continue;
} }