forked from enlightenment/efl
Remove efreet_xml_{init,shutdown}() from menu
SVN revision: 56730
This commit is contained in:
parent
6ed10251db
commit
18c663b7e2
|
@ -34,3 +34,5 @@
|
||||||
|
|
||||||
* Remove global log domain and make all files define log domain
|
* Remove global log domain and make all files define log domain
|
||||||
before including efreet_private.h
|
before including efreet_private.h
|
||||||
|
* Remove efreet_xml_{init,shutdown}() from efreet_menu.c, it is done
|
||||||
|
in efreet_init()
|
||||||
|
|
|
@ -478,12 +478,6 @@ efreet_menu_init(void)
|
||||||
ERROR("Efreet: Could not create a log domain for efreet_menu");
|
ERROR("Efreet: Could not create a log domain for efreet_menu");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (!efreet_xml_init())
|
|
||||||
{
|
|
||||||
ERROR("Efreet: Could not init xml module");
|
|
||||||
eina_log_domain_unregister(_efreet_menu_log_dom);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
efreet_menu_handle_cbs = eina_hash_string_superfast_new(NULL);
|
efreet_menu_handle_cbs = eina_hash_string_superfast_new(NULL);
|
||||||
efreet_menu_filter_cbs = eina_hash_string_superfast_new(NULL);
|
efreet_menu_filter_cbs = eina_hash_string_superfast_new(NULL);
|
||||||
|
@ -492,7 +486,6 @@ efreet_menu_init(void)
|
||||||
if (!efreet_menu_handle_cbs || !efreet_menu_filter_cbs
|
if (!efreet_menu_handle_cbs || !efreet_menu_filter_cbs
|
||||||
|| !efreet_menu_move_cbs || !efreet_menu_layout_cbs)
|
|| !efreet_menu_move_cbs || !efreet_menu_layout_cbs)
|
||||||
{
|
{
|
||||||
efreet_xml_shutdown();
|
|
||||||
eina_log_domain_unregister(_efreet_menu_log_dom);
|
eina_log_domain_unregister(_efreet_menu_log_dom);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue