Changeset ebb95b6 for protocols

Timestamp:

2007-11-14T23:42:07Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

50e1776

Parents:

a6df0b5 (diff), 1bf1ae6 (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 devel/Jelmer.

Location:

protocols

Files:

• jabber/io.c (modified) (2 diffs)
• jabber/presence.c (modified) (1 diff)
• jabber/xmltree.c (modified) (2 diffs)
• nogaim.c (modified) (3 diffs)
• oscar/oscar.c (modified) (1 diff)

protocols/jabber/io.c

@@ -470 +470 @@
 }
 
-static xt_status jabber_pkt_misc( struct xt_node *node, gpointer data )
-{
-        printf( "Received unknown packet:\n" );
-        xt_print( node );
-        
-        return XT_HANDLED;
-}
-
 static xt_status jabber_xmlconsole( struct xt_node *node, gpointer data )
 {
@@ -509 +501 @@
         { "success",            "stream:stream",        sasl_pkt_result },
         { "failure",            "stream:stream",        sasl_pkt_result },
-        { NULL,                 "stream:stream",        jabber_pkt_misc },
         { NULL,                 NULL,                   NULL }
 };

protocols/jabber/presence.c

@@ -170 +170 @@
                 /* What else to do with it? */
         }
-        else
-        {
-                printf( "Received PRES from %s:\n", from );
-                xt_print( node );
-        }
         
         return XT_HANDLED;

protocols/jabber/xmltree.c

@@ -305 +305 @@
 }
 
+#ifdef DEBUG
 void xt_print( struct xt_node *node )
 {
@@ -355 +356 @@
         printf( "</%s>\n", node->name );
 }
+#endif
 
 struct xt_node *xt_dup( struct xt_node *node )

protocols/nogaim.c

@@ -36 +36 @@
 #include <ctype.h>
 
-static int remove_chat_buddy_silent( struct groupchat *b, char *handle );
+static int remove_chat_buddy_silent( struct groupchat *b, const char *handle );
 
 GSList *connections;
@@ -578 +578 @@
                 /* Remove him/her from the groupchats to prevent PART messages after he/she QUIT already */
                 for( c = ic->groupchats; c; c = c->next )
-                        remove_chat_buddy_silent( c, (char*) handle );
+                        remove_chat_buddy_silent( c, handle );
         }
         
@@ -849 +849 @@
 }
 
-static int remove_chat_buddy_silent( struct groupchat *b, char *handle )
+static int remove_chat_buddy_silent( struct groupchat *b, const char *handle )
 {
         GList *i;

protocols/oscar/oscar.c

@@ -1066 +1066 @@
                         g_snprintf(tmp, BUF_LONG, "%s", args->msg);
                 }
-        } else
+        } else if (args->mpmsg.numparts == 0) {
                 g_snprintf(tmp, BUF_LONG, "%s", args->msg);
+        } else {
+                int i;
+                
+                *tmp = 0;
+                for (i = 0; i < args->mpmsg.numparts; i ++) {
+                        g_strlcat(tmp, (char*) args->mpmsg.parts[i].data, BUF_LONG);
+                        g_strlcat(tmp, "\n", BUF_LONG);
+                }
+        }
         
         strip_linefeed(tmp);