aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-cursors.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-27 04:58:27 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-27 04:58:27 +0800
commit333656eba50f2120bbee3e817b8faf0baf448faf (patch)
tree3869bc4847dd4ab67625b82207ff98ef19045e8d /widgets/misc/e-cursors.c
parent1682814ef78902b385fe84589f8755b0ff4b5b5a (diff)
parentffa17ed195a6bbb40d386fb572b7941e22f47f8d (diff)
downloadgsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar
gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.gz
gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.bz2
gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.lz
gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.xz
gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.tar.zst
gsoc2013-evolution-333656eba50f2120bbee3e817b8faf0baf448faf.zip
Merge branch 'warnings'
Diffstat (limited to 'widgets/misc/e-cursors.c')
-rw-r--r--widgets/misc/e-cursors.c8
1 files changed, 4 insertions, 4 deletions
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;
}