Changeset f924563 for protocols/twitter/twitter_http.c

Timestamp:

2010-05-03T00:52:08Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1a3ba05

Parents:

6a9d068 (diff), 6824fb3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline merge.

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"
@@ -35 +34 @@
 #include "misc.h"
 #include "base64.h"
+#include "oauth.h"
 #include <ctype.h>
 #include <errno.h>
+
+#include "twitter_http.h"
 
 
@@ -45 +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** 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 );
@@ -110 +112 @@
 
         // If a pass and user are given we append them to the request.
-        if (userpass_base64)
+        if (oi)
+        {
+                char *full_header;
+                
+                full_header = oauth_http_header(oi, is_post ? "POST" : "GET",
+                                                url_string, url_arguments);
+                
+                tmp = g_strdup_printf("%sAuthorization: %s\r\n", request, full_header);
+                g_free(request);
+                g_free(full_header);
+                request = tmp;
+        }
+        else if (userpass_base64)
         {
                 tmp = g_strdup_printf("%sAuthorization: Basic %s\r\n", request, userpass_base64);