diff options
| author | Marius Halden <marius.h@lden.org> | 2016-05-20 23:02:45 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-05-20 23:02:45 +0200 |
| commit | 36e282c49b0dc22ea31c157cf9f8268d44814e06 (patch) | |
| tree | 384d97562fb4a66b46566522765891ab4284ef7b /protocols | |
| parent | dbb146b273dccad03e1aa5561926b808e104e3f0 (diff) | |
| parent | d3b99b6f68a7b030c653c4086de7bbba76a30636 (diff) | |
Merge branch 'master' into patched-master
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/jabber/iq.c | 1 | ||||
| -rw-r--r-- | protocols/twitter/twitter_http.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/protocols/jabber/iq.c b/protocols/jabber/iq.c index a001ce8c..2fa418fe 100644 --- a/protocols/jabber/iq.c +++ b/protocols/jabber/iq.c @@ -66,7 +66,6 @@ xt_status jabber_pkt_iq(struct xt_node *node, gpointer data) if (strcmp(s, XMLNS_VERSION) == 0) { xt_add_child(reply, xt_new_node("name", set_getstr(&ic->acc->set, "user_agent"), NULL)); xt_add_child(reply, xt_new_node("version", BITLBEE_VERSION, NULL)); - xt_add_child(reply, xt_new_node("os", ARCH, NULL)); } else if (strcmp(s, XMLNS_TIME_OLD) == 0) { time_t time_ep; char buf[1024]; diff --git a/protocols/twitter/twitter_http.c b/protocols/twitter/twitter_http.c index c06cac39..94826fc6 100644 --- a/protocols/twitter/twitter_http.c +++ b/protocols/twitter/twitter_http.c @@ -78,7 +78,7 @@ struct http_request *twitter_http(struct im_connection *ic, char *url_string, ht // Make the request. g_string_printf(request, "%s %s%s%s%s HTTP/1.1\r\n" "Host: %s\r\n" - "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n", + "User-Agent: BitlBee " BITLBEE_VERSION "\r\n", is_post ? "POST" : "GET", base_url ? base_url->file : td->url_path, base_url ? "" : url_string, |