gui: Suppress compiler warning for call to deprecated g_thread_init().

[pspp] / src / ui / gui / main.c

diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c
index eb44e813b6a78b8016bfa6d55a1094102cd89f3a..28f99a9ff73b6ffbf84d340c30892b6a1bb10fc7 100644 (file)
--- a/src/ui/gui/main.c
+++ b/src/ui/gui/main.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012  Free Software Foundation
+   Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012, 2013, 2014  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -88,7 +88,7 @@ usage (void)
   gtk_help = gtk_help != NULL ? gtk_help + 2 : gtk_help_base;
 
   printf (_("\
-PSPPIRE, a GUI for PSPP, a program for statistical analysis of sample data.\n\
+PSPPIRE, a GUI for PSPP, a program for statistical analysis of sampled data.\n\
 Usage: %s [OPTION]... FILE\n\
 \n\
 Arguments to long options also apply to equivalent short options.\n\
@@ -113,8 +113,8 @@ Informative output:\n\
   -h, --help                display this help and exit\n\
   -V, --version             output version information and exit\n\
 \n\
-A non-option argument is interpreted as a .sav file, a .por file or a syntax\n\
-file to load.\n"),
+A non-option argument is interpreted as a data file in .sav or .zsav or .por\n\
+format or a syntax file to load.\n"),
           program_name, gtk_help, inc_path);
 
   free (inc_path);
@@ -287,7 +287,12 @@ main (int argc, char *argv[])
   set_program_name (argv[0]);
 
   g_mem_set_vtable (&vtable);
+
+#if !GLIB_CHECK_VERSION(2,32,0)
+  /* g_thread_init() was required before glib 2.32, but it is deprecated since
+     then and calling it yields a compile-time warning. */
   g_thread_init (NULL);
+#endif
 
   gtk_disable_setlocale ();