From accd246c72f56698b428efc5ad3348ead20614e6 Mon Sep 17 00:00:00 2001
From: Sebastian Dransfeld <sd@tango.flipp.net>
Date: Sat, 5 Feb 2011 19:06:55 +0000
Subject: [PATCH] Set EFREET_MODULE_LOG_DOM to -1 after unregister

SVN revision: 56731
---
 legacy/efreet/ChangeLog                | 1 +
 legacy/efreet/src/lib/efreet_base.c    | 1 +
 legacy/efreet/src/lib/efreet_cache.c   | 1 +
 legacy/efreet/src/lib/efreet_desktop.c | 1 +
 legacy/efreet/src/lib/efreet_icon.c    | 1 +
 legacy/efreet/src/lib/efreet_ini.c     | 1 +
 legacy/efreet/src/lib/efreet_menu.c    | 2 ++
 legacy/efreet/src/lib/efreet_mime.c    | 2 ++
 legacy/efreet/src/lib/efreet_private.h | 1 +
 legacy/efreet/src/lib/efreet_trash.c   | 1 +
 legacy/efreet/src/lib/efreet_utils.c   | 1 +
 legacy/efreet/src/lib/efreet_xml.c     | 1 +
 12 files changed, 14 insertions(+)

diff --git a/legacy/efreet/ChangeLog b/legacy/efreet/ChangeLog
index c09b6db853..91b27800d8 100644
--- a/legacy/efreet/ChangeLog
+++ b/legacy/efreet/ChangeLog
@@ -36,3 +36,4 @@
           before including efreet_private.h
         * Remove efreet_xml_{init,shutdown}() from efreet_menu.c, it is done
           in efreet_init()
+        * Set EFREET_MODULE_LOG_DOM variable to -1 after unregister
diff --git a/legacy/efreet/src/lib/efreet_base.c b/legacy/efreet/src/lib/efreet_base.c
index 479501f781..d3cef6f9a3 100644
--- a/legacy/efreet/src/lib/efreet_base.c
+++ b/legacy/efreet/src/lib/efreet_base.c
@@ -90,6 +90,7 @@ efreet_base_shutdown(void)
     IF_RELEASE(hostname);
 
     eina_log_domain_unregister(_efreet_base_log_dom);
