Mercurial > pidgin3 / changeset

--- a/finch/plugins/gnttinyurl.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/finch/plugins/gnttinyurl.c	Fri Aug 09 13:03:26 2013 +0200
@@ -213,7 +213,7 @@
 	GList *convs = purple_get_conversations();
 	const gchar *url;
 
-	if (purple_http_response_is_successfull(response))
+	if (purple_http_response_is_successful(response))
 		url = purple_http_response_get_data(response, NULL);
 	else
 		url = _("Error while querying TinyURL");
@@ -360,7 +360,7 @@
 	char *message;
 	const gchar *url;
 
-	if (!purple_http_response_is_successfull(response))
+	if (!purple_http_response_is_successful(response))
 		return;
 
 	url = purple_http_response_get_data(response, NULL);

--- a/libpurple/http.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/http.c	Fri Aug 09 13:03:26 2013 +0200
@@ -1645,7 +1645,7 @@
 	g_return_if_fail(hc != NULL);
 
 	purple_debug_misc("http", "Request %p performed %s.\n", hc,
-		purple_http_response_is_successfull(hc->response) ?
+		purple_http_response_is_successful(hc->response) ?
 		"successfully" : "without success");
 
 	if (hc->callback)
@@ -2693,7 +2693,7 @@
 	g_free(response);
 }
 
