Changeset 5f40da7 for protocols/twitter/twitter.c

Timestamp:

2011-12-26T10:51:19Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

199fea6

Parents:

96f954d (diff), 644b808 (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:

Merging oauth-xmpp branch, which adds support for OAuth2 authentication
against some XMPP services (Google Talk, Facebook and Microsoft's MSN-XMPP
gateway).

File:

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

protocols/twitter/twitter.c

@@ -220 +220 @@
         } else {                /* if( strcmp( acc->prpl->name, "identica" ) == 0 ) */
                 def_url = IDENTICA_API_URL;
-                def_oauth = "false";
+                def_oauth = "true";
         }
 
@@ -240 +240 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
+        s = set_add(&acc->set, "oauth", def_oauth, set_eval_oauth, acc);
+
         s = set_add(&acc->set, "show_ids", "false", set_eval_bool, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
         s = set_add(&acc->set, "show_old_mentions", "true", set_eval_bool, acc);
-
-        s = set_add(&acc->set, "oauth", def_oauth, set_eval_bool, acc);
 }