diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2012-01-30 21:41:00 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2012-01-30 21:41:00 +0000 |
| commit | cf0dbddcc18a59682f66b230b1552e04373937b1 (patch) | |
| tree | ffa3ff33e98f37654c7729478dc12dba8b24478e | |
| parent | 8d96b78e8fac994e4aa030f8696f4871dc6428ca (diff) | |
| parent | 948ababaf509050a83a32e629c6c327f087f6d07 (diff) | |
Merging strip_newlines Twitter setting.
| -rw-r--r-- | protocols/twitter/twitter.c | 2 | ||||
| -rw-r--r-- | protocols/twitter/twitter_lib.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c index ef49e83a..91b6e28c 100644 --- a/protocols/twitter/twitter.c +++ b/protocols/twitter/twitter.c @@ -245,6 +245,8 @@ static void twitter_init(account_t * acc) s->flags |= ACC_SET_OFFLINE_ONLY; s = set_add(&acc->set, "show_old_mentions", "true", set_eval_bool, acc); + + s = set_add(&acc->set, "strip_newlines", "false", set_eval_bool, acc); } /** diff --git a/protocols/twitter/twitter_lib.c b/protocols/twitter/twitter_lib.c index db1192ce..bd957333 100644 --- a/protocols/twitter/twitter_lib.c +++ b/protocols/twitter/twitter_lib.c @@ -646,6 +646,9 @@ static void twitter_groupchat(struct im_connection *ic, GSList * list) strip_html(status->text); + if (set_getbool(&ic->acc->set, "strip_newlines")) + strip_newlines(status->text); + msg = twitter_msg_add_id(ic, status, ""); // Say it! |