summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cpmichael@osg.samsung.com>2015-12-29 10:24:08 -0500
committerChris Michael <cpmichael@osg.samsung.com>2015-12-29 10:24:08 -0500
commitfbbd8a86de623bf104821f34dd7473e8f76c6bb7 (patch)
treed7baea01061369083cf82fbd109b06e8cbdbbbd0
parent2f2b39b2f7f984244eec83a408c7374c79ab9682 (diff)
elementary: Fix formatting
NB: No functional changes Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
-rw-r--r--src/lib/elm_main.c37
1 files changed, 19 insertions, 18 deletions
diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 333d3a930..44698733b 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -273,7 +273,8 @@ _elm_clouseau_reload()
273 return EINA_TRUE; 273 return EINA_TRUE;
274} 274}
275 275
276static Eina_Bool _sys_memory_changed(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) 276static Eina_Bool
277_sys_memory_changed(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
277{ 278{
278 Ecore_Memory_State state = ecore_memory_state_get(); 279 Ecore_Memory_State state = ecore_memory_state_get();
279 280
@@ -284,7 +285,8 @@ static Eina_Bool _sys_memory_changed(void *data EINA_UNUSED, int type EINA_UNUSE
284 return ECORE_CALLBACK_PASS_ON; 285 return ECORE_CALLBACK_PASS_ON;
285} 286}
286 287
287static Eina_Bool _sys_lang_changed(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) 288static Eina_Bool
289_sys_lang_changed(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
288{ 290{
289 char *lang; 291 char *lang;
290 292
@@ -303,8 +305,7 @@ static Eina_Bool _sys_lang_changed(void *data EINA_UNUSED, int type EINA_UNUSED,
303} 305}
304 306
305EAPI int 307EAPI int
306elm_init(int argc, 308elm_init(int argc, char **argv)
307 char **argv)
308{ 309{
309 _elm_init_count++; 310 _elm_init_count++;
310 if (_elm_init_count > 1) return _elm_init_count; 311 if (_elm_init_count > 1) return _elm_init_count;
@@ -312,8 +313,10 @@ elm_init(int argc,
312 elm_quicklaunch_sub_init(argc, argv); 313 elm_quicklaunch_sub_init(argc, argv);
313 _prefix_shutdown(); 314 _prefix_shutdown();
314 315
315 system_handlers[0] = ecore_event_handler_add(ECORE_EVENT_MEMORY_STATE, _sys_memory_changed, NULL); 316 system_handlers[0] =
316 system_handlers[1] = ecore_event_handler_add(ECORE_EVENT_LOCALE_CHANGED, _sys_lang_changed, NULL); 317 ecore_event_handler_add(ECORE_EVENT_MEMORY_STATE, _sys_memory_changed, NULL);
318 system_handlers[1] =
319 ecore_event_handler_add(ECORE_EVENT_LOCALE_CHANGED, _sys_lang_changed, NULL);
317 320
318 if (_elm_config->atspi_mode != ELM_ATSPI_MODE_OFF) 321 if (_elm_config->atspi_mode != ELM_ATSPI_MODE_OFF)
319 _elm_atspi_bridge_init(); 322 _elm_atspi_bridge_init();
@@ -325,9 +328,8 @@ EAPI int
325elm_shutdown(void) 328elm_shutdown(void)
326{ 329{
327 if (_elm_init_count <= 0) 330 if (_elm_init_count <= 0)
328 { 331 return 0;
329 return 0; 332
330 }
331 _elm_init_count--; 333 _elm_init_count--;
332 if (_elm_init_count > 0) return _elm_init_count; 334 if (_elm_init_count > 0) return _elm_init_count;
333 335
@@ -488,8 +490,10 @@ elm_need_e_dbus(void)
488#ifndef RTLD_NOLOAD 490#ifndef RTLD_NOLOAD
489# define RTLD_NOLOAD RTLD_GLOBAL 491# define RTLD_NOLOAD RTLD_GLOBAL
490#endif 492#endif
491 if (!e_dbus_handle) e_dbus_handle = dlopen("libedbus.so", RTLD_LAZY | RTLD_NOLOAD); 493 if (!e_dbus_handle)
492 if (!e_dbus_handle) e_dbus_handle = dlopen("libedbus.so.1", RTLD_LAZY | RTLD_NOLOAD); 494 e_dbus_handle = dlopen("libedbus.so", RTLD_LAZY | RTLD_NOLOAD);
495 if (!e_dbus_handle)
496 e_dbus_handle = dlopen("libedbus.so.1", RTLD_LAZY | RTLD_NOLOAD);
493 if (!e_dbus_handle) return EINA_FALSE; 497 if (!e_dbus_handle) return EINA_FALSE;
494 init_func = dlsym(e_dbus_handle, "e_dbus_init"); 498 init_func = dlsym(e_dbus_handle, "e_dbus_init");
495 if (!init_func) return EINA_FALSE; 499 if (!init_func) return EINA_FALSE;
@@ -640,7 +644,8 @@ elm_quicklaunch_init(int argc,
640 ecore_file_init(); 644 ecore_file_init();
641 eio_init(); 645 eio_init();
642 646
643 _elm_exit_handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _elm_signal_exit, NULL); 647 _elm_exit_handler =
648 ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _elm_signal_exit, NULL);
644 649
645 if (argv) 650 if (argv)
646 { 651 {
@@ -662,9 +667,7 @@ elm_quicklaunch_init(int argc,
662 if (!_elm_data_dir) _elm_data_dir = eina_stringshare_add("/"); 667 if (!_elm_data_dir) _elm_data_dir = eina_stringshare_add("/");
663 if (!_elm_lib_dir) _elm_lib_dir = eina_stringshare_add("/"); 668 if (!_elm_lib_dir) _elm_lib_dir = eina_stringshare_add("/");
664 669
665 eina_log_timing(_elm_log_dom, 670 eina_log_timing(_elm_log_dom, EINA_LOG_STATE_STOP, EINA_LOG_STATE_INIT);
666 EINA_LOG_STATE_STOP,
667 EINA_LOG_STATE_INIT);
668 671
669 if (quicklaunch_on) 672 if (quicklaunch_on)
670 _elm_init_count++; 673 _elm_init_count++;
@@ -736,9 +739,7 @@ elm_quicklaunch_shutdown(void)
736 _elm_ql_init_count--; 739 _elm_ql_init_count--;
737 if (_elm_ql_init_count > 0) return _elm_ql_init_count; 740 if (_elm_ql_init_count > 0) return _elm_ql_init_count;
738 741
739 eina_log_timing(_elm_log_dom, 742 eina_log_timing(_elm_log_dom, EINA_LOG_STATE_STOP, EINA_LOG_STATE_SHUTDOWN);
740 EINA_LOG_STATE_STOP,
741 EINA_LOG_STATE_SHUTDOWN);
742 743
743 if (pfx) eina_prefix_free(pfx); 744 if (pfx) eina_prefix_free(pfx);
744 pfx = NULL; 745 pfx = NULL;