diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/account.c | 1 | ||||
| -rw-r--r-- | protocols/bee.h | 2 | ||||
| -rw-r--r-- | protocols/bee_user.c | 4 | ||||
| -rw-r--r-- | protocols/nogaim.c | 11 |
4 files changed, 11 insertions, 7 deletions
diff --git a/protocols/account.c b/protocols/account.c index a3c2e0d7..0bacea74 100644 --- a/protocols/account.c +++ b/protocols/account.c @@ -216,7 +216,6 @@ account_t *account_get( bee_t *bee, char *id ) void account_del( bee_t *bee, account_t *acc ) { account_t *a, *l = NULL; - struct chat *c, *nc; if( acc->ic ) /* Caller should have checked, accounts still in use can't be deleted. */ diff --git a/protocols/bee.h b/protocols/bee.h index be14234b..023c1644 100644 --- a/protocols/bee.h +++ b/protocols/bee.h @@ -90,6 +90,6 @@ int bee_user_msg( bee_t *bee, bee_user_t *bu, const char *msg, int flags ); G_MODULE_EXPORT void imcb_buddy_status( struct im_connection *ic, const char *handle, int flags, const char *state, const char *message ); /* Not implemented yet! */ G_MODULE_EXPORT void imcb_buddy_times( struct im_connection *ic, const char *handle, time_t login, time_t idle ); /* Call when a handle says something. 'flags' and 'sent_at may be just 0. */ -G_MODULE_EXPORT void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at ); +G_MODULE_EXPORT void imcb_buddy_msg( struct im_connection *ic, const char *handle, char *msg, guint32 flags, time_t sent_at ); #endif /* __BEE_H__ */ diff --git a/protocols/bee_user.c b/protocols/bee_user.c index 32022dd8..2c11ca1d 100644 --- a/protocols/bee_user.c +++ b/protocols/bee_user.c @@ -91,8 +91,10 @@ int bee_user_msg( bee_t *bee, bee_user_t *bu, const char *msg, int flags ) buf = escape_html( msg ); msg = buf; } + else + buf = g_strdup( msg ); - st = bu->ic->acc->prpl->buddy_msg( bu->ic, bu->handle, msg, flags ); + st = bu->ic->acc->prpl->buddy_msg( bu->ic, bu->handle, buf, flags ); g_free( buf ); return st; diff --git a/protocols/nogaim.c b/protocols/nogaim.c index 741bdb76..141ae9a3 100644 --- a/protocols/nogaim.c +++ b/protocols/nogaim.c @@ -37,8 +37,6 @@ #include "nogaim.h" #include "chat.h" -static int remove_chat_buddy_silent( struct groupchat *b, const char *handle ); - GSList *connections; #ifdef WITH_PLUGINS @@ -474,6 +472,7 @@ struct imcb_ask_cb_data char *handle; }; +#if 0 static void imcb_ask_auth_cb_no( void *data ) { struct imcb_ask_cb_data *cbd = data; @@ -493,6 +492,7 @@ static void imcb_ask_auth_cb_yes( void *data ) g_free( cbd->handle ); g_free( cbd ); } +#endif void imcb_ask_auth( struct im_connection *ic, const char *handle, const char *realname ) { @@ -515,6 +515,7 @@ void imcb_ask_auth( struct im_connection *ic, const char *handle, const char *re } +#if 0 static void imcb_ask_add_cb_no( void *data ) { g_free( ((struct imcb_ask_cb_data*)data)->handle ); @@ -529,6 +530,7 @@ static void imcb_ask_add_cb_yes( void *data ) return imcb_ask_add_cb_no( data ); } +#endif void imcb_ask_add( struct im_connection *ic, const char *handle, const char *realname ) { @@ -596,6 +598,7 @@ struct groupchat *imcb_chat_new( struct im_connection *ic, const char *handle ) return c; #endif + return NULL; } void imcb_chat_free( struct groupchat *c ) @@ -782,9 +785,9 @@ void imcb_chat_remove_buddy( struct groupchat *b, const char *handle, const char #endif } +#if 0 static int remove_chat_buddy_silent( struct groupchat *b, const char *handle ) { -#if 0 GList *i; /* Find the handle in the room userlist and shoot it */ @@ -800,10 +803,10 @@ static int remove_chat_buddy_silent( struct groupchat *b, const char *handle ) i = i->next; } -#endif return 0; } +#endif /* Misc. BitlBee stuff which shouldn't really be here */ |