diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-09-10 18:58:25 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-09-10 18:58:25 +0800 |
| commit | 2fe2eb76be6c3b5f791e897830261689fbb042fb (patch) | |
| tree | 2e8f00a00ba735f4c803d80f2b92d1e31dfcebf7 | |
| parent | ea3061eb0641e961bdcd7df6519a5c5346abff9c (diff) | |
| download | gsoc2013-evolution-2fe2eb76be6c3b5f791e897830261689fbb042fb.tar.gz gsoc2013-evolution-2fe2eb76be6c3b5f791e897830261689fbb042fb.tar.zst gsoc2013-evolution-2fe2eb76be6c3b5f791e897830261689fbb042fb.zip | |
** Fix for bug #471791
svn path=/trunk/; revision=34216
| -rw-r--r-- | a11y/ChangeLog | 14 | ||||
| -rw-r--r-- | a11y/addressbook/ea-minicard-view.c | 4 | ||||
| -rw-r--r-- | a11y/calendar/ea-cal-view-event.c | 3 | ||||
| -rw-r--r-- | a11y/calendar/ea-calendar-helpers.c | 3 | ||||
| -rw-r--r-- | a11y/calendar/ea-gnome-calendar.c | 3 |
5 files changed, 19 insertions, 8 deletions
diff --git a/a11y/ChangeLog b/a11y/ChangeLog index 29c2849395..6e5ba67ab7 100644 --- a/a11y/ChangeLog +++ b/a11y/ChangeLog @@ -1,3 +1,17 @@ +2007-09-10 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for bug #471791 + + * addressbook/ea-minicard-view.c: (ea_minicard_view_get_name), + (atk_action_interface_do_action): Move away from g_assert to critical + warnings. + * calendar/ea-cal-view-event.c: + (ea_cal_view_event_get_index_in_parent): + * calendar/ea-calendar-helpers.c: + (ea_calendar_helpers_get_cal_view_event_from): + * calendar/ea-gnome-calendar.c: + (ea_gnome_calendar_get_label_description): + 2007-09-07 Milan Crha <mcrha@redhat.com> ** Fix for bug #473903 diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c index 7672f75dc4..c6b7d4b029 100644 --- a/a11y/addressbook/ea-minicard-view.c +++ b/a11y/addressbook/ea-minicard-view.c @@ -154,7 +154,7 @@ ea_minicard_view_get_name (AtkObject *accessible) /* Get the current name of minicard view*/ card_view = E_MINICARD_VIEW (reflow); g_object_get (card_view->adapter, "book", &book, NULL); - g_assert (E_IS_BOOK (book)); + g_return_val_if_fail (E_IS_BOOK (book), NULL); source_name = e_source_peek_name (e_book_get_source (book)); if (!source_name) source_name=""; @@ -378,7 +378,7 @@ static gboolean atk_action_interface_do_action (AtkAction *action, gint i) g_object_get(card_view, "book", &book, NULL); - g_assert (E_IS_BOOK (book)); + g_return_val_if_fail (E_IS_BOOK (book), FALSE); switch (i) { case 0: diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c index 447b8cb650..9f7e694597 100644 --- a/a11y/calendar/ea-cal-view-event.c +++ b/a11y/calendar/ea-cal-view-event.c @@ -391,8 +391,7 @@ ea_cal_view_event_get_index_in_parent (AtkObject *accessible) } } else { - g_assert_not_reached (); - return -1; + g_return_val_if_reached (-1); } return -1; } diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c index f7e4353fa8..caf1913829 100644 --- a/a11y/calendar/ea-calendar-helpers.c +++ b/a11y/calendar/ea-calendar-helpers.c @@ -152,8 +152,7 @@ ea_calendar_helpers_get_cal_view_event_from (GnomeCanvasItem *canvas_item) cal_view_event = (ECalendarViewEvent *)week_view_event; } else { - g_assert_not_reached (); - return NULL; + g_return_val_if_reached (NULL); } return cal_view_event; } diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c index 09f8abcd9c..509d515f2d 100644 --- a/a11y/calendar/ea-gnome-calendar.c +++ b/a11y/calendar/ea-gnome-calendar.c @@ -234,8 +234,7 @@ ea_gnome_calendar_get_label_description (GnomeCalendar *gcal) } break; default: - g_assert_not_reached (); - return NULL; + g_return_val_if_reached (NULL); } return buffer; } |