From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 12 Jul 2011 16:47:56 +0000 (-0700)
Subject: * xsettings.c (store_monospaced_changed): Define only if used.
X-Git-Tag: emacs-pretest-24.0.90~104^2~347^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=490011a6cc38e11c81697c8f5e7353dcd3d81187;p=emacs.git

* xsettings.c (store_monospaced_changed): Define only if used.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e964e06894d..a52f71bbf7b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,9 @@
 
 	Fix recently-introduced minor problems.
 	* term.c (init_tty): Remove unused local.
+	* xsettings.c (store_monospaced_changed): Define this function only
+	if (defined HAVE_GSETTINGS || define defined HAVE_GCONF), as it's
+	not used otherwise.
 
 2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/src/xsettings.c b/src/xsettings.c
index 06718df5a3c..dadbe68b4cb 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -83,7 +83,7 @@ dpyinfo_valid (struct x_display_info *dpyinfo)
 
 /* Store a monospace font change event if the monospaced font changed.  */
 
-#ifdef HAVE_XFT
+#if defined HAVE_XFT && (defined HAVE_GSETTINGS || defined HAVE_GCONF)
 static void
 store_monospaced_changed (const char *newfont)
 {
@@ -99,9 +99,11 @@ store_monospaced_changed (const char *newfont)
                                   XCAR (first_dpyinfo->name_list_element));
     }
 }
+#endif
 
 /* Store a font name change event if the font name changed.  */
 
+#ifdef HAVE_XFT
 static void
 store_font_name_changed (const char *newfont)
 {
@@ -252,7 +254,7 @@ something_changed_gsettingsCB (GSettings *settings,
           g_variant_unref (val);
         }
     }
-#endif /* HAVE_XFT */  
+#endif /* HAVE_XFT */
 }
 
 #endif /* HAVE_GSETTINGS */
@@ -441,14 +443,14 @@ parse_settings (unsigned char *prop,
       bytes_parsed += 4; /* Skip serial for this value */
       if (bytes_parsed > bytes) return BadLength;
 
-      want_this = 
+      want_this =
 #ifdef HAVE_XFT
         (nlen > 6 && strncmp (name, "Xft/", 4) == 0)
         || strcmp (XSETTINGS_FONT_NAME, name) == 0
         ||
 #endif
         strcmp (XSETTINGS_TOOL_BAR_STYLE, name) == 0;
-  
+
       switch (type)
         {
         case 0: /* Integer */