Mercurial > pidgin.yaz
changeset 20006:6055127a45c2
merge of 'da40aebad3ad2fda4c989c859927ab42a0825de5'
and 'fbc07e99f1991cd6c40bf5fdeb87c24bda12d189'
author | Sadrul Habib Chowdhury <imadil@gmail.com> |
---|---|
date | Fri, 14 Sep 2007 03:44:03 +0000 |
parents | 29782ecb4c3e (current diff) 1868e301b44d (diff) |
children | dc2b7de9d01d 65e12a6f00ca |
files | |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 <<a href=\"mailto:%s\">%s</a>><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);