Mercurial > pidgin
changeset 16640:ee36e4bd84ca
merge of '0612cac578b7e81a69e733d921063a72a039a1d6'
and '7d78d68b6f9eca6127d48a613bf7f6a31857f06a'
| author | William Ehlhardt <williamehlhardt@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2007 07:21:00 +0000 |
| parents | 250623ba4218 (current diff) ec2c24b5fe33 (diff) |
| children | 985bf8c7b8d1 a017913160cd |
| files | |
| diffstat | 5 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/dnsquery.c Sun Apr 29 07:03:50 2007 +0000 +++ b/libpurple/dnsquery.c Sun Apr 29 07:21:00 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:03:50 2007 +0000 +++ b/libpurple/dnssrv.c Sun Apr 29 07:21:00 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:03:50 2007 +0000 +++ b/libpurple/savedstatuses.c Sun Apr 29 07:21:00 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/gtksavedstatuses.c Sun Apr 29 07:03:50 2007 +0000 +++ b/pidgin/gtksavedstatuses.c Sun Apr 29 07:21:00 2007 +0000 @@ -1677,7 +1677,7 @@ GList *sorted, *cur; int i = 0; int index = -1; - GdkPixbuf *pixbuf, *emblem; + GdkPixbuf *pixbuf; GtkTreeIter iter; GtkCellRenderer *text_rend; GtkCellRenderer *icon_rend;
--- a/pidgin/gtkstatusbox.c Sun Apr 29 07:03:50 2007 +0000 +++ b/pidgin/gtkstatusbox.c Sun Apr 29 07:21:00 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; }