Changeset 4eb4c0f for protocols/oscar

Timestamp:

2008-02-16T17:15:31Z (17 years ago)

Author:

Sven Moritz Hallberg <sm@…>

Branches:

master

Children:

fd9fa52

Parents:

8961950 (diff), ca60550 (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:

merge in upstream changes

Location:

protocols/oscar

Files:

• Makefile (modified) (1 diff)
• oscar.c (modified) (1 diff)

protocols/oscar/Makefile

@@ -18 +18 @@
 all: oscar_mod.o
 check: all
-lcov:
+lcov: check
 gcov:
         gcov *.c

protocols/oscar/oscar.c

@@ -1066 +1066 @@
                 g_snprintf(tmp, BUF_LONG, "%s", args->msg);
         } else {
-                int i;
+                aim_mpmsg_section_t *part;
                 
                 *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);
+                for (part = args->mpmsg.parts; part; part = part->next) {
+                        if (part->data) {
+                                g_strlcat(tmp, (char*) part->data, BUF_LONG);
+                                g_strlcat(tmp, "\n", BUF_LONG);
+                        }
                 }
         }