# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: daniel@lbe.rs-20120113174923-fhr0wfir2zkvshga
# target_branch: http://code.bitlbee.org/bitlbee/
# testament_sha1: 802e21d926be5bed32a197556a04ad4b16fee4ae
# timestamp: 2012-01-13 18:53:43 +0100
# base_revision_id: wilmer@gaast.net-20120110233629-6tynaq7cscaiem56
#
# Begin patch
=== modified file 'protocols/twitter/twitter.c'
|
|
|
245 | 245 | s->flags |= ACC_SET_OFFLINE_ONLY; |
246 | 246 | |
247 | 247 | s = set_add(&acc->set, "show_old_mentions", "true", set_eval_bool, acc); |
| 248 | |
| 249 | s = set_add(&acc->set, "strip_newlines", "false", set_eval_bool, acc); |
248 | 250 | } |
249 | 251 | |
250 | 252 | /** |
=== modified file 'protocols/twitter/twitter_lib.c'
|
|
|
646 | 646 | |
647 | 647 | strip_html(status->text); |
648 | 648 | |
| 649 | if (set_getbool(&ic->acc->set, "strip_newlines")) |
| 650 | strip_newlines(status->text); |
| 651 | |
649 | 652 | msg = twitter_msg_add_id(ic, status, ""); |
650 | 653 | |
651 | 654 | // Say it! |