formatting.

SVN revision: 49441
This commit is contained in:
Carsten Haitzler 2010-06-04 04:53:10 +00:00
parent 8fba7a4476
commit 6e1b5c42fa
1 changed files with 4 additions and 8 deletions

View File

@ -37,11 +37,9 @@ static int _ecore_imf_init_count = 0;
EAPI int EAPI int
ecore_imf_init(void) ecore_imf_init(void)
{ {
if (++_ecore_imf_init_count != 1) if (++_ecore_imf_init_count != 1) return _ecore_imf_init_count;
return _ecore_imf_init_count;
if (!ecore_init()) if (!ecore_init()) return --_ecore_imf_init_count;
return --_ecore_imf_init_count;
_ecore_imf_log_dom = eina_log_domain_register("EcoreIMF", ECORE_IMF_DEFAULT_LOG_COLOR); _ecore_imf_log_dom = eina_log_domain_register("EcoreIMF", ECORE_IMF_DEFAULT_LOG_COLOR);
if (_ecore_imf_log_dom < 0) if (_ecore_imf_log_dom < 0)
{ {
@ -69,12 +67,10 @@ ecore_imf_init(void)
EAPI int EAPI int
ecore_imf_shutdown(void) ecore_imf_shutdown(void)
{ {
if (--_ecore_imf_init_count != 0) if (--_ecore_imf_init_count != 0) return _ecore_imf_init_count;
return _ecore_imf_init_count;
ecore_shutdown();
ecore_imf_module_shutdown(); ecore_imf_module_shutdown();
eina_log_domain_unregister(_ecore_imf_log_dom); eina_log_domain_unregister(_ecore_imf_log_dom);
_ecore_imf_log_dom = -1; _ecore_imf_log_dom = -1;
ecore_shutdown();
return _ecore_imf_init_count; return _ecore_imf_init_count;
} }