Mercurial > pidgin.yaz
changeset 16924:240690ebd868
merge of '423a721fddd927f3df88692418420a12e6ff3e14'
and 'a3b182f786583648c5772f15ceff81af594efef0'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sat, 05 May 2007 22:31:32 +0000 |
| parents | 968941822155 (diff) 1dd4480dd80c (current diff) |
| children | fdc345732a3d |
| files | |
| diffstat | 4 files changed, 19 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/dnssrv.c Sat May 05 22:30:19 2007 +0000 +++ b/libpurple/dnssrv.c Sat May 05 22:31:32 2007 +0000 @@ -192,11 +192,19 @@ PurpleSrvCallback cb = query_data->cb; int status; - read(source, &size, sizeof(int)); - purple_debug_info("dnssrv","found %d SRV entries\n", size); - tmp = res = g_new0(PurpleSrvResponse, size); - for (i = 0; i < size; i++) { - read(source, tmp++, sizeof(PurpleSrvResponse)); + if (read(source, &size, sizeof(int)) > 0) + { + purple_debug_info("dnssrv","found %d SRV entries\n", size); + tmp = res = g_new0(PurpleSrvResponse, size); + for (i = 0; i < size; i++) { + read(source, tmp++, sizeof(PurpleSrvResponse)); + } + } + else + { + purple_debug_info("dnssrv","found 0 SRV entries; errno is %i\n", errno); + size = 0; + res = NULL; } cb(res, size, query_data->extradata);
--- a/libpurple/internal.h Sat May 05 22:30:19 2007 +0000 +++ b/libpurple/internal.h Sat May 05 22:31:32 2007 +0000 @@ -183,6 +183,7 @@ #define purple_strlcat(dest, src) g_strlcat(dest, src, sizeof(dest)) #define PURPLE_WEBSITE "http://pidgin.im/" +#define PURPLE_DEVEL_WEBSITE "http://developer.pidgin.im/" /* This is for the accounts code to notify the buddy icon code that * it's done loading. We may want to replace this with a signal. */
--- a/pidgin/gtkmain.c Sat May 05 22:30:19 2007 +0000 +++ b/pidgin/gtkmain.c Sat May 05 22:31:32 2007 +0000 @@ -500,16 +500,16 @@ "no fault of your own.\n\n" "If you can reproduce the crash, please notify the Pidgin\n" "developers by reporting a bug at\n" - "%sbug.php\n\n" + "%snewticket/\n\n" "Please make sure to specify what you were doing at the time\n" "and post the backtrace from the core file. If you do not know\n" "how to get the backtrace, please read the instructions at\n" - "%sgdb.php\n\n" + "%swiki/GetABacktrace\n\n" "If you need further assistance, please IM either SeanEgn or \n" "LSchiere (via AIM). Contact information for Sean and Luke \n" "on other protocols is at\n" - "%scontactinfo.php\n"), - PIDGIN_NAME, PURPLE_WEBSITE, PURPLE_WEBSITE, PURPLE_WEBSITE + "%swiki/DeveloperPages\n"), + PIDGIN_NAME, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE ); /* we have to convert the message (UTF-8 to console
--- a/pidgin/gtksound.c Sat May 05 22:30:19 2007 +0000 +++ b/pidgin/gtksound.c Sat May 05 22:31:32 2007 +0000 @@ -430,7 +430,7 @@ return; } - esc_filename = g_strdup_printf("'%s'", filename); + esc_filename = g_shell_quote(filename); if(strstr(sound_cmd, "%s")) command = purple_strreplace(sound_cmd, "%s", esc_filename);