bti-nonprism-034-1: updating version

2 files changed, 105 insertions, 141 deletions

diff --git a/nonprism/bti-nonprism/PKGBUILD b/nonprism/bti-nonprism/PKGBUILD
index 378664976..e09af287c 100644
--- a/nonprism/bti-nonprism/PKGBUILD
+++ b/nonprism/bti-nonprism/PKGBUILD
@@ -1,40 +1,40 @@
-# $Id$
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# $Id: PKGBUILD 105298 2014-02-04 18:30:40Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: uvok <uvok at online dot de>
 # Contributor: Urist <9362773 at gmail.com>
 
 _pkgname=bti
 pkgname=bti-nonprism
-pkgver=033
-pkgrel=1.1
+pkgver=034
+pkgrel=1
 pkgdesc='Console client for status.net, without Twitter support'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://gregkh.github.com/bti/'
 license=('GPL')
 depends=('pcre' 'libxml2' 'curl' 'liboauth' 'json-c')
-provides=$_pkgname
+provides=$_pkgname=$pkgver
 conflicts=$_pkgname
 replaces=$_pkgname
 source=(http://www.kernel.org/pub/software/web/$_pkgname/$_pkgname-$pkgver.tar.xz
         nonprism.patch)
-sha256sums=('a3d9d8a86a718a4820387c75ac2af24fecfe754ee562163d700acb7cf795d753'
-            '184f2a134d44ae4c901ffdc824f833b477148f146e23f5d3680496658c9ca393')
+sha256sums=('8b4a1a11f529f83956468acadaea9d11db4f03e82afe07fecb84b2d00e9eae83'
+            '86eab6c949e3c19d3a4088fac78fba4709845e9d5871b12c17a944127347498c')
 
 prepare() {
-  cd ${srcdir}/$_pkgname-$pkgver
+  cd "${srcdir}"/$_pkgname-$pkgver
   patch -Np1 -i ${srcdir}/nonprism.patch
 }
 
 build() {
-  cd ${srcdir}/$_pkgname-$pkgver
+  cd "${srcdir}"/$_pkgname-$pkgver
   ./configure --prefix=/usr
 
   make
 }
 
 package() {
-  cd ${srcdir}/$_pkgname-$pkgver
+  cd "${srcdir}"/$_pkgname-$pkgver
   
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
-
diff --git a/nonprism/bti-nonprism/nonprism.patch b/nonprism/bti-nonprism/nonprism.patch
index 009c26d1e..9423d03a7 100644
--- a/nonprism/bti-nonprism/nonprism.patch
+++ b/nonprism/bti-nonprism/nonprism.patch
@@ -1,47 +1,61 @@
-diff -Nur bti-033/bti.1 bti-nonprism/bti.1
---- bti-033/bti.1	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.1	2013-08-21 18:24:32.693871946 -0300
+diff --git a/bti-bashcompletion b/bti-bashcompletion
+index fa55d75..f957b32 100644
+--- a/bti-bashcompletion
++++ b/bti-bashcompletion
+@@ -12,7 +12,7 @@ _bti()
+ 	fi
+ 
+ 	if [[ "${prev}" == "--host" ]] ; then
+-		COMPREPLY=( $(compgen -W "twitter identica" -- ${cur} ) )
++		COMPREPLY=( $(compgen -W "statusnet" -- ${cur} ) )
+ 	fi
+ 
+ 	if [[ "${prev}" == "--action" ]] ; then
+diff --git a/bti.1 b/bti.1
+index bdd6c76..3577e98 100644
+--- a/bti.1
++++ b/bti.1
 @@ -28,23 +28,23 @@
  .\" * MAIN CONTENT STARTS HERE *
  .\" -----------------------------------------------------------------
  .SH "NAME"
--bti \- send a tweet to twitter\&.com or identi\&.ca from the command line
+-bti \- send a tweet to twitter\&.com from the command line
 +bti \- send a tweet to status\&.net from the command line
  .SH "SYNOPSIS"
  .HP \w'\fBbti\fR\ 'u
  \fBbti\fR [\fB\-\-account\ account\fR] [\fB\-\-password\ password\fR] [\fB\-\-action\ action\fR] [\fB\-\-user\ screenname\fR] [\fB\-\-host\ HOST_NAME\fR] [\fB\-\-proxy\ PROXY:PORT\fR] [\fB\-\-logfile\ LOGFILE\fR] [\fB\-\-config\ CONFIGFILE\fR] [\fB\-\-replyto\ ID\fR] [\fB\-\-retweet\ ID\fR] [\fB\-\-page\ PAGENUMBER\fR] [\fB\-\-bash\fR] [\fB\-\-shrink\-urls\fR] [\fB\-\-debug\fR] [\fB\-\-dry\-run\fR] [\fB\-\-verbose\fR] [\fB\-\-version\fR] [\fB\-\-help\fR]
  .SH "DESCRIPTION"
  .PP
--bti sends a tweet message to twitter\&.com or identi\&.ca\&.
+-bti sends a tweet message to twitter\&.com\&.
 +bti sends a tweet message to status\&.net\&.
  .SH "OPTIONS"
  .PP
  \fB\-\-account account\fR
  .RS 4
--Specify the twitter\&.com or identi\&.ca account name\&.
+-Specify the twitter\&.com account name\&.
 +Specify the status\&.net account name\&.
  .RE
  .PP
  \fB\-\-password password\fR
  .RS 4
--Specify the password of your twitter\&.com or identi\&.ca account\&.
+-Specify the password of your twitter\&.com account\&.
 +Specify the password of your status\&.net account\&.
  .RE
  .PP
  \fB\-\-action action\fR
-@@ -59,9 +59,9 @@
+@@ -59,9 +59,9 @@ Specify the user whose messages you want to see when the action is "user", and t
  .PP
  \fB\-\-host HOST_NAME\fR
  .RS 4
--Specify the host which you want to send your message to\&. Valid options are "twitter" to send to twitter\&.com and "identica" to send to identi\&.ca\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example identi\&.ca\*(Aqs URI is: https://identi\&.ca/api/statuses
-+Specify the host which you want to send your message to\&. Valid options are "statusnet" to send to status\&.net\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example status\&.net\*(Aqs URI is: https://status\&.net/api/statuses
+-Specify the host which you want to send your message to\&. Valid options are "twitter" to send to twitter\&.com\&.
++Specify the host which you want to send your message to\&. Valid options are "statusnet" to send to status\&.net\&.
  .sp
 -If no host is specified, the default is to send to twitter\&.com\&.
 +If no host is specified, the default is to send to status\&.net\&.
  .RE
  .PP
  \fB\-\-proxy PROXY:PORT\fR
-@@ -85,8 +85,6 @@
+@@ -85,8 +85,6 @@ Specify a config file for bti to read from\&. By default, bti looks in the ~/\&.
  .RS 4
  Status ID of a single post to which you want to create a threaded reply to\&.
  .sp
@@ -50,46 +64,35 @@ diff -Nur bti-033/bti.1 bti-nonprism/bti.1
  For status\&.net, this can link any two messages into context with each other\&. Status\&.net will also link a message that contains an @name without this without regard to context\&.
  .RE
  .PP
-@@ -167,12 +165,12 @@
+@@ -167,12 +165,12 @@ The account and password can be stored in a configuration file in the users home
  .PP
  \fBaccount\fR
  .RS 4
--The twitter\&.com or identi\&.ca account name you wish to use to send this message with\&.
+-The twitter\&.com account name you wish to use to send this message with\&.
 +The status\&.net account name you wish to use to send this message with\&.
  .RE
  .PP
  \fBpassword\fR
  .RS 4
--The twitter\&.com or identi\&.ca password for the account you wish to use to send this message with\&.
+-The twitter\&.com password for the account you wish to use to send this message with\&.
 +The status\&.net password for the account you wish to use to send this message with\&.
  .RE
  .PP
  \fB\-\-action action\fR
-@@ -187,7 +185,7 @@
+@@ -187,7 +185,7 @@ Specify the user you want to see his/her messages while the action is "user"\&.
  .PP
  \fBhost\fR
  .RS 4
--The host you want to use to send the message to\&. Valid options are either "twitter" or "identica" to send to twitter\&.com or identi\&.ca respectively\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example identi\&.ca\*(Aqs URI is: https://identi\&.ca/api/statuses\&.
-+The host you want to use to send the message to\&. Valid options are either "statusnet" to send to status\&.net respectively\&. If you want to send the message to a custom StatusNet installation, you should specify the API URI\&. For example status\&.net\*(Aqs URI is: https://status\&.net/api/statuses\&.
+-The host you want to use to send the message to\&. Valid options is "twitter" or "custom" to specify your own server\&.
++The host you want to use to send the message to\&. Valid options is "statusnet" or "custom" to specify your own server\&.
  .RE
  .PP
  \fBproxy\fR
-diff -Nur bti-033/bti-bashcompletion bti-nonprism/bti-bashcompletion
---- bti-033/bti-bashcompletion	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti-bashcompletion	2013-08-21 18:19:46.889928804 -0300
-@@ -12,7 +12,7 @@
- 	fi
- 
- 	if [[ "${prev}" == "--host" ]] ; then
--		COMPREPLY=( $(compgen -W "twitter identica" -- ${cur} ) )
-+		COMPREPLY=( $(compgen -W "statusnet" -- ${cur} ) )
- 	fi
- 
- 	if [[ "${prev}" == "--action" ]] ; then
-diff -Nur bti-033/bti.c bti-nonprism/bti.c
---- bti-033/bti.c	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.c	2013-08-21 18:31:54.013583020 -0300
-@@ -53,7 +53,7 @@
+diff --git a/bti.c b/bti.c
+index f4b2c4d..226e111 100644
+--- a/bti.c
++++ b/bti.c
+@@ -53,7 +53,7 @@ int debug;
  
  static void display_help(void)
  {
@@ -98,50 +101,39 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  		"Version: %s\n"
  		"Usage:\n"
  		"  bti [options]\n"
-@@ -258,19 +258,12 @@
+@@ -258,14 +258,12 @@ static void bti_curl_buffer_free(struct bti_curl_buffer *buffer)
  	free(buffer);
  }
  
--const char twitter_host[]  = "http://api.twitter.com/1.1/statuses";
+-const char twitter_host[]  = "https://api.twitter.com/1.1/statuses";
 -const char twitter_host_stream[]  = "https://stream.twitter.com/1.1/statuses"; /*this is not reset, and doesnt work */
--const char twitter_host_simple[]  = "http://api.twitter.com/1.1";
--const char identica_host[] = "https://identi.ca/api/statuses";
+-const char twitter_host_simple[]  = "https://api.twitter.com/1.1";
 -const char twitter_name[]  = "twitter";
--const char identica_name[] = "identi.ca";
--
++const char statusnet_host[]  = "https://status.net/api/statuses";
++const char statusnet_name[]  = "statusnet";
+ 
 -static const char twitter_request_token_uri[]  = "https://twitter.com/oauth/request_token";
 -static const char twitter_access_token_uri[]   = "https://twitter.com/oauth/access_token";
 -static const char twitter_authorize_uri[]      = "https://twitter.com/oauth/authorize?oauth_token=";
--static const char identica_request_token_uri[] = "https://identi.ca/api/oauth/request_token?oauth_callback=oob";
--static const char identica_access_token_uri[]  = "https://identi.ca/api/oauth/access_token";
--static const char identica_authorize_uri[]     = "https://identi.ca/api/oauth/authorize?oauth_token=";
-+const char statusnet_host[] = "https://status.net/api/statuses";
-+const char statusnet_name[] = "status.net";
-+
-+static const char statusnet_request_token_uri[] = "https://status.net/api/oauth/request_token?oauth_callback=oob";
-+static const char statusnet_access_token_uri[]  = "https://status.net/api/oauth/access_token";
-+static const char statusnet_authorize_uri[]     = "https://status.net/api/oauth/authorize?oauth_token=";
++static const char statusnet_request_token_uri[]  = "https://status.net/api/oauth/request_token?oauth_callback=oob";
++static const char statusnet_access_token_uri[]   = "https://status.net/api/oauth/access_token";
++static const char statusnet_authorize_uri[]      = "https://status.net/api/oauth/authorize?oauth_token=";
  static const char custom_request_token_uri[]   = "/../oauth/request_token?oauth_callback=oob";
  static const char custom_access_token_uri[]    = "/../oauth/access_token";
  static const char custom_authorize_uri[]       = "/../oauth/authorize?oauth_token=";
-@@ -855,14 +848,9 @@
+@@ -792,9 +790,9 @@ static int request_access_token(struct session *session)
  	if (!session)
  		return -EINVAL;
  
 -	if (session->host == HOST_TWITTER)
--		request_url = oauth_sign_url2(
--				twitter_request_token_uri, NULL,
--				OA_HMAC, NULL, session->consumer_key,
--				session->consumer_secret, NULL, NULL);
--	else if (session->host == HOST_IDENTICA)
 +	if (session->host == HOST_STATUSNET)
  		request_url = oauth_sign_url2(
--				identica_request_token_uri, NULL,
+-				twitter_request_token_uri, NULL,
 +				statusnet_request_token_uri, NULL,
  				OA_HMAC, NULL, session->consumer_key,
  				session->consumer_secret, NULL, NULL);
  	else {
-@@ -893,16 +881,11 @@
+@@ -825,11 +823,11 @@ static int request_access_token(struct session *session)
  		"Please open the following link in your browser, and "
  		"allow 'bti' to access your account. Then paste "
  		"back the provided PIN in here.\n");
@@ -152,16 +144,11 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  		verifier = session->readline(NULL);
  		sprintf(at_uri, "%s?oauth_verifier=%s",
 -			twitter_access_token_uri, verifier);
--	} else if (session->host == HOST_IDENTICA) {
--		fprintf(stdout, "%s%s\nPIN: ", identica_authorize_uri, at_key);
--		verifier = session->readline(NULL);
--		sprintf(at_uri, "%s?oauth_verifier=%s",
--			identica_access_token_uri, verifier);
 +			statusnet_access_token_uri, verifier);
  	} else {
  		fprintf(stdout, "%s%s%s\nPIN: ",
  			session->hosturl, custom_authorize_uri, at_key);
-@@ -956,7 +939,7 @@
+@@ -883,7 +881,7 @@ static int send_request(struct session *session)
  		return -EINVAL;
  
  	if (!session->hosturl)
@@ -170,7 +157,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  
  	if (session->no_oauth || session->guest) {
  		curl_buf = bti_curl_buffer_alloc(session->action);
-@@ -971,7 +954,7 @@
+@@ -898,7 +896,7 @@ static int send_request(struct session *session)
  		}
  
  		if (!session->hosturl)
@@ -179,7 +166,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  
  		switch (session->action) {
  		case ACTION_UPDATE:
-@@ -1032,7 +1015,7 @@
+@@ -959,7 +957,7 @@ static int send_request(struct session *session)
  
  		case ACTION_PUBLIC:
  			/*snprintf(endpoint, endpoint_size, "%s%s?page=%d", session->hosturl,*/
@@ -188,7 +175,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  				public_uri);
  			curl_easy_setopt(curl, CURLOPT_URL, endpoint);
  			break;
-@@ -1045,7 +1028,6 @@
+@@ -972,7 +970,6 @@ static int send_request(struct session *session)
  			break;
  
  		case ACTION_DIRECT:
@@ -196,7 +183,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  			break;
  
  		default:
-@@ -1125,7 +1107,6 @@
+@@ -1052,7 +1049,6 @@ static int send_request(struct session *session)
  	} else {
  		switch (session->action) {
  		case ACTION_UPDATE:
@@ -204,7 +191,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  			if (strlen_utf8(session->tweet) > 140 + 1000 ) {
  				printf("E: tweet is too long!\n");
  				goto skip_tweet;
-@@ -1156,7 +1137,7 @@
+@@ -1083,7 +1079,7 @@ static int send_request(struct session *session)
  				mentions_uri, session->page);
  			break;
  		case ACTION_PUBLIC:
@@ -213,7 +200,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  				public_uri);
  			break;
  		case ACTION_GROUP:
-@@ -1175,7 +1156,7 @@
+@@ -1102,7 +1098,7 @@ static int send_request(struct session *session)
  			break;
  		case ACTION_DIRECT:
  			escaped_tweet = oauth_url_escape(session->tweet);
@@ -222,7 +209,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  				direct_uri, session->user, escaped_tweet);
  			is_post = 1;
  			break;
-@@ -1766,14 +1747,10 @@
+@@ -1691,10 +1687,10 @@ int main(int argc, char *argv[], char *envp[])
  				free(session->hosturl);
  			if (session->hostname)
  				free(session->hostname);
@@ -230,10 +217,6 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
 -				session->host = HOST_TWITTER;
 -				session->hosturl = strdup(twitter_host);
 -				session->hostname = strdup(twitter_name);
--			} else if (strcasecmp(optarg, "identica") == 0) {
--				session->host = HOST_IDENTICA;
--				session->hosturl = strdup(identica_host);
--				session->hostname = strdup(identica_name);
 +			if (strcasecmp(optarg, "statusnet") == 0) {
 +				session->host = HOST_STATUSNET;
 +				session->hosturl = strdup(statusnet_host);
@@ -241,7 +224,7 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  			} else {
  				session->host = HOST_CUSTOM;
  				session->hosturl = strdup(optarg);
-@@ -1829,31 +1806,8 @@
+@@ -1750,31 +1746,8 @@ int main(int argc, char *argv[], char *envp[])
  	if (debug)
  		display_version();
  
@@ -275,9 +258,10 @@ diff -Nur bti-033/bti.c bti-nonprism/bti.c
  
  	if (session->no_oauth) {
  		if (!session->account) {
-diff -Nur bti-033/bti.example bti-nonprism/bti.example
---- bti-033/bti.example	2012-06-22 18:45:42.000000000 -0300
-+++ bti-nonprism/bti.example	2013-08-21 18:24:54.398011375 -0300
+diff --git a/bti.example b/bti.example
+index 57c55c9..29afa11 100644
+--- a/bti.example
++++ b/bti.example
 @@ -5,7 +5,7 @@
  # a message.
  account=twitmaster
@@ -287,40 +271,39 @@ diff -Nur bti-033/bti.example bti-nonprism/bti.example
  # Example of a custom StatusNet installation
  #host=http://army.twit.tv/api/statuses
  logfile=.bti.log
-diff -Nur bti-033/bti.h bti-nonprism/bti.h
---- bti-033/bti.h	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.h	2013-08-21 18:19:22.865702111 -0300
-@@ -17,8 +17,7 @@
+diff --git a/bti.h b/bti.h
+index 3d5ed9c..e466c2a 100644
+--- a/bti.h
++++ b/bti.h
+@@ -17,7 +17,7 @@
  #define __BTI_H
  
  enum host {
 -	HOST_TWITTER  = 0,
--	HOST_IDENTICA = 1,
-+	HOST_STATUSNET = 1,
++	HOST_STATUSNET  = 1,
  	HOST_CUSTOM   = 2
  };
  
-@@ -76,10 +75,8 @@
+@@ -75,8 +75,8 @@ struct bti_curl_buffer {
  	int length;
  };
  
 -extern const char twitter_host[];
--extern const char identica_host[];
 -extern const char twitter_name[];
--extern const char identica_name[];
 +extern const char statusnet_host[];
 +extern const char statusnet_name[];
  extern int debug;
  
  extern void bti_parse_configfile(struct session *session);
-diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
---- bti-033/bti.xml	2013-06-27 18:23:38.000000000 -0300
-+++ bti-nonprism/bti.xml	2013-08-21 18:22:20.722310079 -0300
+diff --git a/bti.xml b/bti.xml
+index c0b89ee..00ad9a8 100644
+--- a/bti.xml
++++ b/bti.xml
 @@ -21,7 +21,7 @@
  
        <refnamediv>
          <refname>bti</refname>
--        <refpurpose>send a tweet to twitter.com or identi.ca from the command line</refpurpose>
+-        <refpurpose>send a tweet to twitter.com from the command line</refpurpose>
 +        <refpurpose>send a tweet to status.net from the command line</refpurpose>
        </refnamediv>
  
@@ -329,8 +312,8 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
        </refsynopsisdiv>
  
        <refsect1><title>DESCRIPTION</title>
--        <para>bti sends a tweet message to twitter.com or identi.ca.
-+        <para>bti sends a tweet message or status.net.
+-        <para>bti sends a tweet message to twitter.com.
++        <para>bti sends a tweet message to status.net.
          </para>
        </refsect1>
  
@@ -338,7 +321,7 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
              <term><option>--account account</option></term>
              <listitem>
                <para>
--	        Specify the twitter.com or identi.ca account name.
+-	        Specify the twitter.com account name.
 +	        Specify the status.net account name.
  	      </para>
              </listitem>
@@ -347,25 +330,17 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
              <term><option>--password password</option></term>
              <listitem>
                <para>
--                Specify the password of your twitter.com or identi.ca account.
+-                Specify the password of your twitter.com account.
 +                Specify the password of your status.net account.
                </para>
              </listitem>
            </varlistentry>
-@@ -100,15 +100,15 @@
+@@ -100,10 +100,10 @@
              <listitem>
                <para>
  		Specify the host which you want to send your message to.  Valid
--		options are "twitter" to send to twitter.com and "identica" to
--        send to identi.ca.
-+		options are "statusnet" to
-+        send to status.net.
- 
-         If you want to send the message to a custom StatusNet installation,
--        you should specify the API URI. For example identi.ca's URI is:
--        https://identi.ca/api/statuses
-+        you should specify the API URI. For example status.net's URI is:
-+        https://status.net/api/statuses
+-		options are "twitter" to send to twitter.com.
++		options are "statusnet" to send to status.net.
                </para>
                <para>
 -		If no host is specified, the default is to send to twitter.com.
@@ -373,7 +348,7 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
                </para>
              </listitem>
            </varlistentry>
-@@ -154,10 +154,6 @@
+@@ -149,10 +149,6 @@
  		reply to.
  	      </para>
  	      <para>
@@ -384,45 +359,38 @@ diff -Nur bti-033/bti.xml bti-nonprism/bti.xml
  	        For status.net, this can link any two messages into context with
  		each other. Status.net will also link a message that contains an
  		@name without this without regard to context.
-@@ -306,7 +302,7 @@
+@@ -301,7 +297,7 @@
               <term><option>account</option></term>
               <listitem>
                 <para>
--                 The twitter.com or identi.ca account name you wish to use to send this
+-                 The twitter.com account name you wish to use to send this
 +                 The status.net account name you wish to use to send this
                   message with.
                 </para>
               </listitem>
-@@ -315,7 +311,7 @@
+@@ -310,7 +306,7 @@
               <term><option>password</option></term>
               <listitem>
                 <para>
--                 The twitter.com or identi.ca password for the account you wish to use
+-                 The twitter.com password for the account you wish to use
 +                 The status.net password for the account you wish to use
                   to send this message with.
                 </para>
               </listitem>
-@@ -346,12 +342,12 @@
+@@ -341,7 +337,7 @@
               <listitem>
                 <para>
  		 The host you want to use to send the message to.  Valid
--		 options are either "twitter" or "identica" to send to
--		 twitter.com or identi.ca respectively.
-+		 options are either "statusnet" to send to
-+		 status.net respectively.
+-		 options is "twitter" or "custom" to specify your own server.
++		 options is "statusnet" or "custom" to specify your own server.
  
-          If you want to send the message to a custom StatusNet installation,
--         you should specify the API URI. For example identi.ca's URI is:
--         https://identi.ca/api/statuses.
-+         you should specify the API URI. For example status.net's URI is:
-+         https://status.net/api/statuses.
                 </para>
               </listitem>
-            </varlistentry>
-diff -Nur bti-033/config.c bti-nonprism/config.c
---- bti-033/config.c	2013-04-23 20:18:04.000000000 -0300
-+++ bti-nonprism/config.c	2013-08-21 18:17:39.798533227 -0300
-@@ -219,14 +219,10 @@
+diff --git a/config.c b/config.c
+index e6fecc1..0bbc186 100644
+--- a/config.c
++++ b/config.c
+@@ -219,10 +219,10 @@ static int retweet_callback(struct session *session, char *value)
  
  static int host_callback(struct session *session, char *value)
  {
@@ -430,10 +398,6 @@ diff -Nur bti-033/config.c bti-nonprism/config.c
 -		session->host = HOST_TWITTER;
 -		session->hosturl = strdup(twitter_host);
 -		session->hostname = strdup(twitter_name);
--	} else if (strcasecmp(value, "identica") == 0) {
--		session->host = HOST_IDENTICA;
--		session->hosturl = strdup(identica_host);
--		session->hostname = strdup(identica_name);
 +	if (strcasecmp(value, "statusnet") == 0) {
 +		session->host = HOST_STATUSNET;
 +		session->hosturl = strdup(statusnet_host);