aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/e-table/ChangeLog6
-rw-r--r--widgets/e-table/e-table-item.c36
-rw-r--r--widgets/e-table/e-table.c2
-rw-r--r--widgets/table/e-table-item.c36
-rw-r--r--widgets/table/e-table.c2
5 files changed, 44 insertions, 38 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog
index e2e25b6f41..dc43161c53 100644
--- a/widgets/e-table/ChangeLog
+++ b/widgets/e-table/ChangeLog
@@ -1,5 +1,11 @@
2000-03-04 Christopher James Lahey <clahey@helixcode.com>
+ * e-table-item.c: Fixed a compile warning.
+
+ * e-table.c: Fixed a crash error.
+
+2000-03-04 Christopher James Lahey <clahey@helixcode.com>
+
* TODO: Added a bunch of stuff to the TODO list. Put +s before a
few of the items that are finished.
diff --git a/widgets/e-table/e-table-item.c b/widgets/e-table/e-table-item.c
index 222d4592cf..a38b6affac 100644
--- a/widgets/e-table/e-table-item.c
+++ b/widgets/e-table/e-table-item.c
@@ -300,6 +300,24 @@ eti_compute_height (ETableItem *eti)
}
}
+static void
+eti_item_region_redraw (ETableItem *eti, int x0, int y0, int x1, int y1)
+{
+ GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
+ ArtDRect rect;
+ double i2c [6];
+
+ rect.x0 = x0;
+ rect.y0 = y0;
+ rect.x1 = x1;
+ rect.y1 = y1;
+
+ gnome_canvas_item_i2c_affine (item, i2c);
+ art_drect_affine_transform (&rect, &rect, i2c);
+
+ gnome_canvas_request_redraw (item->canvas, rect.x0, rect.y0, rect.x1, rect.y1);
+}
+
/*
* Callback routine: invoked when the ETableModel has suffered a change
*/
@@ -320,24 +338,6 @@ eti_table_model_changed (ETableModel *table_model, ETableItem *eti)
eti_item_region_redraw (eti, 0, 0, eti->width, eti->height);
}
-static void
-eti_item_region_redraw (ETableItem *eti, int x0, int y0, int x1, int y1)
-{
- GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
- ArtDRect rect;
- double i2c [6];
-
- rect.x0 = x0;
- rect.y0 = y0;
- rect.x1 = x1;
- rect.y1 = y1;
-
- gnome_canvas_item_i2c_affine (item, i2c);
- art_drect_affine_transform (&rect, &rect, i2c);
-
- gnome_canvas_request_redraw (item->canvas, rect.x0, rect.y0, rect.x1, rect.y1);
-}
-
/*
* eti_request_redraw:
*
diff --git a/widgets/e-table/e-table.c b/widgets/e-table/e-table.c
index 7d1d9afd14..364ef3fb9c 100644
--- a/widgets/e-table/e-table.c
+++ b/widgets/e-table/e-table.c
@@ -704,7 +704,7 @@ e_table_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
char *copy;
copy = g_strdup(spec);
- xmlSpec = xmlParseMemory(copy, strlen(copy));
+ xmlSpec = xmlParseMemory(copy, strlen(copy) + 1);
et_real_construct(e_table, full_header, etm, xmlSpec);
g_free(copy);
}
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 222d4592cf..a38b6affac 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -300,6 +300,24 @@ eti_compute_height (ETableItem *eti)
}
}
+static void
+eti_item_region_redraw (ETableItem *eti, int x0, int y0, int x1, int y1)
+{
+ GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
+ ArtDRect rect;
+ double i2c [6];
+
+ rect.x0 = x0;
+ rect.y0 = y0;
+ rect.x1 = x1;
+ rect.y1 = y1;
+
+ gnome_canvas_item_i2c_affine (item, i2c);
+ art_drect_affine_transform (&rect, &rect, i2c);
+
+ gnome_canvas_request_redraw (item->canvas, rect.x0, rect.y0, rect.x1, rect.y1);
+}
+
/*
* Callback routine: invoked when the ETableModel has suffered a change
*/
@@ -320,24 +338,6 @@ eti_table_model_changed (ETableModel *table_model, ETableItem *eti)
eti_item_region_redraw (eti, 0, 0, eti->width, eti->height);
}
-static void
-eti_item_region_redraw (ETableItem *eti, int x0, int y0, int x1, int y1)
-{
- GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
- ArtDRect rect;
- double i2c [6];
-
- rect.x0 = x0;
- rect.y0 = y0;
- rect.x1 = x1;
- rect.y1 = y1;
-
- gnome_canvas_item_i2c_affine (item, i2c);
- art_drect_affine_transform (&rect, &rect, i2c);
-
- gnome_canvas_request_redraw (item->canvas, rect.x0, rect.y0, rect.x1, rect.y1);
-}
-
/*
* eti_request_redraw:
*
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 7d1d9afd14..364ef3fb9c 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -704,7 +704,7 @@ e_table_construct (ETable *e_table, ETableHeader *full_header, ETableModel *etm,
char *copy;
copy = g_strdup(spec);
- xmlSpec = xmlParseMemory(copy, strlen(copy));
+ xmlSpec = xmlParseMemory(copy, strlen(copy) + 1);
et_real_construct(e_table, full_header, etm, xmlSpec);
g_free(copy);
}