Mercurial > pidgin.yaz
changeset 16650:a017913160cd
merge of 'a378fe8f729ea78fcd5280cc0b37072840f3b8ad'
and 'ed9fe95c113aaf3142881804b571bafaa02a0f45'
| author | William Ehlhardt <williamehlhardt@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2007 07:38:49 +0000 |
| parents | ee36e4bd84ca (diff) f9c369b4291c (current diff) |
| children | 8ef2d30bc1bf |
| files | |
| diffstat | 4 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/dnsquery.c Sun Apr 29 07:36:06 2007 +0000 +++ b/libpurple/dnsquery.c Sun Apr 29 07:38:49 2007 +0000 @@ -140,7 +140,7 @@ * Begin the DNS resolver child process functions. */ #ifdef HAVE_SIGNAL_H -static void +G_GNUC_NORETURN static void trap_gdb_bug() { const char *message = @@ -158,7 +158,7 @@ } #endif -static void +G_GNUC_NORETURN static void purple_dnsquery_resolver_run(int child_out, int child_in, gboolean show_debug) { dns_params_t dns_params;
--- a/libpurple/dnssrv.c Sun Apr 29 07:36:06 2007 +0000 +++ b/libpurple/dnssrv.c Sun Apr 29 07:38:49 2007 +0000 @@ -92,7 +92,7 @@ #ifndef _WIN32 -static void +G_GNUC_NORETURN static void resolve(int in, int out) { GList *ret = NULL;
--- a/libpurple/savedstatuses.c Sun Apr 29 07:36:06 2007 +0000 +++ b/libpurple/savedstatuses.c Sun Apr 29 07:38:49 2007 +0000 @@ -154,7 +154,7 @@ } /** - * A magic number is calcuated for each status, and then the + * A magic number is calculated for each status, and then the * statuses are ordered by the magic number. The magic number * is the date the status was last used offset by one day for * each time the status has been used (but only by 10 days at
--- a/pidgin/gtkstatusbox.c Sun Apr 29 07:36:06 2007 +0000 +++ b/pidgin/gtkstatusbox.c Sun Apr 29 07:38:49 2007 +0000 @@ -2225,7 +2225,8 @@ PurpleSavedStatusSub *sub = purple_savedstatus_get_substatus(ss, acct); if (sub) { const PurpleStatusType *sub_type = purple_savedstatus_substatus_get_type(sub); - if (!strcmp(purple_status_type_get_id(sub_type), + const char *subtype_status_id = purple_status_type_get_id(sub_type); + if (subtype_status_id && !strcmp(subtype_status_id, purple_status_type_get_id(acct_status_type))) found = TRUE; }