summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2009-09-06 22:23:04 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2009-09-06 22:23:04 +0000
commit992936af2259611053bc1486b560825d9a714614 (patch)
tree5d5c17005f4e4ffc301229b1df0072ff9e986b0d
parente4af7c100c4fdd0fd51af8d5d1c5948223b95a19 (diff)
Update to match new EINA init/shutdown.
SVN revision: 42301
Diffstat (limited to '')
-rw-r--r--legacy/efreet/src/lib/efreet.c4
-rw-r--r--legacy/efreet/src/lib/efreet_base.c10
-rw-r--r--legacy/efreet/src/lib/efreet_desktop.c4
-rw-r--r--legacy/efreet/src/lib/efreet_ini.c4
-rw-r--r--legacy/efreet/src/lib/efreet_menu.c4
-rw-r--r--legacy/efreet/src/lib/efreet_xml.c4
-rw-r--r--legacy/ethumb/src/bin/ethumbd.c4
-rw-r--r--legacy/ethumb/src/lib/Ethumb.c16
-rw-r--r--legacy/ethumb/src/lib/client/Ethumb_Client.c6
9 files changed, 21 insertions, 35 deletions
diff --git a/legacy/efreet/src/lib/efreet.c b/legacy/efreet/src/lib/efreet.c
index df69879f9a..672947c6c2 100644
--- a/legacy/efreet/src/lib/efreet.c
+++ b/legacy/efreet/src/lib/efreet.c
@@ -29,7 +29,7 @@ EAPI int
29efreet_init(void) 29efreet_init(void)
30{ 30{
31 if (init++) return init; 31 if (init++) return init;
32 if (!eina_stringshare_init()) return --init; 32 if (!eina_init()) return --init;
33 if (!efreet_base_init()) return --init; 33 if (!efreet_base_init()) return --init;
34 if (!efreet_xml_init()) return --init; 34 if (!efreet_xml_init()) return --init;
35 if (!efreet_icon_init()) return --init; 35 if (!efreet_icon_init()) return --init;
@@ -55,7 +55,7 @@ efreet_shutdown(void)
55 efreet_icon_shutdown(); 55 efreet_icon_shutdown();
56 efreet_xml_shutdown(); 56 efreet_xml_shutdown();
57 efreet_base_shutdown(); 57 efreet_base_shutdown();
58 eina_stringshare_shutdown(); 58 eina_shutdown();
59 59
60 IF_FREE(efreet_lang); 60 IF_FREE(efreet_lang);
61 IF_FREE(efreet_lang_country); 61 IF_FREE(efreet_lang_country);
diff --git a/legacy/efreet/src/lib/efreet_base.c b/legacy/efreet/src/lib/efreet_base.c
index ca89bb3255..4080c8076b 100644
--- a/legacy/efreet/src/lib/efreet_base.c
+++ b/legacy/efreet/src/lib/efreet_base.c
@@ -35,12 +35,7 @@ static Eina_List *efreet_dirs_get(const char *key,
35int 35int
36efreet_base_init(void) 36efreet_base_init(void)
37{ 37{
38 if (!eina_stringshare_init()) return 0; 38 if (!eina_init()) return 0;
39 if (!eina_list_init())
40 {
41 eina_stringshare_shutdown();
42 return 0;
43 }
44 39
45 return 1; 40 return 1;
46} 41}
@@ -61,8 +56,7 @@ efreet_base_shutdown(void)
61 IF_FREE_LIST(xdg_data_dirs, eina_stringshare_del); 56 IF_FREE_LIST(xdg_data_dirs, eina_stringshare_del);
62 IF_FREE_LIST(xdg_config_dirs, eina_stringshare_del); 57 IF_FREE_LIST(xdg_config_dirs, eina_stringshare_del);
63 58
64 eina_list_shutdown(); 59 eina_shutdown();
65 eina_stringshare_shutdown();
66} 60}
67 61
68/** 62/**
diff --git a/legacy/efreet/src/lib/efreet_desktop.c b/legacy/efreet/src/lib/efreet_desktop.c
index 18ebd131a6..e9903f98c5 100644
--- a/legacy/efreet/src/lib/efreet_desktop.c
+++ b/legacy/efreet/src/lib/efreet_desktop.c
@@ -136,7 +136,7 @@ int
136efreet_desktop_init(void) 136efreet_desktop_init(void)
137{ 137{
138 if (init++) return init; 138 if (init++) return init;
139 if (!eina_stringshare_init()) return --init; 139 if (!eina_init()) return --init;
140 if (!ecore_file_init()) return --init; 140 if (!ecore_file_init()) return --init;
141 141
142 efreet_desktop_cache = eina_hash_string_superfast_new(NULL); 142 efreet_desktop_cache = eina_hash_string_superfast_new(NULL);
@@ -167,7 +167,7 @@ efreet_desktop_shutdown(void)
167 167
168 if (--init) return init; 168 if (--init) return init;
169 ecore_file_shutdown(); 169 ecore_file_shutdown();
170 eina_stringshare_shutdown(); 170 eina_shutdown();
171 171
172 IF_RELEASE(desktop_environment); 172 IF_RELEASE(desktop_environment);
173 IF_FREE_HASH(efreet_desktop_cache); 173 IF_FREE_HASH(efreet_desktop_cache);
diff --git a/legacy/efreet/src/lib/efreet_ini.c b/legacy/efreet/src/lib/efreet_ini.c
index 98c224cdd4..21817e19ab 100644
--- a/legacy/efreet/src/lib/efreet_ini.c
+++ b/legacy/efreet/src/lib/efreet_ini.c
@@ -54,7 +54,7 @@ int
54efreet_ini_init(void) 54efreet_ini_init(void)
55{ 55{
56 if (init++) return init; 56 if (init++) return init;
57 if (!eina_stringshare_init()) return --init; 57 if (!eina_init()) return --init;
58 return init; 58 return init;
59} 59}
60 60
@@ -67,7 +67,7 @@ int
67efreet_ini_shutdown(void) 67efreet_ini_shutdown(void)
68{ 68{
69 if (--init) return init; 69 if (--init) return init;
70 eina_stringshare_shutdown(); 70 eina_shutdown();
71 return init; 71 return init;
72} 72}
73 73
diff --git a/legacy/efreet/src/lib/efreet_menu.c b/legacy/efreet/src/lib/efreet_menu.c
index 6c62b11569..adcd84b4e1 100644
--- a/legacy/efreet/src/lib/efreet_menu.c
+++ b/legacy/efreet/src/lib/efreet_menu.c
@@ -450,7 +450,7 @@ efreet_menu_init(void)
450 {NULL, NULL} 450 {NULL, NULL}
451 }; 451 };
452 452
453 if (!eina_stringshare_init()) return 0; 453 if (!eina_init()) return 0;
454 if (!efreet_xml_init()) return 0; 454 if (!efreet_xml_init()) return 0;
455 455
456 efreet_menu_handle_cbs = eina_hash_string_superfast_new(NULL); 456 efreet_menu_handle_cbs = eina_hash_string_superfast_new(NULL);
@@ -571,7 +571,7 @@ efreet_menu_shutdown(void)
571 IF_RELEASE(efreet_tag_menu); 571 IF_RELEASE(efreet_tag_menu);
572 572
573 efreet_xml_shutdown(); 573 efreet_xml_shutdown();
574 eina_stringshare_shutdown(); 574 eina_shutdown();
575} 575}
576 576
577/** 577/**
diff --git a/legacy/efreet/src/lib/efreet_xml.c b/legacy/efreet/src/lib/efreet_xml.c
index a70c0aeb1b..14501ecb88 100644
--- a/legacy/efreet/src/lib/efreet_xml.c
+++ b/legacy/efreet/src/lib/efreet_xml.c
@@ -47,7 +47,7 @@ int
47efreet_xml_init(void) 47efreet_xml_init(void)
48{ 48{
49 if (init++) return init; 49 if (init++) return init;
50 if (!eina_stringshare_init()) return --init; 50 if (!eina_init()) return --init;
51 return init; 51 return init;
52} 52}
53 53
@@ -60,7 +60,7 @@ int
60efreet_xml_shutdown(void) 60efreet_xml_shutdown(void)
61{ 61{
62 if (--init) return init; 62 if (--init) return init;
63 eina_stringshare_shutdown(); 63 eina_shutdown();
64 return init; 64 return init;
65} 65}
66 66
diff --git a/legacy/ethumb/src/bin/ethumbd.c b/legacy/ethumb/src/bin/ethumbd.c
index 03d5e3fd2a..731337a068 100644
--- a/legacy/ethumb/src/bin/ethumbd.c
+++ b/legacy/ethumb/src/bin/ethumbd.c
@@ -1761,7 +1761,7 @@ main(int argc, char *argv[])
1761 1761
1762 memset(&ed, 0, sizeof(ed)); 1762 memset(&ed, 0, sizeof(ed));
1763 ecore_init(); 1763 ecore_init();
1764 eina_stringshare_init(); 1764 eina_init();
1765 1765
1766 ethumb_init(); 1766 ethumb_init();
1767 1767
@@ -1830,7 +1830,7 @@ main(int argc, char *argv[])
1830 e_dbus_shutdown(); 1830 e_dbus_shutdown();
1831 finish: 1831 finish:
1832 ethumb_shutdown(); 1832 ethumb_shutdown();
1833 eina_stringshare_init(); 1833 eina_init();
1834 ecore_shutdown(); 1834 ecore_shutdown();
1835 return exit_value; 1835 return exit_value;
1836} 1836}
diff --git a/legacy/ethumb/src/lib/Ethumb.c b/legacy/ethumb/src/lib/Ethumb.c
index d8882a3e39..582511b5eb 100644
--- a/legacy/ethumb/src/lib/Ethumb.c
+++ b/legacy/ethumb/src/lib/Ethumb.c
@@ -140,23 +140,19 @@ ethumb_init(void)
140 if (initcount) 140 if (initcount)
141 return ++initcount; 141 return ++initcount;
142 142
143 if (!eina_log_init()) 143 if (!eina_init())
144 { 144 {
145 fprintf(stderr, "ERROR: Could not initialize log module.\n"); 145 fprintf(stderr, "ERROR: Could not initialize eina.\n");
146 return 0; 146 return 0;
147 } 147 }
148 _log_dom = eina_log_domain_register("ethumb", EINA_COLOR_GREEN); 148 _log_dom = eina_log_domain_register("ethumb", EINA_COLOR_GREEN);
149 if (_log_dom < 0) 149 if (_log_dom < 0)
150 { 150 {
151 EINA_LOG_ERR("Could not register log domain: ethumb"); 151 EINA_LOG_ERR("Could not register log domain: ethumb");
152 eina_log_shutdown(); 152 eina_shutdown();
153 return 0; 153 return 0;
154 } 154 }
155 155
156 eina_stringshare_init();
157 eina_list_init();
158 eina_hash_init();
159 eina_module_init();
160 evas_init(); 156 evas_init();
161 ecore_init(); 157 ecore_init();
162 ecore_evas_init(); 158 ecore_evas_init();
@@ -183,17 +179,13 @@ ethumb_shutdown(void)
183 eina_stringshare_del(_home_thumb_dir); 179 eina_stringshare_del(_home_thumb_dir);
184 eina_stringshare_del(_thumb_category_normal); 180 eina_stringshare_del(_thumb_category_normal);
185 eina_stringshare_del(_thumb_category_large); 181 eina_stringshare_del(_thumb_category_large);
186 eina_stringshare_shutdown();
187 eina_list_shutdown();
188 eina_hash_shutdown();
189 eina_module_shutdown();
190 evas_shutdown(); 182 evas_shutdown();
191 ecore_shutdown(); 183 ecore_shutdown();
192 ecore_evas_shutdown(); 184 ecore_evas_shutdown();
193 edje_shutdown(); 185 edje_shutdown();
194 eina_log_domain_unregister(_log_dom); 186 eina_log_domain_unregister(_log_dom);
195 _log_dom = -1; 187 _log_dom = -1;
196 eina_log_shutdown(); 188 eina_shutdown();
197 } 189 }
198 190
199 return initcount; 191 return initcount;
diff --git a/legacy/ethumb/src/lib/client/Ethumb_Client.c b/legacy/ethumb/src/lib/client/Ethumb_Client.c
index cd01c9c6c8..93fa8e77aa 100644
--- a/legacy/ethumb/src/lib/client/Ethumb_Client.c
+++ b/legacy/ethumb/src/lib/client/Ethumb_Client.c
@@ -400,7 +400,7 @@ ethumb_client_init(void)
400 if (_initcount) 400 if (_initcount)
401 return ++_initcount; 401 return ++_initcount;
402 402
403 if (!eina_log_init()) 403 if (!eina_init())
404 { 404 {
405 fprintf(stderr, "ERROR: Could not initialize log module.\n"); 405 fprintf(stderr, "ERROR: Could not initialize log module.\n");
406 return 0; 406 return 0;
@@ -409,7 +409,7 @@ ethumb_client_init(void)
409 if (_log_dom < 0) 409 if (_log_dom < 0)
410 { 410 {
411 EINA_LOG_ERR("Could not register log domain: ethumb_client"); 411 EINA_LOG_ERR("Could not register log domain: ethumb_client");
412 eina_log_shutdown(); 412 eina_shutdown();
413 return 0; 413 return 0;
414 } 414 }
415 415
@@ -430,7 +430,7 @@ ethumb_client_shutdown(void)
430 ethumb_shutdown(); 430 ethumb_shutdown();
431 eina_log_domain_unregister(_log_dom); 431 eina_log_domain_unregister(_log_dom);
432 _log_dom = -1; 432 _log_dom = -1;
433 eina_log_shutdown(); 433 eina_shutdown();
434 return _initcount; 434 return _initcount;
435} 435}
436 436