Changeset e617b35

Timestamp:

2006-10-15T15:34:57Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

788a1af

Parents:

ee5c355 (diff), 3dc9d46 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging from main development tree.

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/msn/msn.c (modified) (1 diff)
• protocols/oscar/info.c (modified) (2 diffs)

doc/user-guide/commands.xml

@@ -426 +426 @@
                 <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>
 

protocols/msn/msn.c

@@ -368 +368 @@
         struct msn_data *md;
         char buf[1024], *fn;
-        int i;
         
         /* Double-check. */

protocols/oscar/info.c

@@ -261 +261 @@
                 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],
@@ -268 +269 @@
                                         cap[10], cap[11], cap[12], cap[13],
                                         cap[14], cap[15]);
-                        
+                        */
                 }