From 3c82397d3fdbbaa8d1614a6f5eeeaad4ef20d3f6 Mon Sep 17 00:00:00 2001
From: Scott Balneaves <sbalneav@alburg.net>
Date: Tue, 20 Nov 2012 22:50:33 -0600
Subject: Fix deprecations and compile warnings.  Clean compile

---
 src/core/main.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/core/main.c')

diff --git a/src/core/main.c b/src/core/main.c
index 90332c50..5f8d9b32 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -69,6 +69,12 @@
 #include <time.h>
 #include <unistd.h>
 
+#ifdef __GNUC__
+#define UNUSED_VARIABLE __attribute__ ((unused))
+#else
+#define UNUSED_VARIABLE
+#endif
+
 /**
  * The exit code we'll return to our parent process when we eventually die.
  */
@@ -376,7 +382,7 @@ sigterm_handler (int signum)
 {
   if (sigterm_pipe_fds[1] >= 0)
     {
-      int dummy;
+      int UNUSED_VARIABLE dummy;
 
       dummy = write (sigterm_pipe_fds[1], "", 1);
       close (sigterm_pipe_fds[1]);
@@ -415,8 +421,12 @@ main (int argc, char **argv)
   guint i;
   GIOChannel *channel;
 
+#if GLIB_CHECK_VERSION (2, 32, 0)
+  /* g_thread_init () deprecated */
+#else
   if (!g_thread_supported ())
     g_thread_init (NULL);
+#endif
   
   if (setlocale (LC_ALL, "") == NULL)
     meta_warning ("Locale not understood by C library, internationalization will not work\n");
-- 
cgit v1.2.1