diff options
| author | Shi Pu <shi.pu@sun.com> | 2005-12-02 08:55:24 +0000 |
|---|---|---|
| committer | Harry Lu <haip@src.gnome.org> | 2005-12-02 08:55:24 +0000 |
| commit | 48e2431bbff1eb1c3f356fabb2d3b961a9ee6926 (patch) | |
| tree | 2d3f6354a091218335bb67699e4a24357965a14d | |
| parent | e9801cfc41a7585f81793b0fcc698b5cb28e6245 (diff) | |
| download | evolution-data-server-48e2431bbff1eb1c3f356fabb2d3b961a9ee6926.tar.gz | |
** See bug #321139
2005-12-02 Shi Pu <shi.pu@sun.com>
** See bug #321139
* camel-exception.c: (camel_exception_get_description):
Don't return NULL.
| -rw-r--r-- | camel/ChangeLog | 7 | ||||
| -rw-r--r-- | camel/camel-exception.c | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 443133540..f80972671 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,10 @@ +2005-12-01 Shi Pu <shi.pu@sun.com> + + ** See bug #321139 + + * camel-exception.c: (camel_exception_get_description): + Don't return NULL. + 2005-11-18 Jeff Cai <jeff.cai@sun.com> * camel-disco-store.c: (disco_connect): diff --git a/camel/camel-exception.c b/camel/camel-exception.c index 43798abe9..06b48547f 100644 --- a/camel/camel-exception.c +++ b/camel/camel-exception.c @@ -31,6 +31,7 @@ #include "camel-exception.h" #include "libedataserver/e-memory.h" +#include "camel-i18n.h" #include "camel-debug.h" @@ -303,6 +304,6 @@ camel_exception_get_description (CamelException *ex) ret = ex->desc; else w(g_warning ("camel_exception_get_description called with NULL parameter.")); - - return ret; + + return ret ? ret : (_("No description available")); } |