Mercurial > pidgin
changeset 18433:3e4ee49396ad
merge of 'cc6c96ed91fb789ae12faf87e23361996db6d2f0'
and 'f6786fa80b5701a5f44434e550c174e54f3114c4'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Wed, 04 Jul 2007 18:58:40 +0000 |
| parents | f5a17e7e4bfa (current diff) 5bc6c4097a77 (diff) |
| children | 2bf8792760fe |
| files | |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/internal.h Wed Jul 04 18:56:17 2007 +0000 +++ b/libpurple/internal.h Wed Jul 04 18:58:40 2007 +0000 @@ -93,8 +93,9 @@ #include <langinfo.h> #endif +#include <gmodule.h> + #ifdef PURPLE_PLUGINS -# include <gmodule.h> # ifndef _WIN32 # include <dlfcn.h> # endif
--- a/libpurple/plugins/autoaccept.c Wed Jul 04 18:56:17 2007 +0000 +++ b/libpurple/plugins/autoaccept.c Wed Jul 04 18:58:40 2007 +0000 @@ -178,7 +178,8 @@ { PurpleMenuAction *action; - if (!PURPLE_BLIST_NODE_IS_BUDDY(node) && !PURPLE_BLIST_NODE_IS_CONTACT(node)) + if (!PURPLE_BLIST_NODE_IS_BUDDY(node) && !PURPLE_BLIST_NODE_IS_CONTACT(node) && + !(purple_blist_node_get_flags(node) & PURPLE_BLIST_NODE_FLAG_NO_SAVE)) return; action = purple_menu_action_new(_("Autoaccept File Transfers..."),
--- a/libpurple/protocols/msn/directconn.c Wed Jul 04 18:56:17 2007 +0000 +++ b/libpurple/protocols/msn/directconn.c Wed Jul 04 18:58:40 2007 +0000 @@ -370,7 +370,7 @@ else { struct sockaddr_in client_addr; - unsigned int client; + socklen_t client; fd = accept (source, (struct sockaddr *)&client_addr, &client); }