Ignore:
Timestamp:
2008-02-16T17:15:31Z (12 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/oscar/oscar.c

    r8961950 r4eb4c0f  
    10661066                g_snprintf(tmp, BUF_LONG, "%s", args->msg);
    10671067        } else {
    1068                 int i;
     1068                aim_mpmsg_section_t *part;
    10691069               
    10701070                *tmp = 0;
    1071                 for (i = 0; i < args->mpmsg.numparts; i ++) {
    1072                         g_strlcat(tmp, (char*) args->mpmsg.parts[i].data, BUF_LONG);
    1073                         g_strlcat(tmp, "\n", BUF_LONG);
     1071                for (part = args->mpmsg.parts; part; part = part->next) {
     1072                        if (part->data) {
     1073                                g_strlcat(tmp, (char*) part->data, BUF_LONG);
     1074                                g_strlcat(tmp, "\n", BUF_LONG);
     1075                        }
    10741076                }
    10751077        }
Note: See TracChangeset for help on using the changeset viewer.