diff options
| author | JP Rosevear <jpr@ximian.com> | 2002-03-06 04:47:48 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2002-03-06 04:47:48 +0800 |
| commit | 41c0e5bb186d461a9da7763518b6bcd277391f09 (patch) | |
| tree | f02790a805ff83c273fafbe6d15054f53f6dc171 /calendar/gui/e-meeting-model.c | |
| parent | 5c10817db46137b17aabcb01e4b7098635288b3c (diff) | |
| download | gsoc2013-evolution-41c0e5bb186d461a9da7763518b6bcd277391f09.tar gsoc2013-evolution-41c0e5bb186d461a9da7763518b6bcd277391f09.tar.gz gsoc2013-evolution-41c0e5bb186d461a9da7763518b6bcd277391f09.tar.bz2 gsoc2013-evolution-41c0e5bb186d461a9da7763518b6bcd277391f09.tar.lz gsoc2013-evolution-41c0e5bb186d461a9da7763518b6bcd277391f09.tar.xz gsoc2013-evolution-41c0e5bb186d461a9da7763518b6bcd277391f09.tar.zst gsoc2013-evolution-41c0e5bb186d461a9da7763518b6bcd277391f09.zip | |
remove unneeded parameter from print_text_size everywhere
2002-03-05 JP Rosevear <jpr@ximian.com>
* gui/print.c: remove unneeded parameter from print_text_size
everywhere
(get_font_for_size): calculate a font size based on the available
height
(print_text): calculate the top of where the font should be drawn
(print_text_size): use get_font_for_size
(print_day_background): use get_font_for_size
2002-03-05 JP Rosevear <jpr@ximian.com>
* gui/e-meeting-time-sel-item.c
(e_meeting_time_selector_item_draw): pass the real table
to e_meeting_model_etable_view_to_model_row
(e_meeting_time_selector_item_paint_busy_periods): ditto
* gui/dialogs/meeting-page.c (right_click_cb): ditto
* gui/e-meeting-model.h: update protos
* gui/e-meeting-model.c
(e_meeting_model_etable_model_to_view_row): take in to account the
fact the table used the without model
(e_meeting_model_etable_view_to_model_row): ditto
svn path=/trunk/; revision=15926
Diffstat (limited to 'calendar/gui/e-meeting-model.c')
| -rw-r--r-- | calendar/gui/e-meeting-model.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c index 54b5bfd407..6adfb9c1c9 100644 --- a/calendar/gui/e-meeting-model.c +++ b/calendar/gui/e-meeting-model.c @@ -1528,29 +1528,39 @@ e_meeting_model_etable_from_model (EMeetingModel *im, const gchar *spec_file, co } int -e_meeting_model_etable_model_to_view_row (EMeetingModel *im, int model_row) +e_meeting_model_etable_model_to_view_row (ETable *et, EMeetingModel *im, int model_row) { EMeetingModelPrivate *priv; + int row; g_return_val_if_fail (im != NULL, -1); g_return_val_if_fail (E_IS_MEETING_MODEL (im), -1); priv = im->priv; - return e_table_subset_model_to_view_row (E_TABLE_SUBSET (priv->without), model_row); + row = e_table_model_to_view_row (et, model_row); + if (row == -1) + return -1; + + return e_table_subset_model_to_view_row (E_TABLE_SUBSET (priv->without), row); } int -e_meeting_model_etable_view_to_model_row (EMeetingModel *im, int view_row) +e_meeting_model_etable_view_to_model_row (ETable *et, EMeetingModel *im, int view_row) { EMeetingModelPrivate *priv; + int row; g_return_val_if_fail (im != NULL, -1); g_return_val_if_fail (E_IS_MEETING_MODEL (im), -1); priv = im->priv; - return e_table_subset_view_to_model_row (E_TABLE_SUBSET (priv->without), view_row); + row = e_table_view_to_model_row (et, view_row); + if (row == -1) + return -1; + + return e_table_subset_view_to_model_row (E_TABLE_SUBSET (priv->without), row); } |