From bd49633a89edf3a29925d322b97965523d72c62e Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Sat, 3 Nov 2001 09:02:54 +0000 Subject: Bumped the version number to 0.17.99.0. Bumped the soname to 18. 2001-11-03 Christopher James Lahey * configure.in: Bumped the version number to 0.17.99.0. Bumped the soname to 18. * gal/widgets/e-categories.c (e_categories_destroy): Got rid of a GtkWarning here that was due to Gtk+ casting a NULL pointer. Fixes Ximian bug #14327. From gal/e-table/ChangeLog: 2001-11-02 Christopher James Lahey * e-cell-popup.c, e-cell-popup.h (e_cell_popup_do_popup): Make ECellPopup not display multiple arrows while the popup is up and the table is in grouped mode. Fixes Ximian bug #14207. svn path=/trunk/; revision=14580 --- widgets/table/e-cell-popup.c | 4 +++- widgets/table/e-cell-popup.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'widgets') diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c index 48b445a661..3791d4c7aa 100644 --- a/widgets/table/e-cell-popup.c +++ b/widgets/table/e-cell-popup.c @@ -147,6 +147,7 @@ static void e_cell_popup_init (ECellPopup *ecp) { ecp->popup_shown = FALSE; + ecp->popup_model = NULL; } @@ -271,7 +272,7 @@ ecp_draw (ECellView *ecv, GdkDrawable *drawable, show_popup_arrow = TRUE; ecp->popup_arrow_shown = TRUE; } else if (ecp->popup_shown && ecp->popup_view_col == view_col - && ecp->popup_row == row) { + && ecp->popup_row == row && ecp->popup_model == ((ECellView *) ecp_view)->e_table_model) { show_popup_arrow = TRUE; } @@ -502,6 +503,7 @@ e_cell_popup_do_popup (ECellPopupView *ecp_view, ecp->popup_view_col = view_col; ecp->popup_row = row; + ecp->popup_model = ((ECellView *) ecp_view)->e_table_model; return popup_func ? popup_func (ecp, event, row, view_col) : FALSE; } diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h index 9deaac4a01..8f89ddf9ef 100644 --- a/widgets/table/e-cell-popup.h +++ b/widgets/table/e-cell-popup.h @@ -63,6 +63,7 @@ typedef struct { gint popup_view_col; gint popup_row; + ETableModel *popup_model; } ECellPopup; -- cgit v1.2.3