Merge branch 'master' of git://github.com/amir/bti

diff --cc bti.c
index 4cdce35e86fc2c6c78433212c81abc8991e247fc,0f58d70237739b2aeafd02545a66c2fa519d9bcc..69efeb3c49639a945718d9796c84936c4948e4aa
--- 1/bti.c
--- 2/bti.c
+++ b/bti.c
@@@ -170,17 -173,14 +173,14 @@@ static void bti_curl_buffer_free(struc
        free(buffer);
  }
  
- static const char *twitter_user_url    = "http://twitter.com/statuses/user_timeline/";
- static const char *twitter_update_url  = "https://twitter.com/statuses/update.xml";
- static const char *twitter_public_url  = "http://twitter.com/statuses/public_timeline.xml";
- static const char *twitter_friends_url = "https://twitter.com/statuses/friends_timeline.xml";
- static const char *twitter_replies_url = "http://twitter.com/statuses/replies.xml";
+ static const char *twitter_host  = "http://twitter.com/statuses";
 -static const char *identica_host = "http://identi.ca/api/statuses";
++static const char *identica_host = "https://identi.ca/api/statuses";
  
- static const char *identica_user_url    = "https://identi.ca/api/statuses/user_timeline/";
- static const char *identica_update_url  = "https://identi.ca/api/statuses/update.xml";
- static const char *identica_public_url  = "https://identi.ca/api/statuses/public_timeline.xml";
- static const char *identica_friends_url = "https://identi.ca/api/statuses/friends_timeline.xml";
- static const char *identica_replies_url = "https://identi.ca/api/statuses/replies.xml";
+ static const char *user_uri    = "/user_timeline/";
+ static const char *update_uri  = "/update.xml";
+ static const char *public_uri  = "/public_timeline.xml";
+ static const char *friends_uri = "/friends_timeline.xml";
+ static const char *replies_uri = "/replies.xml";
  
  static CURL *curl_init(void)
  {