+    _efreet_base_log_dom = -1;
 }
 
 /**
diff --git a/legacy/efreet/src/lib/efreet_cache.c b/legacy/efreet/src/lib/efreet_cache.c
index 86121463d0..784d6e2edb 100644
--- a/legacy/efreet/src/lib/efreet_cache.c
+++ b/legacy/efreet/src/lib/efreet_cache.c
@@ -185,6 +185,7 @@ efreet_cache_shutdown(void)
     }
 
     eina_log_domain_unregister(_efreet_cache_log_dom);
+    _efreet_cache_log_dom = -1;
 }
 
 /*
diff --git a/legacy/efreet/src/lib/efreet_desktop.c b/legacy/efreet/src/lib/efreet_desktop.c
index 105000a7a0..486a3b56ae 100644
--- a/legacy/efreet/src/lib/efreet_desktop.c
+++ b/legacy/efreet/src/lib/efreet_desktop.c
@@ -177,6 +177,7 @@ efreet_desktop_shutdown(void)
     evil_sockets_shutdown();
 #endif
     eina_log_domain_unregister(_efreet_desktop_log_dom);
+    _efreet_desktop_log_dom = -1;
 }
 
 /**
diff --git a/legacy/efreet/src/lib/efreet_icon.c b/legacy/efreet/src/lib/efreet_icon.c
index 37e37e4db4..cf5c4adc8c 100644
--- a/legacy/efreet/src/lib/efreet_icon.c
+++ b/legacy/efreet/src/lib/efreet_icon.c
@@ -121,6 +121,7 @@ efreet_icon_shutdown(void)
     efreet_extra_icon_dirs = eina_list_free(efreet_extra_icon_dirs);
 
     eina_log_domain_unregister(_efreet_icon_log_dom);
+    _efreet_icon_log_dom = -1;
     IF_FREE_HASH(change_monitors);
 }
 
diff --git a/legacy/efreet/src/lib/efreet_ini.c b/legacy/efreet/src/lib/efreet_ini.c
index 5ceb4a2587..5d72983d3f 100644
--- a/legacy/efreet/src/lib/efreet_ini.c
+++ b/legacy/efreet/src/lib/efreet_ini.c
@@ -71,6 +71,7 @@ void
 efreet_ini_shutdown(void)
 {
     eina_log_domain_unregister(_efreet_ini_log_dom);
+    _efreet_ini_log_dom = -1;
 }
 
 /**
diff --git a/legacy/efreet/src/lib/efreet_menu.c b/legacy/efreet/src/lib/efreet_menu.c
index 612dfb8356..db88753f54 100644
--- a/legacy/efreet/src/lib/efreet_menu.c
+++ b/legacy/efreet/src/lib/efreet_menu.c
@@ -487,6 +487,7 @@ efreet_menu_init(void)
             || !efreet_menu_move_cbs || !efreet_menu_layout_cbs)
     {
         eina_log_domain_unregister(_efreet_menu_log_dom);
+        _efreet_menu_log_dom = -1;
         return 0;
     }
 
@@ -600,6 +601,7 @@ efreet_menu_shutdown(void)
 
     efreet_xml_shutdown();
     eina_log_domain_unregister(_efreet_menu_log_dom);
+    _efreet_menu_log_dom = -1;
 }
 
 /**
diff --git a/legacy/efreet/src/lib/efreet_mime.c b/legacy/efreet/src/lib/efreet_mime.c
index 3220dfe17f..c597d4ad08 100644
--- a/legacy/efreet/src/lib/efreet_mime.c
+++ b/legacy/efreet/src/lib/efreet_mime.c
@@ -241,6 +241,7 @@ efreet_mime_init(void)
 
 unregister_log_domain:
     eina_log_domain_unregister(_efreet_mime_log_dom);
+    _efreet_mime_log_dom = -1;
 shutdown_efreet:
     efreet_shutdown();
 shutdown_ecore_file:
@@ -280,6 +281,7 @@ efreet_mime_shutdown(void)
     IF_FREE_HASH(wild);
     IF_FREE_HASH(mime_icons);
     eina_log_domain_unregister(_efreet_mime_log_dom);
+    _efreet_mime_log_dom = -1;
     efreet_shutdown();
     ecore_file_shutdown();
     ecore_shutdown();
diff --git a/legacy/efreet/src/lib/efreet_private.h b/legacy/efreet/src/lib/efreet_private.h
index e8ff688ab8..7007ea9523 100644
--- a/legacy/efreet/src/lib/efreet_private.h
+++ b/legacy/efreet/src/lib/efreet_private.h
@@ -113,6 +113,7 @@
 #endif
 #define WRN(...) EINA_LOG_DOM_WARN(EFREET_MODULE_LOG_DOM, __VA_ARGS__)
 
+/* TODO: Move these to cache, make static and add accessor */
 extern Eina_Hash *efreet_desktop_cache;
 extern Eina_Hash *efreet_icon_themes;
 
diff --git a/legacy/efreet/src/lib/efreet_trash.c b/legacy/efreet/src/lib/efreet_trash.c
index 76eb524610..1cd20b5842 100644
--- a/legacy/efreet/src/lib/efreet_trash.c
+++ b/legacy/efreet/src/lib/efreet_trash.c
@@ -64,6 +64,7 @@ efreet_trash_shutdown(void)
 
     IF_RELEASE(efreet_trash_dir);
     eina_log_domain_unregister(_efreet_trash_log_dom);
+    _efreet_trash_log_dom = -1;
     eina_shutdown();
 
     return _efreet_trash_init_count;
diff --git a/legacy/efreet/src/lib/efreet_utils.c b/legacy/efreet/src/lib/efreet_utils.c
index 4ef08d457f..4c110aef5e 100644
--- a/legacy/efreet/src/lib/efreet_utils.c
+++ b/legacy/efreet/src/lib/efreet_utils.c
@@ -90,6 +90,7 @@ efreet_util_shutdown(void)
     if (--init) return init;
 
     eina_log_domain_unregister(_efreet_utils_log_dom);
+    _efreet_utils_log_dom = -1;
     IF_FREE_HASH(file_id_by_desktop_path);
 
     IF_RELEASE(cache_names_key);
diff --git a/legacy/efreet/src/lib/efreet_xml.c b/legacy/efreet/src/lib/efreet_xml.c
index ca970ffdfc..517c7df79e 100644
--- a/legacy/efreet/src/lib/efreet_xml.c
+++ b/legacy/efreet/src/lib/efreet_xml.c
@@ -73,6 +73,7 @@ efreet_xml_shutdown(void)
     _efreet_xml_init_count--;
     if (_efreet_xml_init_count > 0) return;
     eina_log_domain_unregister(_efreet_xml_log_dom);
+    _efreet_xml_log_dom = -1;
 }
 
 /**