Changeset ebb95b6 for protocols/oscar


Ignore:
Timestamp:
2007-11-14T23:42:07Z (14 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:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/oscar/oscar.c

    ra6df0b5 rebb95b6  
    10661066                        g_snprintf(tmp, BUF_LONG, "%s", args->msg);
    10671067                }
    1068         } else
     1068        } else if (args->mpmsg.numparts == 0) {
    10691069                g_snprintf(tmp, BUF_LONG, "%s", args->msg);
     1070        } else {
     1071                int i;
     1072               
     1073                *tmp = 0;
     1074                for (i = 0; i < args->mpmsg.numparts; i ++) {
     1075                        g_strlcat(tmp, (char*) args->mpmsg.parts[i].data, BUF_LONG);
     1076                        g_strlcat(tmp, "\n", BUF_LONG);
     1077                }
     1078        }
    10701079       
    10711080        strip_linefeed(tmp);
Note: See TracChangeset for help on using the changeset viewer.