diff options
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/dialogs/recurrence-page.c | 2 | ||||
| -rw-r--r-- | widgets/misc/ChangeLog | 6 | ||||
| -rw-r--r-- | widgets/misc/e-calendar-item.c | 4 |
4 files changed, 15 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index a438b53d44..58495a446d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,11 @@ 2008-02-18 Srinivasa Ragavan <sragavan@novell.com> + ** Fix for bnc #178778 + + * gui/dialogs/recurrence-page.c: (preview_recur): + +2008-02-18 Srinivasa Ragavan <sragavan@novell.com> + ** Fix for bnc #160049. Patch from OpenSUSE. * common/authentication.c: (build_pass_key), diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index 34e748a7d7..c95eb34937 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -857,7 +857,7 @@ preview_recur (RecurrencePage *rpage) /* If our component has not been set yet through ::fill_widgets(), we * cannot preview the recurrence. */ - if (!priv->comp || e_cal_component_is_instance (priv->comp)) + if (!priv || !priv->comp || e_cal_component_is_instance (priv->comp)) return; /* Create a scratch component with the start/end and diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 4ff9f1d11c..4600b576e1 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,9 @@ +2008-02-18 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for bnc #178778 + + * e-calendar-item.c: (e_calendar_item_destroy): + 2008-02-07 Milan Crha <mcrha@redhat.com> ** Fix for bug #249501 diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c index 4e8fb50a18..9eef0253a1 100644 --- a/widgets/misc/e-calendar-item.c +++ b/widgets/misc/e-calendar-item.c @@ -430,9 +430,9 @@ e_calendar_item_destroy (GtkObject *o) calitem->styles = NULL; } - if (calitem->signal_emission_idle_id != 0) { + if (calitem->signal_emission_idle_id > 0) { g_source_remove (calitem->signal_emission_idle_id); - calitem->signal_emission_idle_id = 0; + calitem->signal_emission_idle_id = -1; } if (calitem->font_desc) { |