Changeset ebb95b6 for protocols/oscar

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.

File:

• protocols/oscar/oscar.c (modified) (1 diff)

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);