Changes in protocols/twitter/twitter.c [0e788f5:777461b]

File:

• protocols/twitter/twitter.c (modified) (5 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) {
@@ -283 +289 @@
         char *def_url;
         char *def_tul;
+        char *def_mentions;
 
         if (strcmp(acc->prpl->name, "twitter") == 0) {
                 def_url = TWITTER_API_URL;
                 def_tul = "20";
+                def_mentions = "true";
         } else {                /* if( strcmp( acc->prpl->name, "identica" ) == 0 ) */
                 def_url = IDENTICA_API_URL;
                 def_tul = "0";
+                def_mentions = "false";
         }
 
@@ -302 +311 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
-        s = set_add(&acc->set, "fetch_mentions", "true", set_eval_bool, acc);
+        s = set_add(&acc->set, "fetch_mentions", def_mentions, set_eval_bool, acc);
 
         s = set_add(&acc->set, "message_length", "140", set_eval_int, acc);