summaryrefslogtreecommitdiff
path: root/legacy/ethumb/src
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 /legacy/ethumb/src
parente4af7c100c4fdd0fd51af8d5d1c5948223b95a19 (diff)
Update to match new EINA init/shutdown.
SVN revision: 42301
Diffstat (limited to '')
-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
3 files changed, 9 insertions, 17 deletions
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