From 04a042ee01dba30ba231c48ec7d172b6be1a6fca Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 25 May 2009 23:07:23 -0400
Subject: Fix compiler warnings in widgets.

---
 widgets/misc/e-cursors.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'widgets/misc/e-cursors.c')

diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
index ac03e18e70..f0b9ca6843 100644
--- a/widgets/misc/e-cursors.c
+++ b/widgets/misc/e-cursors.c
@@ -39,8 +39,8 @@
 
 typedef struct {
 	GdkCursor *cursor;
-	int       hot_x, hot_y;
-	char      **xpm;
+	gint hot_x, hot_y;
+	const gchar **xpm;
 } CursorDef;
 
 static CursorDef cursors [] = {
@@ -63,7 +63,7 @@ static CursorDef cursors [] = {
 
 
 static void
-create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, gchar **xpm)
+create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, const gchar **xpm)
 {
 	int height, width, colors;
 	char pixmap_buffer [(32 * 32)/8];
@@ -155,7 +155,7 @@ e_cursors_shutdown (void)
 GdkCursor *
 e_cursor_get (ECursorType type)
 {
-	g_return_val_if_fail (type >= 0 && type < E_CURSOR_NUM_CURSORS, NULL);
+	g_return_val_if_fail (type < E_CURSOR_NUM_CURSORS, NULL);
 
 	return cursors [type].cursor;
 }
-- 
cgit v1.2.3


From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 26 May 2009 23:21:02 -0400
Subject: Remove trailing whitespace, again.

---
 widgets/misc/e-cursors.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'widgets/misc/e-cursors.c')

diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
index f0b9ca6843..ebc2f9bd78 100644
--- a/widgets/misc/e-cursors.c
+++ b/widgets/misc/e-cursors.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
-- 
cgit v1.2.3