changeset 28523:9832ae3b94fd

merge of 'ac8595402f07bcd2e5467756aa6ccf6d9daf907a' and 'cea0a94190c6ddf69977976b807b9bc5aa880987'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Fri, 06 Nov 2009 21:28:04 +0000
parents 2302022ff8f1 (diff) 546dcce6f780 (current diff)
children 6126436715e8
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkmain.c	Fri Nov 06 18:12:01 2009 +0000
+++ b/pidgin/gtkmain.c	Fri Nov 06 21:28:04 2009 +0000
@@ -541,9 +541,9 @@
 	GIOStatus signal_status;
 #ifndef DEBUG
 	char *segfault_message_tmp;
+#endif
 	GError *error = NULL;
 #endif
-#endif
 	int opt;
 	gboolean gui_check;
 	gboolean debug_enabled;