pidgin-twitter: twitter_api.c comparison

comparison twitter_api.c @ 357:732de90812d8

- fixed memory leaks - some code cleanups

author	Yoshiki Yazawa <yaz@honeyplanet.jp>
date	Fri, 27 Aug 2010 01:13:44 +0900
parents	0fe895195132
children	c6392a86839b

comparison

equal deleted inserted replaced

-:e8e51c70793c
+:732de90812d8
 static void post_status_with_api_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, size_t len, const gchar *error_message);
 /* oauth */
 #define TYPE_GET  0
 #define TYPE_POST 1
+char *c_key = "wrD3WGIh2P31d3fIjRkfcw";
+char *c_sec = "ZEhViGY8P5IPjwgV8EVOkdjHhShRAZ9yhlYw0ZDXU";
+char *SAMPLE_NONCE = "0123456789abcdefghijk";
 typedef struct oauth_request {
 char *url;
 char *c_key;
 char *c_sec;
 char *make_oauth_get(oauth_request_t *oauth_req);
 char *make_oauth_post(oauth_request_t *auth_req);
 static void oauth_setup_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, size_t len, const gchar *error_message);
 #ifdef _WIN32
 extern gboolean blink_state;
 extern gboolean blink_modified;
 #endif
 extern guint64 reply_to_msgid;
 extern PurpleAccount *account_for_twitter;
