Set G_LOG_DOMAIN to \"GModule\" instead of g_log_domain_gmodule.

2001-03-07  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* Makefile.am, makefile.mingw.in, makefile.msc.in: Set
	G_LOG_DOMAIN to \"GModule\" instead of g_log_domain_gmodule.

	* gmodule.def, gmodule.h, gmodule.c: Removed g_log_domain_gmodule.

	* docs/reference/glib/glib-sections.txt,
	docs/reference/glib/tmpl/messages.sgml: Removed	g_log_domain_gmodule.

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index fd3aad85aca95f0cd3fac6ef61cdc3d8449a247a..98dad9239f2897467f7df84b162e1640afce55c8 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-07  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/glib-sections.txt, glib/tmpl/messages.sgml: Removed
+       g_log_domain_gmodule.
+
 2001-02-23  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * glib/tmpl/threads.sgml: Big update. Almost ready.

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index a7b6948ada077f7ad5499af83fef68c0d9140c72..c2bbb37691d8eedfbaaece65aea90ce1cd3aa915 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -693,7 +693,6 @@ G_BREAKPOINT
 <FILE>messages</FILE>
 G_LOG_DOMAIN
 g_log_domain_glib
-g_log_domain_gmodule
 G_LOG_FATAL_MASK
 G_LOG_LEVEL_USER_SHIFT
 GLogFunc

diff --git a/docs/reference/glib/tmpl/messages.sgml b/docs/reference/glib/tmpl/messages.sgml
index 13edc578e5b50f6b3b77921acf81e28b8dd5ac94..2b19d61e6a0149b8d7a428b4ba2a89df2021ed52 100644 (file)
--- a/docs/reference/glib/tmpl/messages.sgml
+++ b/docs/reference/glib/tmpl/messages.sgml
@@ -44,12 +44,6 @@ INCLUDES = \
 </para>
 
 
-<!-- ##### VARIABLE g_log_domain_gmodule ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### MACRO G_LOG_FATAL_MASK ##### -->
 <para>
 GLib log levels that are considered fatal by default.

diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index 2e8192087dd9e670cc77512385af48d7633cf3f3..ad2b3259d3386863301b059891f7662bb1d1d50e 100644 (file)
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-07  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * Makefile.am, makefile.mingw.in, makefile.msc.in: Set
+       G_LOG_DOMAIN to \"GModule\" instead of g_log_domain_gmodule.
+
+       * gmodule.def, gmodule.h, gmodule.c: Removed g_log_domain_gmodule.
+
 2001-02-17  Havoc Pennington  <hp@pobox.com>
 
         Applied patch from Soeren Sandmann:

diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 497d4c603ed70af8b94250658a6e875cb840074b..7bac888a169624d5cbc7f6f8e99c3b3d1fbc706b 100644 (file)
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule \
-       -DG_LOG_DOMAIN=g_log_domain_gmodule @GLIB_DEBUG_FLAGS@
+       -DG_LOG_DOMAIN=\"GModule\" @GLIB_DEBUG_FLAGS@
 
 EXTRA_DIST =   \
                makefile.mingw.in \

diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index 29848a369daa1806a4bca843b7cb63cc3c8660d7..b735fea4fd40bc3ffad95631f1deda3a3dd8f2cf 100644 (file)
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -82,7 +82,6 @@ static inline GModule*        g_module_find_by_name   (const gchar    *name);
 
 
 /* --- variables --- */
-const char           *g_log_domain_gmodule = "GModule";
 static GModule      *modules = NULL;
 static GModule      *main_module = NULL;
 static GStaticPrivate module_error_private = G_STATIC_PRIVATE_INIT;

diff --git a/gmodule/gmodule.def b/gmodule/gmodule.def
index 5af8869ffa99a7ec0e13d538a715b7f099b8d64a..11e0d5da39a1ded760dee9c5bb811d35636d33d1 100644 (file)
--- a/gmodule/gmodule.def
+++ b/gmodule/gmodule.def
@@ -1,5 +1,4 @@
 EXPORTS
-       g_log_domain_gmodule
        g_module_build_path
        g_module_close
        g_module_error

diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h
index 18d0353abbc37ca854a11a5ac021fc201ed1d86d..39d00d71b38fd9eac3b6744dd51875ea22a9975b 100644 (file)
--- a/gmodule/gmodule.h
+++ b/gmodule/gmodule.h
@@ -27,7 +27,6 @@
 #ifndef __GMODULE_H__
 #define __GMODULE_H__
 
-extern const char      *g_log_domain_gmodule;
 #include <glib.h>
 
 #ifdef __cplusplus

diff --git a/gmodule/makefile.mingw.in b/gmodule/makefile.mingw.in
index 5ce374f1bee2feb3977ca68cdf940a5d17b46661..c21511f7ed1575b65e9a77113847c1c0bbdf91da 100644 (file)
--- a/gmodule/makefile.mingw.in
+++ b/gmodule/makefile.mingw.in
@@ -15,7 +15,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 # Nothing much configurable below
 
 INCLUDES = -I .. -I .
-DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=g_log_domain_gmodule -DG_ENABLE_DEBUG
+DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" -DG_ENABLE_DEBUG
 
 BUILD_DLL = ../build-dll
 

diff --git a/gmodule/makefile.msc.in b/gmodule/makefile.msc.in
index ebc9d4dae8642b4afdfccb9ec5c6dc75845a8941..47b3c0e6f6a3ea860be363dce46ca40cfc358b65 100644 (file)
--- a/gmodule/makefile.msc.in
+++ b/gmodule/makefile.msc.in
@@ -13,7 +13,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 # Nothing much configurable below
 
 INCLUDES = -I .. -I .
-DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=g_log_domain_gmodule -DG_ENABLE_DEBUG
+DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" -DG_ENABLE_DEBUG
 
 all : \
        gmoduleconf.h \