aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2001-04-17 10:08:30 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-04-17 10:08:30 +0800
commit591856f9804f4923cae7fef3ac80f7121e10202f (patch)
treecc61c57cd42a2bd2cf2d434dc958e6aa2edb93b1
parent0dd9493f1092812a1885501a105c2aef0e4a0dd2 (diff)
downloadgsoc2013-evolution-591856f9804f4923cae7fef3ac80f7121e10202f.tar.gz
gsoc2013-evolution-591856f9804f4923cae7fef3ac80f7121e10202f.tar.zst
gsoc2013-evolution-591856f9804f4923cae7fef3ac80f7121e10202f.zip
don't use g_return's
svn path=/trunk/; revision=9396
-rw-r--r--camel/camel-pgp-context.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c
index d6a725458a..cd3a7bee18 100644
--- a/camel/camel-pgp-context.c
+++ b/camel/camel-pgp-context.c
@@ -144,8 +144,9 @@ camel_pgp_context_new (CamelSession *session, CamelPgpType type, const char *pat
CamelPgpContext *context;
g_return_val_if_fail (session != NULL, NULL);
- g_return_val_if_fail (type != CAMEL_PGP_TYPE_NONE, NULL);
- g_return_val_if_fail (path != NULL, NULL);
+
+ if (type == CAMEL_PGP_TYPE_NONE || !path || !*path)
+ return NULL;
context = CAMEL_PGP_CONTEXT (camel_object_new (CAMEL_PGP_CONTEXT_TYPE));