callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove a ton of (hopefully harmless) warnings from the ETable code.

Browse Source 
svn path=/trunk/; revision=5081
This commit is contained in:
Ettore Perazzoli
2000-08-28 15:27:38 +00:00
parent e3913975e8
commit 876558f75f
7 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
widgets/e-table/ChangeLog
View File

@ -1,3 +1,17 @@
2000-08-28 Ettore Perazzoli <ettore@helixcode.com>
* e-table.c (et_destroy): Don't try to destroy the `header_canvas'
if NULL.
* e-table-group-leaf.c (etgl_set_cursor_row): If the item is NULL,
don't try to set the cursor row for it.
* e-table.c (set_scroll_adjustments): Don't set the adjustment for
the `header_canvas' unless the `header_canvas' is not NULL.
* e-tree-model.c (e_tree_model_row_of_node): If the node is the
root, just return -1 without emitting a warning.
2000-08-25 Christopher James Lahey <clahey@helixcode.com>
* e-table-col.c, e-table-config.c, e-table-header.c,

8
widgets/e-table/e-table-group-leaf.c
View File

@ -227,9 +227,11 @@ static void
etgl_set_cursor_row (ETableGroup *etg, gint row)
{
ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
gnome_canvas_item_set(GNOME_CANVAS_ITEM(etgl->item),
"cursor_row", row,
NULL);
if (etgl->item != NULL)
gnome_canvas_item_set(GNOME_CANVAS_ITEM(etgl->item),
"cursor_row", row,
NULL);
}
static int

11
widgets/e-table/e-table.c
View File

@ -146,7 +146,10 @@ et_destroy (GtkObject *object)
gtk_object_unref (GTK_OBJECT (et->header));
gtk_object_unref (GTK_OBJECT (et->sort_info));
gtk_object_unref (GTK_OBJECT (et->sorter));
gtk_widget_destroy (GTK_WIDGET (et->header_canvas));
if (et->header_canvas != NULL)
gtk_widget_destroy (GTK_WIDGET (et->header_canvas));
gtk_widget_destroy (GTK_WIDGET (et->table_canvas));
if (et->rebuild_idle_id) {
@ -997,8 +1000,10 @@ set_scroll_adjustments (ETable *table,
hadjustment);
gtk_layout_set_vadjustment (GTK_LAYOUT(table->table_canvas),
vadjustment);
gtk_layout_set_hadjustment (GTK_LAYOUT(table->header_canvas),
hadjustment);
if (table->header_canvas != NULL)
gtk_layout_set_hadjustment (GTK_LAYOUT(table->header_canvas),
hadjustment);
}
gint

3
widgets/e-table/e-tree-model.c
View File

@ -446,6 +446,9 @@ e_tree_model_row_of_node (ETreeModel *etree, ETreePath *node)
{
int i;
if (etree->root == node)
return -1;
for (i = 0; i < etree->row_array->len; i ++)
if (g_array_index (etree->row_array, GNode*, i) == node)
return i;

8
widgets/table/e-table-group-leaf.c
View File

@ -227,9 +227,11 @@ static void
etgl_set_cursor_row (ETableGroup *etg, gint row)
{
ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
gnome_canvas_item_set(GNOME_CANVAS_ITEM(etgl->item),
"cursor_row", row,
NULL);
if (etgl->item != NULL)
gnome_canvas_item_set(GNOME_CANVAS_ITEM(etgl->item),
"cursor_row", row,
NULL);
}
static int

11
widgets/table/e-table.c
View File

@ -146,7 +146,10 @@ et_destroy (GtkObject *object)
gtk_object_unref (GTK_OBJECT (et->header));
gtk_object_unref (GTK_OBJECT (et->sort_info));
gtk_object_unref (GTK_OBJECT (et->sorter));
gtk_widget_destroy (GTK_WIDGET (et->header_canvas));
if (et->header_canvas != NULL)
gtk_widget_destroy (GTK_WIDGET (et->header_canvas));
gtk_widget_destroy (GTK_WIDGET (et->table_canvas));
if (et->rebuild_idle_id) {
@ -997,8 +1000,10 @@ set_scroll_adjustments (ETable *table,
hadjustment);
gtk_layout_set_vadjustment (GTK_LAYOUT(table->table_canvas),
vadjustment);
gtk_layout_set_hadjustment (GTK_LAYOUT(table->header_canvas),
hadjustment);
if (table->header_canvas != NULL)
gtk_layout_set_hadjustment (GTK_LAYOUT(table->header_canvas),
hadjustment);
}
gint

3
widgets/table/e-tree-model.c
View File

@ -446,6 +446,9 @@ e_tree_model_row_of_node (ETreeModel *etree, ETreePath *node)
{
int i;
if (etree->root == node)
return -1;
for (i = 0; i < etree->row_array->len; i ++)
if (g_array_index (etree->row_array, GNode*, i) == node)
return i;