4 files changed, 9 insertions, 7 deletions
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index a4bba62555..224227e209 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -241,7 +241,7 @@ ecp_unrealize (ECellView *ecv)
 {
 	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
 
-	e_cell_realize (ecp_view->child_view);
+	e_cell_unrealize (ecp_view->child_view);
 
 	if (parent_class->unrealize)
 		(* parent_class->unrealize) (ecv);
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 4143491c64..7e045853b3 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -798,8 +798,6 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col,
 			}
 		}
 
-		else
-			return 0;
 		break;
 	case GDK_BUTTON_PRESS: /* Fall Through */
 	case GDK_BUTTON_RELEASE:
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index c5b19b42a2..63947f1516 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -31,8 +31,15 @@ etst_destroy (GtkObject *object)
 	ETableState *etst = E_TABLE_STATE (object);
 
 	gtk_object_unref (GTK_OBJECT (etst->sort_info));
-	if (etst->columns)
+	if (etst->columns) {
 		g_free (etst->columns);
+		etst->columns = NULL;
+	}
+
+	if (etst->expansions) {
+		g_free (etst->expansions);
+		etst->expansions = NULL;
+	}
 	
 	GTK_OBJECT_CLASS (etst_parent_class)->destroy (object);
 }
@@ -234,4 +241,3 @@ e_table_state_duplicate (ETableState *state)
 
 	return new_state;
 }
-
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index b2eb4dd1fe..2994d3e273 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -781,8 +781,6 @@ e_table_set_state_object(ETable *e_table, ETableState *state)
 	if (e_table->header)
 		gtk_object_unref(GTK_OBJECT(e_table->header));
 	e_table->header = e_table_state_to_header (GTK_WIDGET(e_table), e_table->full_header, state);
-	if (e_table->header)
-		gtk_object_ref(GTK_OBJECT(e_table->header));
 
 	gtk_object_set (GTK_OBJECT (e_table->header),
 			"width", (double) (GTK_WIDGET(e_table->table_canvas)->allocation.width),