Changeset f2d8aa2

Timestamp:

2013-06-01T00:09:52Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

aed00f8

Parents:

420ddc00

Message:

Emit a warning when the user wants to do OAuth with a non-Twitter/identi.ca
service, and string handling fix when pretending to do this anyway.

File:

• protocols/twitter/twitter.c (modified) (3 diffs)

protocols/twitter/twitter.c

@@ -158 +158 @@
 {
         struct twitter_data *td = ic->proto_data;
+        const char *url = set_getstr(&ic->acc->set, "base_url");
 
         imcb_log(ic, "Requesting OAuth request token");
+        
+        if (!strstr(url, "twitter.com") && !strstr(url, "identi.ca"))
+                imcb_log(ic, "Warning: OAuth only works with identi.ca and "
+                             "Twitter.");
 
         td->oauth_info = oauth_request_token(get_oauth_service(ic), twitter_oauth_callback, ic);
@@ -178 +183 @@
         td = ic->proto_data;
         if (info->stage == OAUTH_REQUEST_TOKEN) {
-                char name[strlen(ic->acc->user) + 9], *msg;
+                char *name, *msg;
 
                 if (info->request_token == NULL) {
@@ -186 +191 @@
                 }
 
-                sprintf(name, "%s_%s", td->prefix, ic->acc->user);
+                name = g_strdup_printf("%s_%s", td->prefix, ic->acc->user);
                 msg = g_strdup_printf("To finish OAuth authentication, please visit "
                                       "%s and respond with the resulting PIN code.",
                                       info->auth_url);
                 imcb_buddy_msg(ic, name, msg, 0, 0);
+                g_free(name);
                 g_free(msg);
         } else if (info->stage == OAUTH_ACCESS_TOKEN) {