diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2012-09-15 17:03:33 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2012-09-15 17:03:33 +0100 |
| commit | b3d99e347e66e1559b86e7d3bf78ed8b087ec947 (patch) | |
| tree | 83e5e62a00419f8c8713692db17f5caf953697ad | |
| parent | 7281ad13e9dadb1369590617eb06265b084a1726 (diff) | |
Twitter module cleanup: Both Twitter and identi.ca "modules" support OAuth
now.
| -rw-r--r-- | doc/user-guide/commands.xml | 6 | ||||
| -rw-r--r-- | protocols/twitter/twitter.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index 12bbf4bc..4a6b3266 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -68,7 +68,7 @@ </bitlbee-command> <bitlbee-command name="twitter"> - <syntax>account add twitter <handle> [<password>]</syntax> + <syntax>account add twitter <handle></syntax> <description> <para> @@ -94,11 +94,11 @@ </bitlbee-command> <bitlbee-command name="identica"> - <syntax>account add identica <handle> [<password>]</syntax> + <syntax>account add identica <handle></syntax> <description> <para> - Same protocol as <emphasis>twitter</emphasis>, but defaults to a <emphasis>base_url</emphasis> pointing at identi.ca, and with OAuth disabled. + Same protocol as <emphasis>twitter</emphasis>, but defaults to a <emphasis>base_url</emphasis> pointing at identi.ca. It also works with OAuth (so don't specify your password). </para> </description> </bitlbee-command> diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c index a0ee83e9..c0811a71 100644 --- a/protocols/twitter/twitter.c +++ b/protocols/twitter/twitter.c @@ -241,16 +241,13 @@ static void twitter_init(account_t * acc) { set_t *s; char *def_url; - char *def_oauth; char *def_tul; if (strcmp(acc->prpl->name, "twitter") == 0) { def_url = TWITTER_API_URL; - def_oauth = "true"; def_tul = "20"; } else { /* if( strcmp( acc->prpl->name, "identica" ) == 0 ) */ def_url = IDENTICA_API_URL; - def_oauth = "true"; def_tul = "0"; } @@ -273,7 +270,7 @@ static void twitter_init(account_t * acc) s = set_add(&acc->set, "mode", "chat", set_eval_mode, acc); s->flags |= ACC_SET_OFFLINE_ONLY; - s = set_add(&acc->set, "oauth", def_oauth, set_eval_oauth, acc); + s = set_add(&acc->set, "oauth", "true", set_eval_oauth, acc); s = set_add(&acc->set, "show_ids", "true", set_eval_bool, acc); s->flags |= ACC_SET_OFFLINE_ONLY; |