Mercurial > pidgin.yaz
comparison finch/gntblist.c @ 18644:a5b37b3f02c6
merge of 'ba1886a94b2131f499b71e5c939807d4df199b08'
and 'f4d2e27ee5bc44bb6d4d834730822b698a4dc534'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Wed, 25 Jul 2007 21:01:21 +0000 |
| parents | 5551e5ec1ce0 |
| children | c8ad802a6167 f0b25c6fa806 |
comparison
equal
deleted
inserted
replaced
| 18633:075c8dab16e2 | 18644:a5b37b3f02c6 |
|---|---|
| 1323 purple_notify_user_info_destroy(user_info); | 1323 purple_notify_user_info_destroy(user_info); |
| 1324 | 1324 |
| 1325 strip = purple_markup_strip_html(tmp); | 1325 strip = purple_markup_strip_html(tmp); |
| 1326 g_string_append(str, strip); | 1326 g_string_append(str, strip); |
| 1327 | 1327 |
| 1328 if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_MOBILE)) | 1328 if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_MOBILE)) { |
| 1329 g_string_append(str, "\n"); | |
| 1329 g_string_append(str, _("On Mobile")); | 1330 g_string_append(str, _("On Mobile")); |
| 1331 } | |
| 1330 | 1332 |
| 1331 g_free(strip); | 1333 g_free(strip); |
| 1332 g_free(tmp); | 1334 g_free(tmp); |
| 1333 } | 1335 } |
| 1334 | 1336 |