-char *request_token_url = "http://twitter.com/oauth/request_token";
-char *access_token_url  = "http://twitter.com/oauth/access_token";
+/* oauth functions */
-char *authorize_url     = "http://twitter.com/oauth/authorize";
-char *c_key = "wrD3WGIh2P31d3fIjRkfcw";
-char *c_sec = "ZEhViGY8P5IPjwgV8EVOkdjHhShRAZ9yhlYw0ZDXU";
-char *SAMPLE_NONCE = "0123456789abcdefghijk";
 void
 oauth_access_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
 const gchar *url_text, size_t len,
 const gchar *error_message)
 {
 pin_dialog_ok_cb(gpointer data, char *pin)
 {
 char *oauth = NULL;
 char *request = NULL;
 oauth_request_t *oauth_req = (oauth_request_t *)data;
 /*
 request URL:http://twitter.com/oauth/access_token?
 oauth_consumer_key=wrD3WGIh2P31d3fIjRkfcw&
 oauth_nonce=QUzhkt0AO3tjNrR&
 oauth_signature_method=HMAC-SHA1&
 oauth_timestamp=1282450223&
 oauth_token=VL126k8KRNXid7Q7ZHYHh05PuASunVaPzyzrozf14&
 oauth_verifier=9772286&
 oauth_version=1.0&
 oauth_signature=OyBsxqWdsvLkV4LBnN8tMBnImVY%3D
 */
 /* access token*/
 g_free(oauth_req->url);
-oauth_req->url = g_strdup(access_token_url);
+oauth_req->url = g_strdup(ACCESS_TOKEN_URL);
 oauth_req->verifier = g_strdup(pin);
 oauth_req->type = TYPE_GET;
 oauth_req->notoken = FALSE;
 twitter_debug("a_key=%s\n", oauth_req->a_key);
 oauth = make_oauth_get(oauth_req);
-request = g_strdup_printf("%s?%s", access_token_url, oauth);
+request = g_strdup_printf("%s?%s", ACCESS_TOKEN_URL, oauth);
 twitter_debug("request=%s\n", request);
 purple_util_fetch_url_request(request, TRUE,
 NULL, TRUE, NULL, TRUE,
 oauth_access_cb, data);
 HTTP-reply:
 oauth_token=zKILrNcVPGRtUE6Rlh1KU6upYNJWW51mzt7btZx5Ac&
 oauth_token_secret=EMD3u1piAKPsQnq44Its9f8WmIReYnUFcJIgd3niu4&
 oauth_callback_confirmed=true
 */
 /* separate key and secret */
 f = strstr(url_text, "oauth_token=");
 if(!f)
 return;
 e = strstr(f, "&");
 if(!e)
 return;
 g_free(oauth_req->a_sec);
 oauth_req->a_sec = g_strndup(f+19, e-f-19);
-/* redirect twitter's authorization url */
+/* redirect to twitter's authorization url */
-char *uri = g_strdup_printf("%s?oauth_token=%s", authorize_url, oauth_req->a_key);
+char *uri = g_strdup_printf("%s?oauth_token=%s", AUTHORIZE_URL, oauth_req->a_key);
 twitter_debug("auth uri=%s\n", uri);
 purple_notify_uri(conn, uri);
-/* show dialog to wait PIN number*/
+/* show dialog to wait PIN */
 purple_request_input(conn,
 "PIN",
 "Enter PIN",
 "Press allow button in the browser, then enter the PIN  to complete process.",
 "",
 void
 oauth_setup(gpointer data)
 {
 char *oauth = NULL;
 char *request = NULL;
-oauth_request_t *oauth_req = g_new0(oauth_request_t, 1);
+oauth_request_t *oauth_req = g_new0(oauth_request_t, 1); /* persistent */
 /*
 http://twitter.com/oauth/request_token?
 oauth_consumer_key=wrD3WGIh2P31d3fIjRkfcw&
 oauth_nonce=HCUxu1D3qN4Nklr9QVAymve40PtJyU&
 oauth_signature_method=HMAC-SHA1&
 oauth_timestamp=1282446611&oauth_version=1.0&
 oauth_signature=A%2BZIiUVsQv5ZR8u%2F2oLmUFX1eHE%3D
 */
-oauth_req->url = strdup(request_token_url);
+oauth_req->url = strdup(REQUEST_TOKEN_URL);
 oauth_req->c_key = strdup(c_key);
 oauth_req->c_sec = strdup(c_sec);
 oauth_req->a_key = NULL;
 oauth_req->a_sec = NULL;
 oauth_req->type = TYPE_GET;
 oauth_req->notoken = TRUE;
 oauth_req->conv = (PurpleConversation *)data;
 /* request token*/
 oauth = make_oauth_get(oauth_req);
-request = g_strdup_printf("%s?%s", request_token_url, oauth);
+request = g_strdup_printf("%s?%s", REQUEST_TOKEN_URL, oauth);
 twitter_debug("request=%s\n", request);
 purple_util_fetch_url_request(request, TRUE,
 NULL, TRUE, NULL, TRUE,
 oauth_req.count = count;
 oauth_req.msgid = 0;
 oauth_req.notoken = FALSE;
 oauth = make_oauth_get(&oauth_req);
+g_free(url0);
 /* header */
 header = g_strdup_printf(TWITTER_STATUS_GET, oauth);
 request = g_strconcat(header, "\r\n", NULL);
 get_status_with_api_cb, data);
 g_free(header);
 g_free(request);
 g_free(oauth);
-g_free(url0);
 return TRUE;
 }
 /****************************/
 /* API based post functions */
 oauth_req.count = 0;
 oauth_req.msgid = reply_to_msgid;
 oauth_req.notoken = FALSE;
 oauth = make_oauth_post(&oauth_req);
+g_free(url0);
 reply_to_msgid = 0;
 header = g_strdup_printf(TWITTER_STATUS_POST,
 (int)strlen(oauth));
 request = g_strconcat(header, "\r\n", oauth, "\r\n", NULL);
 oauth_req.count = 0;
 oauth_req.msgid = 0;
 oauth_req.notoken = FALSE;
 oauth = make_oauth_post(&oauth_req);
+g_free(url0);
 header = g_strdup_printf(TWITTER_FAV_POST,
 (long long unsigned int)id,
 (int)strlen(oauth));
 oauth_req.count = 0;
 oauth_req.msgid = 0;
 oauth_req.notoken = FALSE;
 oauth = make_oauth_post(&oauth_req);
+g_free(url0);
 header = g_strdup_printf(TWITTER_RETWEET_POST,
 (long long unsigned int)id,
 (int)strlen(oauth));

Mercurial > pidgin-twitter

comparison twitter_api.c @ 357:732de90812d8