diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 14 | ||||
| -rw-r--r-- | calendar/gui/calendar-component.c | 2 | ||||
| -rw-r--r-- | calendar/gui/control-factory.c | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/copy-source-dialog.c | 1 | ||||
| -rw-r--r-- | calendar/gui/e-cal-model.c | 4 |
5 files changed, 19 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 8d2c436ee9..5667ae6dc0 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,17 @@ +2004-03-23 JP Rosevear <jpr@ximian.com> + + * gui/dialogs/copy-source-dialog.c (copy_source): remove unused + variable + + * gui/e-cal-model.c (e_cal_model_copy_component_data): make the + precondition return NULL + + * gui/control-factory.c (get_prop): make sure this code isn't + reached + + * gui/calendar-component.c + (calendar_component_peek_source_selector): cast to kill warning + 2004-03-23 Umesh Tiwari <tiwariumesh232@rediffmaiil.com> For bug#53417 diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index 4e389ddfc6..cac131ed6d 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -1098,7 +1098,7 @@ calendar_component_peek_source_list (CalendarComponent *component) ESourceSelector * calendar_component_peek_source_selector (CalendarComponent *component) { - return component->priv->source_selector; + return E_SOURCE_SELECTOR (component->priv->source_selector); } EActivityHandler * diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c index b114300b5a..f19acb0b4d 100644 --- a/calendar/gui/control-factory.c +++ b/calendar/gui/control-factory.c @@ -100,6 +100,8 @@ get_prop (BonoboPropertyBag *bag, BONOBO_ARG_SET_STRING (arg, "list"); break; default: + g_assert_not_reached (); + break; } break; diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c index 11768525c3..dca36f0771 100644 --- a/calendar/gui/dialogs/copy-source-dialog.c +++ b/calendar/gui/dialogs/copy-source-dialog.c @@ -43,7 +43,6 @@ show_error (GtkWindow *parent, const char *msg) static gboolean copy_source (CopySourceDialogData *csdd) { - char *uri; ECal *source_client, *dest_client; gboolean read_only = TRUE; GList *obj_list = NULL; diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c index c794b18859..95255c023f 100644 --- a/calendar/gui/e-cal-model.c +++ b/calendar/gui/e-cal-model.c @@ -1753,8 +1753,8 @@ ECalModelComponent * e_cal_model_copy_component_data (ECalModelComponent *comp_data) { ECalModelComponent *new_data; - - g_return_if_fail (comp_data != NULL); + + g_return_val_if_fail (comp_data != NULL, NULL); new_data = g_new0 (ECalModelComponent, 1); |