Add a htons in the default_number case, and document the fact that the

	* camel-service.c (camel_service_getport): Add a htons in the
	default_number case, and document the fact that the function
	returns the port in network byte order.

	* providers/pop3/camel-pop3-store.c (pop3_connect): Revert
	Miguel's change. The port number bug was actually somewhere
	else, and the IP address copying code was fine already.

svn path=/trunk/; revision=2256

1 files changed, 3 insertions, 3 deletions

diff --git a/camel/camel-service.c b/camel/camel-service.c
index 01b72e1a70..b9ed7e5c96 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -476,8 +476,8 @@ camel_service_gethost (CamelService *service, CamelException *ex)
  * based on the service's URL (which may contain either a numeric
  * or symbolic port name) and the provided defaults.
  *
- * Return value: a port number, or -1 if the user specified a port name
- * that could not be resolved.
+ * Return value: a port number (in network byte order), or -1 if the
+ * user specified a port name that could not be resolved.
  **/
 int
 camel_service_getport (CamelService *service, char *default_port,
@@ -504,5 +504,5 @@ camel_service_getport (CamelService *service, char *default_port,
 				      "Unknown port `%s'", port);
 		return -1;
 	} else
-		return default_number;
+		return htons (default_number);
 }