aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/e-table/ChangeLog10
-rw-r--r--widgets/e-table/e-table-group-container.c2
-rw-r--r--widgets/e-table/e-table-item.c2
-rw-r--r--widgets/e-table/test-check.c2
-rw-r--r--widgets/e-table/test-cols.c4
-rw-r--r--widgets/e-table/test-table.c2
-rw-r--r--widgets/table/e-table-group-container.c2
-rw-r--r--widgets/table/e-table-item.c2
-rw-r--r--widgets/table/test-check.c2
-rw-r--r--widgets/table/test-cols.c4
-rw-r--r--widgets/table/test-table.c2
11 files changed, 14 insertions, 20 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index 9c78afd8ad..573a9526f3 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,3 +1,13 @@
+2000-06-22 Christopher James Lahey <clahey@helixcode.com>
+
+ * e-table-group-container.c: Remove use of the "x" and "y"
+ arguments to EText.
+
+ * e-table-item.c: Properly ref the source_model field.
+
+ * test-check.c, test-cols.c, test-table.c: Remove use of the "x"
+ and "y" arguments to ETableHeaderItem.
+
2000-06-21 Christopher James Lahey <clahey@helixcode.com>
* e-table-field-chooser-dialog.c: Made the Close button work.
diff --git a/widgets/e-table/e-table-group-container.c b/widgets/e-table/e-table-group-container.c
index 6e950f08ed..b4e77cf95e 100644
--- a/widgets/e-table/e-table-group-container.c
+++ b/widgets/e-table/e-table-group-container.c
@@ -377,8 +377,6 @@ etgc_add (ETableGroup *etg, gint row)
e_text_get_type (),
"font_gdk", etgc->font,
"anchor", GTK_ANCHOR_SW,
- "x", (double) 0,
- "y", (double) 0,
"fill_color", "black",
NULL);
child = e_table_group_new (GNOME_CANVAS_GROUP (etgc), etg->full_header,
diff --git a/widgets/e-table/e-table-item.c b/widgets/e-table/e-table-item.c
index 3f60485cbe..3632e9fe68 100644
--- a/widgets/e-table/e-table-item.c
+++ b/widgets/e-table/e-table-item.c
@@ -696,6 +696,8 @@ eti_add_table_model (ETableItem *eti, ETableModel *table_model)
if (E_IS_TABLE_SUBSET(table_model)) {
eti->uses_source_model = 1;
eti->source_model = E_TABLE_SUBSET(table_model)->source;
+ if (eti->source_model)
+ gtk_object_ref(eti->source_model);
}
eti_table_model_changed (table_model, eti);
diff --git a/widgets/e-table/test-check.c b/widgets/e-table/test-check.c
index 87da1ed55e..c330956918 100644
--- a/widgets/e-table/test-check.c
+++ b/widgets/e-table/test-check.c
@@ -177,8 +177,6 @@ check_test (void)
gnome_canvas_root (GNOME_CANVAS (canvas)),
e_table_header_item_get_type (),
"ETableHeader", e_table_header,
- "x", 0,
- "y", 0,
NULL);
item = gnome_canvas_item_new (
diff --git a/widgets/e-table/test-cols.c b/widgets/e-table/test-cols.c
index 414f9a2c56..d4372b189f 100644
--- a/widgets/e-table/test-cols.c
+++ b/widgets/e-table/test-cols.c
@@ -197,8 +197,6 @@ multi_cols_test (void)
gnome_canvas_root (GNOME_CANVAS (canvas)),
e_table_header_item_get_type (),
"ETableHeader", e_table_header,
- "x", 0,
- "y", 0,
NULL);
item = gnome_canvas_item_new (
@@ -220,8 +218,6 @@ multi_cols_test (void)
gnome_canvas_root (GNOME_CANVAS (canvas)),
e_table_header_item_get_type (),
"ETableHeader", e_table_header_multiple,
- "x", 300,
- "y", 0,
NULL);
item = gnome_canvas_item_new (
gnome_canvas_root (GNOME_CANVAS (canvas)),
diff --git a/widgets/e-table/test-table.c b/widgets/e-table/test-table.c
index 6ad9e48e0b..a12094ef19 100644
--- a/widgets/e-table/test-table.c
+++ b/widgets/e-table/test-table.c
@@ -260,8 +260,6 @@ table_browser_test (void)
gnome_canvas_root (GNOME_CANVAS (canvas)),
e_table_header_item_get_type (),
"ETableHeader", e_table_header,
- "x", 0,
- "y", 0,
NULL);
group = gnome_canvas_item_new (
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 6e950f08ed..b4e77cf95e 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -377,8 +377,6 @@ etgc_add (ETableGroup *etg, gint row)
e_text_get_type (),
"font_gdk", etgc->font,
"anchor", GTK_ANCHOR_SW,
- "x", (double) 0,
- "y", (double) 0,
"fill_color", "black",
NULL);
child = e_table_group_new (GNOME_CANVAS_GROUP (etgc), etg->full_header,
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 3f60485cbe..3632e9fe68 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -696,6 +696,8 @@ eti_add_table_model (ETableItem *eti, ETableModel *table_model)
if (E_IS_TABLE_SUBSET(table_model)) {
eti->uses_source_model = 1;
eti->source_model = E_TABLE_SUBSET(table_model)->source;
+ if (eti->source_model)
+ gtk_object_ref(eti->source_model);
}
eti_table_model_changed (table_model, eti);
diff --git a/widgets/table/test-check.c b/widgets/table/test-check.c
index 87da1ed55e..c330956918 100644
--- a/widgets/table/test-check.c
+++ b/widgets/table/test-check.c
@@ -177,8 +177,6 @@ check_test (void)
gnome_canvas_root (GNOME_CANVAS (canvas)),
e_table_header_item_get_type (),
"ETableHeader", e_table_header,
- "x", 0,
- "y", 0,
NULL);
item = gnome_canvas_item_new (
diff --git a/widgets/table/test-cols.c b/widgets/table/test-cols.c
index 414f9a2c56..d4372b189f 100644
--- a/widgets/table/test-cols.c
+++ b/widgets/table/test-cols.c
@@ -197,8 +197,6 @@ multi_cols_test (void)
gnome_canvas_root (GNOME_CANVAS (canvas)),
e_table_header_item_get_type (),
"ETableHeader", e_table_header,
- "x", 0,
- "y", 0,
NULL);
item = gnome_canvas_item_new (
@@ -220,8 +218,6 @@ multi_cols_test (void)
gnome_canvas_root (GNOME_CANVAS (canvas)),
e_table_header_item_get_type (),
"ETableHeader", e_table_header_multiple,
- "x", 300,
- "y", 0,
NULL);
item = gnome_canvas_item_new (
gnome_canvas_root (GNOME_CANVAS (canvas)),
diff --git a/widgets/table/test-table.c b/widgets/table/test-table.c
index 6ad9e48e0b..a12094ef19 100644
--- a/widgets/table/test-table.c
+++ b/widgets/table/test-table.c
@@ -260,8 +260,6 @@ table_browser_test (void)
gnome_canvas_root (GNOME_CANVAS (canvas)),
e_table_header_item_get_type (),
"ETableHeader", e_table_header,
- "x", 0,
- "y", 0,
NULL);
group = gnome_canvas_item_new (