Fix several types of pedantic compiler warnings.

6 files changed, 10 insertions, 10 deletions

diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index b9a8544f57..f6cb11e509 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -152,15 +152,15 @@ ecv_draw (ECellView *ecell_view, GdkDrawable *drawable,
 		/* Now cause our subcells to draw their contents,
 		   shifted by subcell_offset pixels */
 		int width = allotted_width * hbox_view->def_size_cols[i] / 100;
-			//e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row);
-//		if (width < hbox_view->def_size_cols[i])
-	//		width = hbox_view->def_size_cols[i];
-//		printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width );
+			/* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row);
+		if (width < hbox_view->def_size_cols[i])
+			width = hbox_view->def_size_cols[i];
+		printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); */
 		e_cell_draw (hbox_view->subcell_views[i], drawable,
 			     hbox_view->model_cols[i], view_col, row, flags,
 			     x1 + subcell_offset , y1, x1 + subcell_offset + width, y2);
 
-		subcell_offset += width; //e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row);
+		subcell_offset += width; /* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); */
 	}
 }
 
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 8d90267a5e..892ff7cc5d 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -31,7 +31,7 @@ G_DEFINE_TYPE (ETableCol, e_table_col, G_TYPE_OBJECT)
 
 enum {
 	PROP_0,
-	PROP_COMPARE_COL,
+	PROP_COMPARE_COL
 };
 
 static void
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 5becaa30f2..510b5074f6 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -54,7 +54,7 @@ enum {
 
 enum {
 	PROP_0,
-	PROP_STATE,
+	PROP_STATE
 };
 
 enum {
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 69a300d950..f8321011b2 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -656,7 +656,7 @@ e_table_setup_header (ETable *e_table)
 
 	gtk_widget_show (GTK_WIDGET (e_table->header_canvas));
 
-	pointer = g_strdup_printf("%p", e_table);
+	pointer = g_strdup_printf("%p", (gpointer) e_table);
 
 	e_table->header_item = gnome_canvas_item_new (
 		gnome_canvas_root (e_table->header_canvas),
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 4eef7a9ad6..2b903ca0bc 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -36,7 +36,7 @@ enum {
 	PROP_CURSOR_ROW,
 	PROP_CURSOR_COL,
 	PROP_MODEL,
-	PROP_ETTA,
+	PROP_ETTA
 };
 
 struct ETreeSelectionModelPriv {
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 0963229c94..2eba9d4a82 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -704,7 +704,7 @@ e_tree_setup_header (ETree *e_tree)
 
 	gtk_widget_show (GTK_WIDGET (e_tree->priv->header_canvas));
 
-	pointer = g_strdup_printf("%p", e_tree);
+	pointer = g_strdup_printf("%p", (gpointer) e_tree);
 
 	e_tree->priv->header_item = gnome_canvas_item_new (
 		gnome_canvas_root (e_tree->priv->header_canvas),