From: Jan D <jan.h.d@swipnet.se>
Date: Sun, 14 Nov 2010 11:47:31 +0000 (+0100)
Subject: Fix link error on Fedora 14: newer GConf don't use g_type_*.
X-Git-Tag: emacs-pretest-23.2.91~49^2~28
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=37de8fd0e492920b8f3771177a84bb6ec403d374;p=emacs.git

Fix link error on Fedora 14: newer GConf don't use g_type_*.

Forgot to save ChangeLog for previous change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 814062497bd..6268dcf33ae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xsettings.c (init_gconf): Check HAVE_G_TYPE_INIT.
+
+	* config.in (HAVE_G_TYPE_INIT): New symbol.
+
 2010-11-12  Eli Zaretskii  <eliz@gnu.org>
 
 	* lread.c (Fload): Mention `load-in-progress' and