From dda4ae6621404cfc4b278039bb200b4b0409ce40 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sat, 14 May 2005 23:55:20 +0000
Subject: [PATCH] configure.ac: Set G_LOG_DOMAIN in config.h to a string
 literal.

Original commit message from CVS:
* configure.ac: Set G_LOG_DOMAIN in config.h to a string literal.
We should have done this all along.  Fixes #301646
* gst/Makefile.am:
* gst/gst.c: (init_post):
* gst/gst_private.h:
* gst/parse/grammar.y:
---
 ChangeLog           | 9 +++++++++
 configure.ac        | 1 +
 gst/Makefile.am     | 1 -
 gst/gst.c           | 4 +---
 gst/gst_private.h   | 4 ----
 gst/parse/grammar.y | 3 ++-
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b5705b3466..a301a53f05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-05-14  David Schleef  <ds@schleef.org>
+
+	* configure.ac: Set G_LOG_DOMAIN in config.h to a string literal.
+	We should have done this all along.  Fixes #301646
+	* gst/Makefile.am:
+	* gst/gst.c: (init_post):
+	* gst/gst_private.h:
+	* gst/parse/grammar.y:
+
 2005-05-03  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 177e2e06a1..c2a2e4ccbd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -514,6 +514,7 @@ dnl ############################
 
 dnl set license and copyright notice
 AC_DEFINE(GST_LICENSE, "LGPL", [GStreamer license])
+AC_DEFINE(G_LOG_DOMAIN, "GStreamer", [Glib log domain])
 
 dnl package name in plugins
 AC_ARG_WITH(package-name,
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 474636000a..428aafe856 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -142,7 +142,6 @@ DISTCLEANFILES = $(built_header_configure)
 libgstreamer_@GST_MAJORMINOR@_la_CFLAGS =	\
 	-D_GNU_SOURCE				\
 	$(GST_LIB_CFLAGS) 			\
-	-DG_LOG_DOMAIN=g_log_domain_gstreamer 	\
 	-DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\" 
 libgstreamer_@GST_MAJORMINOR@_la_LIBADD = \
 	$(GST_LIB_LIBS) $(GST_PARSE_LIBADD) $(GST_REGISTRY_LIBADD)
diff --git a/gst/gst.c b/gst/gst.c
index 216e55c5f4..c467016050 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -67,8 +67,6 @@ static gboolean init_post (void);
 
 static GSList *preload_plugins = NULL;
 
-const gchar *g_log_domain_gstreamer = "GStreamer";
-
 static void
 debug_log_handler (const gchar * log_domain,
     GLogLevelFlags log_level, const gchar * message, gpointer user_data)
@@ -576,7 +574,7 @@ init_post (void)
 #endif /* GST_DISABLE_TRACE */
 
   llf = G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL;
-  g_log_set_handler (g_log_domain_gstreamer, llf, debug_log_handler, NULL);
+  g_log_set_handler (G_LOG_DOMAIN, llf, debug_log_handler, NULL);
 
   _gst_format_initialize ();
   _gst_query_type_initialize ();
diff --git a/gst/gst_private.h b/gst/gst_private.h
index 0d17db66f6..99f04ba036 100644
--- a/gst/gst_private.h
+++ b/gst/gst_private.h
@@ -28,10 +28,6 @@
 #  include "config.h"
 #endif
 
-/* This needs to be before glib.h, since it might be used in inline
- * functions */
-extern const char             *g_log_domain_gstreamer;
-
 #include <glib.h>
 
 #include <stdlib.h>
diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
index c425d2de8f..ec28c73e7f 100644
--- a/gst/parse/grammar.y
+++ b/gst/parse/grammar.y
@@ -1,11 +1,12 @@
 %{
+#include "../gst_private.h"
+
 #include <glib-object.h>
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include "../gst_private.h"
 #include "../gst-i18n-lib.h"
 
 #include "../gstconfig.h"