Changeset c2ecadc for protocols/twitter/twitter_http.c

Timestamp:

2010-05-01T13:53:59Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f4b0911

Parents:

85ef57f

Message:

Cleaned up OAuth stuff: consumer key/secret should *not* be in lib/oauth.c.
Keep it in the Twitter module, and use the oauth_info struct through the
whole session to keep all this together.

File:

• protocols/twitter/twitter_http.c (modified) (4 diffs)

protocols/twitter/twitter_http.c

@@ -29 +29 @@
 ****************************************************************************/ 
 
-#include "twitter_http.h"
 #include "twitter.h"
 #include "bitlbee.h"
@@ -39 +38 @@
 #include <errno.h>
 
+#include "twitter_http.h"
+
 
 char *twitter_url_append(char *url, char *key, char* value);
@@ -46 +47 @@
  * This is actually pretty generic function... Perhaps it should move to the lib/http_client.c
  */
-void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post, char* user, char* pass, char* oauth_token, char** arguments, int arguments_len)
+void *twitter_http(char *url_string, http_input_function func, gpointer data, int is_post, char* user, char* pass, struct oauth_info* oi, char** arguments, int arguments_len)
 {
         url_t *url = g_new0( url_t, 1 );
@@ -111 +112 @@
 
         // If a pass and user are given we append them to the request.
-        if (oauth_token)
+        if (oi)
         {
                 char *full_header;
                 
-                full_header = oauth_http_header(oauth_token,
-                                                is_post ? "POST" : "GET",
+                full_header = oauth_http_header(oi, is_post ? "POST" : "GET",
                                                 url_string, url_arguments);