Remove some redundant HTTP messaging code.

SoupSession has a provision to define the User-Agent to use for all the
SoupMessages sent through it.  This simplifies the login code a bit.

diff --git a/login-amazon.c b/login-amazon.c
index 4de5fa26ddc8268ffff630e469c2cb2bf5097ce9..33234ea267fbe6b326e25eb99d591d45aebabc99 100644 (file)
--- a/login-amazon.c
+++ b/login-amazon.c
@@ -64,7 +64,6 @@ static void login_result_cb(SoupSession *session, SoupMessage *msg, gpointer dat
                                                       form->action,
                                                       form->params);
 
-               soup_message_headers_append(next->request_headers, "User-Agent", "Pidgin-Chime " PACKAGE_VERSION);
                soup_session_queue_message(login_session(state), next, login_result_cb, state);
 
                login_free_form(form);
@@ -105,7 +104,6 @@ static void send_credentials(struct login_amzn *state, const gchar *password)
        msg = soup_form_request_new_from_hash(state->form->method,
                                              state->form->action,
                                              state->form->params);
-       soup_message_headers_append(msg->request_headers, "User-Agent", "Pidgin-Chime " PACKAGE_VERSION);
        soup_session_queue_message(login_session(state), msg, login_result_cb, state);
 
        clear_form(state);

diff --git a/login-warpdrive.c b/login-warpdrive.c
index 37b34090eed203b596264d1f9f797d8be5a3d057..eb80e536e21ef6750d9998e0cbe2c640704b8a75 100644 (file)
--- a/login-warpdrive.c
+++ b/login-warpdrive.c
@@ -275,7 +275,6 @@ static void gwt_auth_cb(SoupSession *session, SoupMessage *msg, gpointer data)
                                     "organization", state->directory,
                                     "region", state->region,
                                     "auth_code", response[2], NULL);
-       soup_message_headers_append(next->request_headers, "User-Agent", "Pidgin-Chime " PACKAGE_VERSION);
        soup_session_queue_message(session, next, chime_login_token_cb, state);
  out:
        g_strfreev(response);
@@ -298,7 +297,6 @@ static void send_credentials(struct login_wd *state, const gchar *password)
                          type, type, "", "", state->client_id, "", NULL,
                          state->directory, safe_password, "", state->username);
 
-       soup_message_headers_append(msg->request_headers, "User-Agent", "Pidgin-Chime " PACKAGE_VERSION);
        soup_session_queue_message(login_session(state), msg, gwt_auth_cb, state);
 
        g_free(safe_password);
@@ -433,7 +431,6 @@ static void gwt_policy_cb(SoupSession *session, SoupMessage *msg, gpointer data)
                           type, type, "ONFAILURE", state->client_id,
                           state->directory, NULL, NULL, state->redirect_url);
 
-       soup_message_headers_append(next->request_headers, "User-Agent", "Pidgin-Chime " PACKAGE_VERSION);
        soup_session_queue_message(session, next, gwt_region_cb, state);
 }
 
@@ -458,7 +455,6 @@ static void gwt_entry_point_cb(SoupSession *session, SoupMessage *msg, gpointer
        destination = soup_uri_new_with_base(base, policy_path);
 
        next = soup_message_new_from_uri(SOUP_METHOD_GET, destination);
-       soup_message_headers_append(next->request_headers, "User-Agent", "Pidgin-Chime " PACKAGE_VERSION);
        soup_session_queue_message(session, next, gwt_policy_cb, state);
 
        soup_uri_free(destination);
@@ -513,7 +509,6 @@ void chime_login_warpdrive(SoupSession *session, SoupMessage *msg, gpointer data
        state->gwt_module_base = g_strndup(gwt[0], (sep - gwt[0]) + 1);
 
        next = soup_message_new(SOUP_METHOD_GET, gwt[0]);
-       soup_message_headers_append(next->request_headers, "User-Agent", "Pidgin-Chime " PACKAGE_VERSION);
        soup_session_queue_message(session, next, gwt_entry_point_cb, state);
  out:
        g_strfreev(gwt);

diff --git a/login.c b/login.c
index 36a57e31ef24465580dd5e7564f7f525b4acda5d..7ccc6425495ad0b908c45050696ccedbc847e76b 100644 (file)
--- a/login.c
+++ b/login.c
@@ -425,7 +425,6 @@ static void signin_search_result_cb(SoupSession *session, SoupMessage *msg, gpoi
 
        destination = soup_uri_new_with_base(soup_message_get_uri(msg), path);
        next = soup_message_new_from_uri(SOUP_METHOD_GET, destination);
-       soup_message_headers_append(next->request_headers, "User-Agent", "Pidgin-Chime " PACKAGE_VERSION);
        soup_message_set_first_party(next, destination);
        soup_session_queue_message(session, next, handler, state);
        soup_uri_free(destination);
@@ -450,7 +449,6 @@ static void signin_page_cb(SoupSession *session, SoupMessage *msg, gpointer data
        g_hash_table_insert(form->params, g_strdup(form->email_name),
                            g_strdup(login_account_email(state)));
        next = soup_form_request_new_from_hash(form->method, form->action, form->params);
-       soup_message_headers_append(next->request_headers, "User-Agent", "Pidgin-Chime " PACKAGE_VERSION);
        soup_session_queue_message(session, next, signin_search_result_cb, state);
  out:
        login_free_form(form);
@@ -483,7 +481,10 @@ void chime_initial_login(ChimeConnection *cxn)
        state = g_new0(struct login, 1);
        state->connection = g_object_ref(cxn);
        state->session = soup_session_new_with_options(SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                      SOUP_TYPE_COOKIE_JAR, NULL);
+                                                      SOUP_TYPE_COOKIE_JAR,
+                                                      SOUP_SESSION_USER_AGENT,
+                                                      "Pidgin-Chime " PACKAGE_VERSION " ",
+                                                      NULL);
        /* TODO: This needs to go somewhere else */
        if (getenv("CHIME_DEBUG") && atoi(getenv("CHIME_DEBUG")) > 0) {
                SoupLogger *l = soup_logger_new(SOUP_LOGGER_LOG_BODY, -1);