diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2006-10-15 17:34:57 +0200 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2006-10-15 17:34:57 +0200 |
| commit | e617b35a6771362164aff194cb6e0b757552c0bd (patch) | |
| tree | 0b37d6843de6acb159b11af99c9239f829023859 | |
| parent | ee5c3558c7db32750e1029a1b4983672dc519bca (diff) | |
| parent | 3dc9d46cc20d287c266fed97f92d298ed721f7b3 (diff) | |
Merging from main development tree.
| -rw-r--r-- | doc/user-guide/commands.xml | 8 | ||||
| -rw-r--r-- | protocols/msn/msn.c | 1 | ||||
| -rw-r--r-- | protocols/oscar/info.c | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index 09d4b7b6..36678da2 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -425,9 +425,11 @@ <bitlbee-setting name="display_namechanges" type="boolean" scope="global"> <default>false</default> - <para> - With this option enabled, root will inform you when someone in your buddy list changes his/her "friendly name". - </para> + <description> + <para> + With this option enabled, root will inform you when someone in your buddy list changes his/her "friendly name". + </para> + </description> </bitlbee-setting> <bitlbee-setting name="handle_unknown" type="string" scope="global"> diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c index 8c53e620..7aa384e6 100644 --- a/protocols/msn/msn.c +++ b/protocols/msn/msn.c @@ -367,7 +367,6 @@ static char *msn_set_display_name( set_t *set, char *value ) struct gaim_connection *gc = acc->gc; struct msn_data *md; char buf[1024], *fn; - int i; /* Double-check. */ if( gc == NULL ) diff --git a/protocols/oscar/info.c b/protocols/oscar/info.c index ffe29d1f..0f1bcfd2 100644 --- a/protocols/oscar/info.c +++ b/protocols/oscar/info.c @@ -260,6 +260,7 @@ guint32 aim_getcap(aim_session_t *sess, aim_bstream_t *bs, int len) if (!identified) { /*FIXME*/ + /*REMOVEME :-) g_strdup_printf("unknown capability: {%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", cap[0], cap[1], cap[2], cap[3], cap[4], cap[5], @@ -267,7 +268,7 @@ guint32 aim_getcap(aim_session_t *sess, aim_bstream_t *bs, int len) cap[8], cap[9], cap[10], cap[11], cap[12], cap[13], cap[14], cap[15]); - + */ } g_free(cap); |