# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1141706568 0
# Node ID e3717f0d24ad09e0d51db59bd7c1dc713a2649fd
# Parent  47e51939c923b360f3749609af813a4f0e4a7966
[gaim-migrate @ 15802]
#ifdef HAVE_SIGNAL_H instead of #if HAVE_SIGNAL_H to suppress warnings

committer: Tailor Script <tailor@pidgin.im>

diff -r 47e51939c923 -r e3717f0d24ad src/gtkmain.c
--- a/src/gtkmain.c	Tue Mar 07 04:40:16 2006 +0000
+++ b/src/gtkmain.c	Tue Mar 07 04:42:48 2006 +0000
@@ -65,7 +65,7 @@
 #include "gtkstock.h"
 #include "gtkwhiteboard.h"
 
-#if HAVE_SIGNAL_H
+#ifdef HAVE_SIGNAL_H
 # include <signal.h>
 #endif
 
@@ -88,7 +88,7 @@
 static SnDisplay *sn_display = NULL;
 #endif
 
-#if HAVE_SIGNAL_H
+#ifdef HAVE_SIGNAL_H
 /*
  * Lists of signals we wish to catch and those we wish to ignore.
  * Each list terminated with -1
@@ -142,7 +142,7 @@
 	return ret;
 }
 
-#if HAVE_SIGNAL_H
+#ifdef HAVE_SIGNAL_H
 static void
 clean_pid(void)
 {
@@ -433,7 +433,7 @@
 	char *opt_session_arg = NULL;
 	int dologin_ret = -1;
 	char *search_path;
-#if HAVE_SIGNAL_H
+#ifdef HAVE_SIGNAL_H
 	int sig_indx;	/* for setting up signal catching */
 	sigset_t sigset;
 	RETSIGTYPE (*prev_sig_disp)(int);
@@ -441,7 +441,7 @@
 	int opt;
 	gboolean gui_check;
 	gboolean debug_enabled;
-#if HAVE_SIGNAL_H
+#ifdef HAVE_SIGNAL_H
 	char errmsg[BUFSIZ];
 #ifndef DEBUG
 	char *segfault_message_tmp;
@@ -485,7 +485,7 @@
 	setlocale(LC_ALL, "");
 #endif
 
-#if HAVE_SIGNAL_H
+#ifdef HAVE_SIGNAL_H
 
 #ifndef DEBUG
 		/* We translate this here in case the crash breaks gettext. */
@@ -688,8 +688,8 @@
 	gaim_blist_load();
 
 	/* TODO: Move prefs loading into gaim_prefs_init() */
-	gaim_prefs_load();
-	gaim_prefs_update_old();
+	/*gaim_prefs_load();*/
+	/*gaim_prefs_update_old();*/
 	gaim_gtk_prefs_update_old();
 
 	/* load plugins we had when we quit */
@@ -764,7 +764,7 @@
 
 	gtk_main();
 
-#if HAVE_SIGNAL_H
+#ifdef HAVE_SIGNAL_H
 	g_free(segfault_message);
 #endif