gnome-python-desktop r471 - in trunk: . evolution
- From: gjc svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-python-desktop r471 - in trunk: . evolution
- Date: Mon, 18 Feb 2008 11:43:28 +0000 (GMT)
Author: gjc
Date: Mon Feb 18 11:43:28 2008
New Revision: 471
URL: http://svn.gnome.org/viewvc/gnome-python-desktop?rev=471&view=rev
Log:
* evolution/evo-calendar.c (evo_cal_source_open_source)
(evo_cal_source_open_new_with_absolute_uri): Fix potential NULL
strings inside g_warnings (bug #505647).
Modified:
trunk/ChangeLog
trunk/evolution/evo-calendar.c
Modified: trunk/evolution/evo-calendar.c
==============================================================================
--- trunk/evolution/evo-calendar.c (original)
+++ trunk/evolution/evo-calendar.c Mon Feb 18 11:43:28 2008
@@ -36,7 +36,7 @@
if (strcmp(uri, "default")) {
if (!e_cal_get_sources(&sources, type, &gerror)) {
g_warning("Unable to get sources for calendar (type %u): %s",
- type, gerror ? gerror->message : "None");
+ type, gerror && gerror->message ? gerror->message : "None");
g_clear_error(&gerror);
return NULL;
}
@@ -55,14 +55,15 @@
if(!e_cal_open(cal, FALSE, &gerror)) {
g_warning("Failed to open calendar (type %u): %s",
- type, gerror ? gerror->message : "None");
+ type, gerror && gerror->message? gerror->message : "None");
g_object_unref(cal);
g_clear_error(&gerror);
return NULL;
}
} else {
if (!e_cal_open_default (&cal, type, NULL, NULL, &gerror)) {
- g_warning("Failed to open default calendar: %s", gerror ? gerror->message : "None");
+ g_warning("Failed to open default calendar: %s",
+ gerror && gerror->message ? gerror->message : "None");
g_clear_error(&gerror);
return NULL;
}
@@ -94,7 +95,8 @@
}
if(!e_cal_open(cal, FALSE, &gerror)) {
- g_warning("Failed to open calendar (type %u): %s", type, gerror ? gerror->message : "None");
+ g_warning("Failed to open calendar (type %u): %s", type,
+ gerror && gerror->message ? gerror->message : "None");
g_object_unref(cal);
g_clear_error(&gerror);
return NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]