diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/msn/sb.c | 2 | ||||
| -rw-r--r-- | protocols/nogaim.c | 2 | ||||
| -rw-r--r-- | protocols/oscar/aim_internal.h | 1 | ||||
| -rw-r--r-- | protocols/oscar/faimconfig.h | 0 | ||||
| -rw-r--r-- | protocols/oscar/snac.c | 4 | ||||
| -rw-r--r-- | protocols/proxy.c | 54 | ||||
| -rw-r--r-- | protocols/ssl_nss.c | 4 |
7 files changed, 7 insertions, 60 deletions
diff --git a/protocols/msn/sb.c b/protocols/msn/sb.c index 38ead0bd..793a881e 100644 --- a/protocols/msn/sb.c +++ b/protocols/msn/sb.c @@ -1,7 +1,7 @@ /********************************************************************\ * BitlBee -- An IRC to other IM-networks gateway * * * - * Copyright 2002-2004 Wilmer van der Gaast and others * + * Copyright 2002-2005 Wilmer van der Gaast and others * \********************************************************************/ /* MSN module - Switchboard server callbacks and utilities */ diff --git a/protocols/nogaim.c b/protocols/nogaim.c index dc613687..a5f034c7 100644 --- a/protocols/nogaim.c +++ b/protocols/nogaim.c @@ -467,7 +467,7 @@ void signoff( struct gaim_connection *gc ) void do_error_dialog( struct gaim_connection *gc, char *msg, char *title ) { - irc_usermsg( gc->irc, "%s(%s) - Error: %s", gc->username, title, msg ); + irc_usermsg( gc->irc, "%s(%s) - Error: %s", gc->prpl->name, gc->username, msg ); } void do_ask_dialog( struct gaim_connection *gc, char *msg, void *data, void *doit, void *dont ) diff --git a/protocols/oscar/aim_internal.h b/protocols/oscar/aim_internal.h index 2e36c961..29c16b9f 100644 --- a/protocols/oscar/aim_internal.h +++ b/protocols/oscar/aim_internal.h @@ -106,7 +106,6 @@ typedef struct aim_snac_s { } aim_snac_t; void aim_initsnachash(aim_session_t *sess); -aim_snacid_t aim_newsnac(aim_session_t *, aim_snac_t *newsnac); aim_snacid_t aim_cachesnac(aim_session_t *sess, const guint16 family, const guint16 type, const guint16 flags, const void *data, const int datalen); aim_snac_t *aim_remsnac(aim_session_t *, aim_snacid_t id); void aim_cleansnacs(aim_session_t *, int maxage); diff --git a/protocols/oscar/faimconfig.h b/protocols/oscar/faimconfig.h deleted file mode 100644 index e69de29b..00000000 --- a/protocols/oscar/faimconfig.h +++ /dev/null diff --git a/protocols/oscar/snac.c b/protocols/oscar/snac.c index e2bac179..8a75b2a0 100644 --- a/protocols/oscar/snac.c +++ b/protocols/oscar/snac.c @@ -14,6 +14,8 @@ #include <aim.h> +static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac); + /* * Called from aim_session_init() to initialize the hash. */ @@ -50,7 +52,7 @@ aim_snacid_t aim_cachesnac(aim_session_t *sess, const guint16 family, const guin * Clones the passed snac structure and caches it in the * list/hash. */ -aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac) +static aim_snacid_t aim_newsnac(aim_session_t *sess, aim_snac_t *newsnac) { aim_snac_t *snac; int index; diff --git a/protocols/proxy.c b/protocols/proxy.c index b5f86e89..6d450c92 100644 --- a/protocols/proxy.c +++ b/protocols/proxy.c @@ -96,65 +96,11 @@ static void gaim_io_destroy(gpointer data) g_free(data); } -#ifdef PROXYPROFILER -struct proxyprofiler -{ - GaimInputFunction function; - gpointer data; - - int count; - - struct proxyprofiler *next; -} *pp = NULL; - -void proxyprofiler_dump() -{ - struct proxyprofiler *l; - char s[128]; - FILE *fp; - - sprintf( s, "proxyprofiler.%d", (int) getpid() ); - fp = fopen( s, "w" ); - - fprintf( fp, "%-18s %-18s %10s\n", "Function", "Data", "Count" ); - for( l = pp; l; l = l->next ) - fprintf( fp, "0x%-16x 0x%-16x %10d\n", (int) l->function, (int) l->data, l->count ); - - fclose( fp ); -} -#endif - static gboolean gaim_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data) { GaimIOClosure *closure = data; GaimInputCondition gaim_cond = 0; -#ifdef PROXYPROFILER - struct proxyprofiler *l; - - for( l = pp; l; l = l->next ) - { - if( closure->function == l->function && closure->data == l->data ) - break; - } - if( l ) - { - l->count ++; - } - else - { - l = g_new0( struct proxyprofiler, 1 ); - l->function = closure->function; - l->data = closure->data; - l->count = 1; - - l->next = pp; - pp = l; - } -#endif - - count_io_event(source, "proxy"); - if (condition & GAIM_READ_COND) gaim_cond |= GAIM_INPUT_READ; if (condition & GAIM_WRITE_COND) diff --git a/protocols/ssl_nss.c b/protocols/ssl_nss.c index 0815f952..7c5f5637 100644 --- a/protocols/ssl_nss.c +++ b/protocols/ssl_nss.c @@ -1,12 +1,12 @@ /********************************************************************\ * BitlBee -- An IRC to other IM-networks gateway * * * - * Copyright 2002-2004 Wilmer van der Gaast and others * + * Copyright 2002-2005 Wilmer van der Gaast and others * \********************************************************************/ /* SSL module - NSS version */ -/* Copyright 2004 Jelmer Vernooij */ +/* Copyright 2005 Jelmer Vernooij */ /* This program is free software; you can redistribute it and/or modify |