diff options
Diffstat (limited to 'widgets/e-table')
| -rw-r--r-- | widgets/e-table/ChangeLog | 9 | ||||
| -rw-r--r-- | widgets/e-table/e-table-group-container.c | 4 | ||||
| -rw-r--r-- | widgets/e-table/e-table-group-leaf.c | 2 | ||||
| -rw-r--r-- | widgets/e-table/e-table-group.c | 17 | ||||
| -rw-r--r-- | widgets/e-table/e-table-header-item.c | 8 |
5 files changed, 13 insertions, 27 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index 8d668b04ac..aa7a6c497e 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,5 +1,14 @@ 2000-05-16 Christopher James Lahey <clahey@helixcode.com> + * e-table-group-container.c: Removed a memory leak here. + + * e-table-group-leaf.c: Added a ref/sink pair. + + * e-table-group.c, e-table-header-item.c: Removed some unused + code. + +2000-05-16 Christopher James Lahey <clahey@helixcode.com> + * e-table-sorted-variable.c: Fixed a FIXME comment. * e-table-header.c, e-table-header.h: Added code to put off size diff --git a/widgets/e-table/e-table-group-container.c b/widgets/e-table/e-table-group-container.c index 4c5dfa38a6..e7771f86de 100644 --- a/widgets/e-table/e-table-group-container.c +++ b/widgets/e-table/e-table-group-container.c @@ -105,9 +105,9 @@ e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContaine ETableSortColumn column = e_table_sort_info_grouping_get_nth(sort_info, n); if (column.column > e_table_header_count (full_header)) - col = e_table_header_get_columns (full_header)[e_table_header_count (full_header) - 1]; + col = e_table_header_get_column (full_header, e_table_header_count (full_header) - 1); else - col = e_table_header_get_columns (full_header)[column.column]; + col = e_table_header_get_column (full_header, column.column); e_table_group_construct (parent, E_TABLE_GROUP (etgc), full_header, header, model); etgc->ecol = col; diff --git a/widgets/e-table/e-table-group-leaf.c b/widgets/e-table/e-table-group-leaf.c index caa0125a78..a6f6eac15a 100644 --- a/widgets/e-table/e-table-group-leaf.c +++ b/widgets/e-table/e-table-group-leaf.c @@ -56,6 +56,8 @@ e_table_group_leaf_construct (GnomeCanvasGroup *parent, ETableSortInfo *sort_info) { etgl->subset = E_TABLE_SUBSET_VARIABLE(e_table_sorted_variable_new (model, full_header, sort_info)); + gtk_object_ref(GTK_OBJECT(etgl->subset)); + gtk_object_sink(GTK_OBJECT(etgl->subset)); e_table_group_construct (parent, E_TABLE_GROUP (etgl), full_header, header, model); } diff --git a/widgets/e-table/e-table-group.c b/widgets/e-table/e-table-group.c index 9544059a0c..5adc4f85b1 100644 --- a/widgets/e-table/e-table-group.c +++ b/widgets/e-table/e-table-group.c @@ -36,23 +36,6 @@ static gint etg_signals [LAST_SIGNAL] = { 0, }; static gboolean etg_get_focus (ETableGroup *etg); static void etg_destroy (GtkObject *object); -#if 0 -GnomeCanvasItem * -e_table_group_new (GnomeCanvasGroup *parent, ETableCol *ecol, - gboolean open, gboolean transparent) -{ - ETableGroup *etg; - - g_return_val_if_fail (parent != NULL, NULL); - g_return_val_if_fail (ecol != NULL, NULL); - - etg = gtk_type_new (e_table_group_get_type ()); - - e_table_group_construct (parent, etg, ecol, open, transparent); - - return GNOME_CANVAS_ITEM (etg); -} -#endif static void etg_destroy (GtkObject *object) diff --git a/widgets/e-table/e-table-header-item.c b/widgets/e-table/e-table-header-item.c index 89d901b4be..ef0976502a 100644 --- a/widgets/e-table/e-table-header-item.c +++ b/widgets/e-table/e-table-header-item.c @@ -930,14 +930,6 @@ ethi_button_pressed (ETableHeaderItem *ethi, GdkEventButton *event) ethi_signals [BUTTON_PRESSED], event); } -/* FIXME: Implement this. */ -#if 0 -static GtkMenu * -ethi_create_context_menu (ETableHeaderItem *ethi) -{ -} -#endif - static EPopupMenu ethi_context_menu [] = { { NULL, NULL, NULL, 0 } }; |