# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1188785963 0
# Node ID d4fb44035799b521494cbe4be11a60674a9ee556
# Parent  1cba50791c36f0b39bc9895aa06f555e1753cfa7# Parent  4e147af6a033fdce48ee7403c8a4db009a43bc1f
merge of '1bc4d7f1a38917e6d2bf837a660f5f498a29ea0c'
     and 'dd0060c3e748fd6d877ca32879c785c9bdb434fc'

diff -r 1cba50791c36 -r d4fb44035799 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Mon Sep 03 02:19:10 2007 +0000
+++ b/pidgin/gtkmain.c	Mon Sep 03 02:19:23 2007 +0000
@@ -86,8 +86,6 @@
 static SnDisplay *sn_display = NULL;
 #endif
 
-#include "/home/khc/Code/scratch/memory_profile.c"
-
 #ifdef HAVE_SIGNAL_H
 
 /*
@@ -102,7 +100,6 @@
 	SIGQUIT,
 	SIGCHLD,
 	SIGALRM,
-	SIGUSR2,
 	-1
 };
 
@@ -218,9 +215,6 @@
 	case SIGALRM:
 		clean_pid();
 		break;
-	case SIGUSR2:
-		mp_tally();
-		break;
 	default:
 		purple_debug_warning("sighandler", "Caught signal %d\n", sig);
 		purple_connections_disconnect_all();
@@ -490,9 +484,6 @@
 		{0, 0, 0, 0}
 	};
 
-	//g_mem_set_vtable(&memhook);
-	//mp_init();
-
 #ifdef DEBUG
 	debug_enabled = TRUE;
 #else