Mercurial > pidgin
comparison libpurple/desktopitem.c @ 30578:0accc8adb18a
merge of '2f6318bd834113559a405ec68cdb178f2180b680'
and '64e02b98551e11e093e4649f1516f3aceaa321e2'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 26 Sep 2010 20:16:15 +0000 |
| parents | c60c9c95bb00 |
| children |
comparison
equal
deleted
inserted
replaced
| 30577:7b761c8601f7 | 30578:0accc8adb18a |
|---|---|
| 328 } while (pos < bufsize-1); | 328 } while (pos < bufsize-1); |
| 329 | 329 |
| 330 if (c == EOF && pos == 0) | 330 if (c == EOF && pos == 0) |
| 331 return NULL; | 331 return NULL; |
| 332 | 332 |
| 333 buf[pos++] = '\0'; | 333 buf[pos] = '\0'; |
| 334 | 334 |
| 335 return buf; | 335 return buf; |
| 336 } | 336 } |
| 337 | 337 |
| 338 static Encoding | 338 static Encoding |