Mercurial > pidgin.yaz
changeset 19666:01ad48d825bd
merge of '0cf1ba2d257fe2551fe7a238c1888c4de36a402e'
and '3c2d40b6a39f301d66804ea067d070c055bffa81'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Thu, 06 Sep 2007 07:50:42 +0000 |
| parents | 9600414aca2e (diff) 37429bc82307 (current diff) |
| children | a2f5a28ba983 |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Thu Sep 06 07:47:30 2007 +0000 +++ b/COPYRIGHT Thu Sep 06 07:50:42 2007 +0000 @@ -338,7 +338,6 @@ Michael Shkutkov Ettore Simone John Silvestri -Ankit Singla Craig Slusher Alex Smith Brad Smith
--- a/libpurple/protocols/bonjour/bonjour.c Thu Sep 06 07:47:30 2007 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Thu Sep 06 07:50:42 2007 +0000 @@ -592,8 +592,8 @@ fullname = info->pw_gecos; else if ((info != NULL) && (info->pw_name != NULL) && (info->pw_name[0] != '\0')) fullname = info->pw_name; - else if (((fullname = getlogin()) != NULL) && (fullname[0] != '\0')) - ; + else if (((fullname = getlogin()) != NULL) && (fullname[0] == '\0')) + fullname = NULL; #else /* The Win32 username lookup functions are synchronous so we do it in a thread */ g_thread_create(_win32_name_lookup_thread, NULL, FALSE, NULL);
--- a/pidgin/gtkimhtml.c Thu Sep 06 07:47:30 2007 +0000 +++ b/pidgin/gtkimhtml.c Thu Sep 06 07:50:42 2007 +0000 @@ -4890,7 +4890,7 @@ } else if (c == '"') { str = g_string_append(str, """); } else if (c == '\n') { - str = g_string_append(str, "<br>\n"); + str = g_string_append(str, "<br>"); } else { str = g_string_append_unichar(str, c); }