# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1189741443 0
# Node ID 6055127a45c2c5905ddcba8a3f25e0e690187f26
# Parent  29782ecb4c3e3d4d77b5f66ecabdc6d94be5eec6# Parent  1868e301b44d0a68532a72d24a6fd362c15d6b61
merge of 'da40aebad3ad2fda4c989c859927ab42a0825de5'
     and 'fbc07e99f1991cd6c40bf5fdeb87c24bda12d189'

diff -r 29782ecb4c3e -r 6055127a45c2 finch/libgnt/Makefile.am
--- a/finch/libgnt/Makefile.am	Fri Sep 14 03:15:25 2007 +0000
+++ b/finch/libgnt/Makefile.am	Fri Sep 14 03:44:03 2007 +0000
@@ -1,4 +1,4 @@
-EXTRA_DIST=genmarshal
+EXTRA_DIST=genmarshal pygnt
 
 SUBDIRS = . wms
 pkgconfigdir = $(libdir)/pkgconfig
diff -r 29782ecb4c3e -r 6055127a45c2 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Fri Sep 14 03:15:25 2007 +0000
+++ b/pidgin/gtkdialogs.c	Fri Sep 14 03:44:03 2007 +0000
@@ -456,7 +456,7 @@
 		if (retired_patch_writers[i].email != NULL) {
 			g_string_append_printf(str, "  %s &lt;<a href=\"mailto:%s\">%s</a>&gt;<br/>",
 					retired_patch_writers[i].name,
-					retired_patch_writers[i].email, patch_writers[i].email);
+					retired_patch_writers[i].email, retired_patch_writers[i].email);
 		} else {
 			g_string_append_printf(str, "  %s<br/>",
 					retired_patch_writers[i].name);