From a538f3f3100dbdbae1ea172ae3b8344e650d529d Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 16 May 2009 12:11:55 -0400
Subject: Fix several types of pedantic compiler warnings.

---
 widgets/misc/e-canvas-background.c | 2 +-
 widgets/misc/e-canvas.c            | 8 ++++----
 widgets/misc/e-charset-picker.c    | 2 +-
 widgets/misc/e-filter-bar.c        | 2 +-
 widgets/misc/e-filter-bar.h        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'widgets/misc')

diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 77cad661e1..4d300f01d4 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -74,7 +74,7 @@ enum {
 	PROP_X1,
 	PROP_X2,
 	PROP_Y1,
-	PROP_Y2,
+	PROP_Y2
 };
 
 static void
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 3cb85c5839..903331576e 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -837,7 +837,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id)
 		if (func)
 			func(info->item, flags, info->id);
 		g_message ("ECANVAS: free info (2): item %p, id %p",
-			   info->item, info->id);
+			   (gpointer) info->item, (gpointer) info->id);
 		g_object_unref (info->item);
 		g_free(info);
 	}
@@ -851,7 +851,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id)
 	info->item = item;
 	g_object_ref (info->item);
 	info->id = id;
-	g_message ("ECANVAS: new info item %p, id %p", item, id);
+	g_message ("ECANVAS: new info item %p, id %p", (gpointer) item, (gpointer) id);
 
 	flags = E_CANVAS_ITEM_SELECTION_SELECT | E_CANVAS_ITEM_SELECTION_CURSOR;
 	func = (ECanvasItemSelectionFunc)g_object_get_data(G_OBJECT(item),
@@ -920,7 +920,7 @@ e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id)
 	info->item = item;
 	g_object_ref (info->item);
 	info->id = id;
-	g_message ("ECANVAS: new info (2): item %p, id %p", item, id);
+	g_message ("ECANVAS: new info (2): item %p, id %p", (gpointer) item, (gpointer) id);
 
 	func = (ECanvasItemSelectionFunc)g_object_get_data(G_OBJECT(item),
 							   "ECanvasItem::selection_callback");
@@ -967,7 +967,7 @@ e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id)
 					canvas->cursor = NULL;
 
 				g_message ("ECANVAS: removing info: item %p, info %p",
-					   info->item, info->id);
+					   (gpointer) info->item, (gpointer) info->id);
 				g_object_unref (info->item);
 				g_free(info);
 				g_list_free_1(list);
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index 6b30b3b11c..81505dcb02 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -46,7 +46,7 @@ typedef enum {
 	E_CHARSET_TURKISH,
 	E_CHARSET_UNICODE,
 	E_CHARSET_WESTERN_EUROPEAN,
-	E_CHARSET_WESTERN_EUROPEAN_NEW,
+	E_CHARSET_WESTERN_EUROPEAN_NEW
 } ECharsetClass;
 
 static const char *classnames[] = {
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 2125bdf30d..6d4bff46ca 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -37,7 +37,7 @@
 enum {
 	PROP_0,
 	PROP_QUERY,
-	PROP_STATE,
+	PROP_STATE
 };
 
 static gpointer parent_class;
diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index edc20e2fec..957eea3d0b 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.h
@@ -107,7 +107,7 @@ enum {
 	E_FILTERBAR_CURRENT_MESSAGE_ID = -6,
 	E_FILTERBAR_CURRENT_FOLDER_ID = -7,
 	E_FILTERBAR_CURRENT_ACCOUNT_ID = -8,
-	E_FILTERBAR_ALL_ACCOUNTS_ID = -9,
+	E_FILTERBAR_ALL_ACCOUNTS_ID = -9
 };
 
 #define E_FILTERBAR_SAVE      { N_("_Save Search..."), E_FILTERBAR_SAVE_ID, 0 }
-- 
cgit v1.2.3