-gboolean purple_http_response_is_successfull(PurpleHttpResponse *response)
+gboolean purple_http_response_is_successful(PurpleHttpResponse *response)
 {
 	int code;
 
@@ -2726,7 +2726,7 @@
 	if (response->error != NULL)
 		return response->error;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		static gchar errmsg[200];
 		if (response->code <= 0) {
 			g_snprintf(errmsg, sizeof(errmsg),

--- a/libpurple/http.h	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/http.h	Fri Aug 09 13:03:26 2013 +0200
@@ -754,7 +754,7 @@
  * @param response The response.
  * @return         TRUE, if request was performed successfully.
  */
-gboolean purple_http_response_is_successfull(PurpleHttpResponse *response);
+gboolean purple_http_response_is_successful(PurpleHttpResponse *response);
 
 /**
  * Gets HTTP response code.

--- a/libpurple/protocols/gg/avatar.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/gg/avatar.c	Fri Aug 09 13:03:26 2013 +0200
@@ -275,7 +275,7 @@
 	g_assert(pending_update == avdata->current_update);
 	avdata->current_update = NULL;
 
-	if (!purple_http_response_is_successfull(response))
+	if (!purple_http_response_is_successful(response))
 	{
 		purple_debug_error("gg", "ggp_avatar_buddy_update_received: bad"
 			" response while getting avatar for %u: %s\n",
@@ -388,7 +388,7 @@
 	if (!PURPLE_CONNECTION_IS_VALID(gc))
 		return;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_debug_error("gg", "ggp_avatar_own_sent: "
 			"avatar not sent. %s\n",
 			purple_http_response_get_error(response));

--- a/libpurple/protocols/gg/oauth/oauth-purple.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/gg/oauth/oauth-purple.c	Fri Aug 09 13:03:26 2013 +0200
@@ -122,7 +122,7 @@
 	}
 	account = purple_connection_get_account(data->gc);
 
-	if (!purple_http_response_is_successfull(response))
+	if (!purple_http_response_is_successful(response))
 	{
 		purple_debug_error("gg", "ggp_oauth_request_token_got: "
 			"requested token not received\n");

--- a/libpurple/protocols/gg/pubdir-prpl.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/gg/pubdir-prpl.c	Fri Aug 09 13:03:26 2013 +0200
@@ -973,7 +973,7 @@
 static void ggp_pubdir_set_info_got_response(PurpleHttpConnection *http_conn,
 	PurpleHttpResponse *response, gpointer user_data)
 {
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_debug_error("gg", "ggp_pubdir_set_info_got_response: "
 			"failed\n");
 		return;

--- a/libpurple/protocols/jabber/bosh.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/jabber/bosh.c	Fri Aug 09 13:03:26 2013 +0200
@@ -192,7 +192,7 @@
 		return NULL;
 	}
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_connection_error(conn->js->gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 			_("Unable to connect"));

--- a/libpurple/protocols/jabber/google/relay.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/jabber/google/relay.c	Fri Aug 09 13:03:26 2013 +0200
@@ -80,7 +80,7 @@
 
 	purple_debug_info("jabber", "got response on HTTP request to relay server\n");
 
-	if (purple_http_response_is_successfull(response)) {
+	if (purple_http_response_is_successful(response)) {
 		const gchar *got_data =
 			purple_http_response_get_data(response, NULL);
 		purple_debug_info("jabber", "got Google relay request response:\n%s\n",

--- a/libpurple/protocols/jabber/oob.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/jabber/oob.c	Fri Aug 09 13:03:26 2013 +0200
@@ -82,7 +82,7 @@
 	jox = purple_xfer_get_protocol_data(xfer);
 	jox->hc = NULL;
 
-	if (!purple_http_response_is_successfull(response) ||
+	if (!purple_http_response_is_successful(response) ||
 		purple_xfer_get_bytes_remaining(xfer) > 0)
 	{
 		purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_REMOTE);

--- a/libpurple/protocols/jabber/useravatar.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/jabber/useravatar.c	Fri Aug 09 13:03:26 2013 +0200
@@ -268,7 +268,7 @@
 	const gchar *got_data;
 	size_t got_len;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_debug_error("jabber", "do_buddy_avatar_update_fromurl "
 			"got error \"%s\"",
 			purple_http_response_get_error(response));

--- a/libpurple/protocols/msn/httpconn.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/msn/httpconn.c	Fri Aug 09 13:03:26 2013 +0200
@@ -303,7 +303,7 @@
 	const gchar *got_data;
 	size_t got_len;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		httpconn->current_request = NULL;
 		msn_servconn_got_error(httpconn->servconn,
 			MSN_SERVCONN_ERROR_READ,

--- a/libpurple/protocols/msn/msn.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/msn/msn.c	Fri Aug 09 13:03:26 2013 +0200
@@ -2342,7 +2342,7 @@
 	user_info = purple_notify_user_info_new();
 	has_tooltip_text = msn_tooltip_extract_info_text(user_info, info_data);
 
-	if (!purple_http_response_is_successfull(response))
+	if (!purple_http_response_is_successful(response))
 	{
 		purple_notify_user_info_add_pair_html(user_info,
 				_("Error retrieving profile"), NULL);
@@ -2757,7 +2757,7 @@
 	char *photo_url_text = info2_data->photo_url_text;
 
 	/* Try to put the photo in there too, if there's one and is readable */
-	if (response && purple_http_response_is_successfull(response))
+	if (response && purple_http_response_is_successful(response))
 	{
 		char buf[1024];
 		const gchar *photo_data;

--- a/libpurple/protocols/msn/slp.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/msn/slp.c	Fri Aug 09 13:03:26 2013 +0200
@@ -177,7 +177,7 @@
 	MsnFetchUserDisplayData *data = _data;
 	MsnSession *session = data->session;
 
-	if (purple_http_response_is_successfull(response)) {
+	if (purple_http_response_is_successful(response)) {
 		size_t len;
 		const gchar *icon_data;
 

--- a/libpurple/protocols/msn/soap.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/msn/soap.c	Fri Aug 09 13:03:26 2013 +0200
@@ -145,7 +145,7 @@
 		msn_soap_request_free(sreq);
 		return;
 	}
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_debug_error("msn-soap", "SOAP request failed\n");
 		msn_session_set_error(sreq->soaps->session,
 			MSN_ERROR_SERV_UNAVAILABLE, NULL);

--- a/libpurple/protocols/mxit/formcmds.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/mxit/formcmds.c	Fri Aug 09 13:03:26 2013 +0200
@@ -90,7 +90,7 @@
 	purple_debug_info(MXIT_PLUGIN_ID, "Inline Image returned from %s\n", iireq->url);
 #endif
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		/* no reply from the WAP site */
 		purple_debug_error(MXIT_PLUGIN_ID, "Error downloading Inline Image from %s.\n", iireq->url);
 		goto done;

--- a/libpurple/protocols/mxit/login.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/mxit/login.c	Fri Aug 09 13:03:26 2013 +0200
@@ -392,7 +392,7 @@
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_clientinfo_cb2\n" );
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		/* no reply from the WAP site */
 		purple_connection_error( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Error contacting the MXit WAP site. Please try again later." ) );
 		return;
@@ -626,7 +626,7 @@
 		purple_http_response_get_data(response, NULL));
 #endif
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		/* no reply from the WAP site */
 		purple_connection_error( session->con, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _( "Error contacting the MXit WAP site. Please try again later." ) );
 		return;

--- a/libpurple/protocols/mxit/markup.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/mxit/markup.c	Fri Aug 09 13:03:26 2013 +0200
@@ -482,7 +482,7 @@
 
 	purple_debug_info( MXIT_PLUGIN_ID, "emoticon_returned\n" );
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		/* no reply from the WAP site */
 		purple_debug_error( MXIT_PLUGIN_ID, "Error contacting the MXit WAP site. Please try again later (emoticon).\n" );
 		goto done;

--- a/libpurple/protocols/mxit/protocol.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/mxit/protocol.c	Fri Aug 09 13:03:26 2013 +0200
@@ -271,7 +271,7 @@
 	const gchar *got_data;
 	size_t got_len;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_debug_error(MXIT_PLUGIN_ID, "HTTP response error (%s)\n",
 			purple_http_response_get_error(response));
 		return;

--- a/libpurple/protocols/myspace/user.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/myspace/user.c	Fri Aug 09 13:03:26 2013 +0200
@@ -225,7 +225,7 @@
 	g_assert(user->http_conn == http_conn);
 	user->http_conn = NULL;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_debug_info("msim_downloaded_buddy_icon",
 				"failed to download icon for %s",
 				name);

--- a/libpurple/protocols/oscar/clientlogin.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/oscar/clientlogin.c	Fri Aug 09 13:03:26 2013 +0200
@@ -333,7 +333,7 @@
 
 	od->hc = NULL;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		gchar *tmp;
 		/* Note to translators: The first %s is a URL, the second is an
 		   error message. */
@@ -571,7 +571,7 @@
 
 	od->hc = NULL;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		gchar *tmp;
 		tmp = g_strdup_printf(_("Error requesting %s: %s"),
 				get_client_login_url(od),

--- a/libpurple/protocols/yahoo/libymsg.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/yahoo/libymsg.c	Fri Aug 09 13:03:26 2013 +0200
@@ -1763,7 +1763,7 @@
 
 	purple_debug_info("yahoo","Authentication: In yahoo_auth16_stage2\n");
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		const gchar *error_message = purple_http_response_get_error(response);
 		purple_debug_error("yahoo", "Login Failed, unable to retrieve stage 2 url: %s\n", error_message);
 		purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_message);
@@ -1860,7 +1860,7 @@
 
 	purple_debug_info("yahoo","Authentication: In yahoo_auth16_stage1_cb\n");
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		const gchar *error_message = purple_http_response_get_error(response);
 		purple_debug_error("yahoo", "Login Failed, unable to retrieve login url: %s\n", error_message);
 		purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_message);
@@ -3432,7 +3432,7 @@
 
 	yd->http_reqs = g_slist_remove(yd->http_reqs, http_conn);
 
-	if (!purple_http_response_is_successfull(response))
+	if (!purple_http_response_is_successful(response))
 	{
 		purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 			purple_http_response_get_error(response));
@@ -3561,7 +3561,7 @@
 	int stringslen = 0;
 	const gchar *got_data;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_debug_error("yahoo", "Unable to retrieve server info: %s\n",
 			purple_http_response_get_error(response));
 
@@ -4190,7 +4190,7 @@
 
 	g_return_if_fail(PURPLE_CONNECTION_IS_VALID(gc));
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_debug_error("yahoo",
 			"Requesting mail login token failed: %s\n",
 			purple_http_response_get_error(response));
@@ -4332,7 +4332,7 @@
 	PurpleAccount *account = purple_connection_get_account(gc);
 	PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, sms_cb_data->who, account);
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_conversation_write(conv, NULL, _("Can't send SMS. Unable to obtain mobile carrier."), PURPLE_MESSAGE_SYSTEM, time(NULL));
 
 		g_free(sms_cb_data->who);

--- a/libpurple/protocols/yahoo/yahoo_aliases.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/yahoo/yahoo_aliases.c	Fri Aug 09 13:03:26 2013 +0200
@@ -79,7 +79,7 @@
 		purple_http_conn_get_purple_connection(http_conn);
 	YahooData *yd = purple_connection_get_protocol_data(gc);
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_debug_info("yahoo", "yahoo_fetch_aliases_cb error: %s\n",
 			purple_http_response_get_error(response));
 	} else {
@@ -223,7 +223,7 @@
 	xmlnode *node, *result;
 	struct callback_data *cb = _cb;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_debug_info("yahoo", "Error updating alias for %s: %s\n",
 			cb->who, purple_http_response_get_error(response));
 		g_free(cb->who);

--- a/libpurple/protocols/yahoo/yahoo_filexfer.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c	Fri Aug 09 13:03:26 2013 +0200
@@ -768,7 +768,7 @@
 	if (purple_xfer_is_cancelled(xfer))
 		return;
 
-	if (!purple_http_response_is_successfull(response) ||
+	if (!purple_http_response_is_successful(response) ||
 		purple_xfer_get_bytes_remaining(xfer) > 0)
 	{
 		purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_REMOTE);
@@ -793,7 +793,7 @@
 	if (purple_xfer_is_cancelled(xfer))
 		return;
 
-	if (!purple_http_response_is_successfull(response) ||
+	if (!purple_http_response_is_successful(response) ||
 		purple_xfer_get_bytes_remaining(xfer) > 0)
 	{
 		purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_REMOTE);
@@ -894,7 +894,7 @@
 
 	xd->hc = NULL;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_notify_error(yd->gc, NULL, _("File Transfer Failed"),
 			_("Unable to get file header."));
 		purple_xfer_cancel_remote(xfer);

--- a/libpurple/protocols/yahoo/yahoo_picture.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/yahoo/yahoo_picture.c	Fri Aug 09 13:03:26 2013 +0200
@@ -51,7 +51,7 @@
 {
 	struct yahoo_fetch_picture_data *d = _data;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_debug_error("yahoo", "Fetching buddy icon failed: %s\n",
 			purple_http_response_get_error(response));
 	} else {
@@ -345,7 +345,7 @@
 
 	yd->picture_upload_hc = NULL;
 
-	if (!purple_http_response_is_successfull(response))
+	if (!purple_http_response_is_successful(response))
 		purple_debug_info("yahoo", "Error uploading buddy icon.\n");
 	else
 		purple_debug_misc("yahoo", "Finished uploading buddy icon.\n");

--- a/libpurple/protocols/yahoo/yahoo_profile.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/yahoo/yahoo_profile.c	Fri Aug 09 13:03:26 2013 +0200
@@ -806,7 +806,7 @@
 	 * happen except under unusual error conditions, as Yahoo is observed
 	 * to send back HTML, with a 200 status code.
 	 */
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_notify_user_info_add_pair_html(user_info, _("Error retrieving profile"), NULL);
 		purple_notify_userinfo(info_data->gc, info_data->name,
 			user_info, NULL, NULL);
@@ -1029,7 +1029,7 @@
 
 #if PHOTO_SUPPORT
 	/* Try to put the photo in there too, if there's one and is readable */
-	if (purple_http_response_is_successfull(response)) {
+	if (purple_http_response_is_successful(response)) {
 		const gchar *data;
 		size_t len;
 

--- a/libpurple/protocols/yahoo/yahoochat.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/protocols/yahoo/yahoochat.c	Fri Aug 09 13:03:26 2013 +0200
@@ -1381,7 +1381,7 @@
 	gc = purple_account_get_connection(purple_roomlist_get_account(
 		yrl->list));
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		purple_notify_error(gc, NULL, _("Unable to connect"),
 			_("Fetching the room list failed."));
 		yahoo_roomlist_cleanup(yrl->list, yrl);

--- a/libpurple/upnp.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/libpurple/upnp.c	Fri Aug 09 13:03:26 2013 +0200
@@ -373,7 +373,7 @@
 	UPnPDiscoveryData *dd = _dd;
 	gchar *control_url = NULL;
 
-	if (response && purple_http_response_is_successfull(response)) {
+	if (response && purple_http_response_is_successful(response)) {
 		const gchar *got_data;
 		size_t got_len;
 
@@ -717,7 +717,7 @@
 	const gchar *got_data;
 	size_t got_len;
 
-	if (!purple_http_response_is_successfull(response))
+	if (!purple_http_response_is_successful(response))
 		return;
 
 	/* extract the ip, or see if there is an error */
@@ -819,7 +819,7 @@
 	gboolean success = TRUE;
 
 	/* determine if port mapping was a success */
-	if (!purple_http_response_is_successfull(response))
+	if (!purple_http_response_is_successful(response))
 	{
 		purple_debug_error("upnp",
 			"purple_upnp_set_port_mapping(): Failed HTTP_OK\n%s\n",

--- a/pidgin/gtkprefs.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/pidgin/gtkprefs.c	Fri Aug 09 13:03:26 2013 +0200
@@ -1081,7 +1081,7 @@
 	g_assert(http_conn == prefs_conv_themes_running_request);
 	prefs_conv_themes_running_request = NULL;
 
-	if (!purple_http_response_is_successfull(response)) {
+	if (!purple_http_response_is_successful(response)) {
 		free_theme_info(info);
 		return;
 	}

--- a/pidgin/gtksmiley.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/pidgin/gtksmiley.c	Fri Aug 09 13:03:26 2013 +0200
@@ -736,7 +736,7 @@
 	g_assert(http_conn == smiley_manager->running_request);
 	smiley_manager->running_request = NULL;
 
-	if (!purple_http_response_is_successfull(response))
+	if (!purple_http_response_is_successful(response))
 		return;
 
 	smileydata = purple_http_response_get_data(response, &len);

--- a/pidgin/plugins/relnot.c	Fri Aug 09 12:57:29 2013 +0200
+++ b/pidgin/plugins/relnot.c	Fri Aug 09 13:03:26 2013 +0200
@@ -71,7 +71,7 @@
 	GString *message;
 	int i = 0;
 
-	if(!purple_http_response_is_successfull(response))
+	if(!purple_http_response_is_successful(response))
 		return;
 
 	changelog = purple_http_response_get_data(response, NULL);