aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-service.c12
2 files changed, 13 insertions, 5 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 9b22d11fe9..0eb07bf1e3 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-25 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-service.c (camel_gethostbyaddr): Don't use setv when we
+ don't need the stdarg interface.
+ (camel_gethostbyname): Same.
+
2003-03-24 Jeffrey Stedfast <fejj@ximian.com>
* camel-folder-search.c (search_user_tag): This expression can
diff --git a/camel/camel-service.c b/camel/camel-service.c
index 13daa75492..67d49c317f 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -734,7 +734,7 @@ camel_gethostbyname (const char *name, CamelException *ex)
g_return_val_if_fail(name != NULL, NULL);
if (camel_operation_cancel_check(NULL)) {
- camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
+ camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
return NULL;
}
@@ -796,9 +796,11 @@ camel_gethostbyname (const char *name, CamelException *ex)
if (msg->herr) {
if (!camel_exception_is_set(ex)) {
if (msg->herr == HOST_NOT_FOUND || msg->herr == NO_DATA)
- camel_exception_setv(ex, 1, _("Host lookup failed: %s: host not found"), name);
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ _("Host lookup failed: %s: host not found"), name);
else
- camel_exception_setv(ex, 1, _("Host lookup failed: %s: unknown reason"), name);
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
+ _("Host lookup failed: %s: unknown reason"), name);
}
g_free(msg->hostbufmem);
g_free(msg);
@@ -844,7 +846,7 @@ camel_gethostbyaddr (const char *addr, int len, int type, CamelException *ex)
g_return_val_if_fail (addr != NULL, NULL);
if (camel_operation_cancel_check (NULL)) {
- camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
+ camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
return NULL;
}
@@ -887,7 +889,7 @@ camel_gethostbyaddr (const char *addr, int len, int type, CamelException *ex)
pthread_cancel (id);
} else if (FD_ISSET(cancel_fd, &rdset)) {
d(printf ("Cancelling lookup thread\n"));
- camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
+ camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled"));
pthread_cancel (id);
} else {
struct _lookup_msg *reply = (struct _lookup_msg *) e_msgport_get (reply_port);