merge of '8d4a6a5079f527163a931e0d44167e885b70aeba'

Mon, 03 Sep 2007 02:19:23 +0000

author
Ka-Hing Cheung <khc@pidgin.im>
date
Mon, 03 Sep 2007 02:19:23 +0000
changeset 19758
918f648d70b6
parent 19757
8d4a6a5079f5 (current diff)
parent 19756
a08e37c82656 (diff)
child 19759
17932f81738f
child 19760
4cb74c61d57a

merge of '8d4a6a5079f527163a931e0d44167e885b70aeba'
and 'a08e37c8265698530a1940c0318414a24fbaeeb3'

--- 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

mercurial