Mercurial > pidgin
changeset 27242:fd45bfd89872
merge of '6b55733f733881e690313c87ac44fba18f382ce1'
and 'aa1b0003a1e5ecb2e83de16870e1dab4ee4e94cc'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 02 Jul 2009 01:52:48 +0000 |
| parents | f22b8f624a00 (diff) 76cf0b261e25 (current diff) |
| children | ecdc58da4cdd |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/irc/dcc_send.c Thu Jul 02 01:51:47 2009 +0000 +++ b/libpurple/protocols/irc/dcc_send.c Thu Jul 02 01:52:48 2009 +0000 @@ -50,7 +50,7 @@ * unsigned 4 byte integer in network byte order) */ static void irc_dccsend_recv_ack(PurpleXfer *xfer, const guchar *data, size_t size) { - unsigned long l; + guint32 l; size_t result; l = htonl(xfer->bytes_sent);
--- a/pidgin/gtkblist.c Thu Jul 02 01:51:47 2009 +0000 +++ b/pidgin/gtkblist.c Thu Jul 02 01:52:48 2009 +0000 @@ -7868,8 +7868,10 @@ } } - if (!enabled_accounts) + if (!enabled_accounts) { + gtk_widget_show_all(accountmenu); return; + } pidgin_separator(accountmenu); accel_group = gtk_menu_get_accel_group(GTK_MENU(accountmenu));