summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2007-04-29 10:19:38 +0000
committerVincent Untz <vuntz@src.gnome.org>2007-04-29 10:19:38 +0000
commit07c40a209811978000dfb221954a978997dc130d (patch)
treeb794457bde45d69e641be151f0fced4543225e32
parentec0efe390e22b1cd34bbc3201f8ab5ebc1de4dc5 (diff)
downloadlibwnck-07c40a209811978000dfb221954a978997dc130d.tar.gz
fix compilation warnings Fix bug #431175, based on patch by Bernard Leak
2007-04-29 Vincent Untz <vuntz@gnome.org> * libwnck/window.h: * libwnck/xutils.c: (_wnck_get_string_property_latin1): (_wnck_get_utf8_property): (_wnck_set_utf8_list): (_wnck_get_window_geometry): fix compilation warnings Fix bug #431175, based on patch by Bernard Leak <bernard@brenda-arkle.demon.co.uk> svn path=/trunk/; revision=1207
-rw-r--r--ChangeLog10
-rw-r--r--libwnck/window.h2
-rw-r--r--libwnck/xutils.c9
3 files changed, 16 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b1d75d..db19735 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2007-04-29 Vincent Untz <vuntz@gnome.org>
+ * libwnck/window.h:
+ * libwnck/xutils.c: (_wnck_get_string_property_latin1):
+ (_wnck_get_utf8_property):
+ (_wnck_set_utf8_list):
+ (_wnck_get_window_geometry): fix compilation warnings
+ Fix bug #431175, based on patch by Bernard Leak
+ <bernard@brenda-arkle.demon.co.uk>
+
+2007-04-29 Vincent Untz <vuntz@gnome.org>
+
* libwnck/pager.c: (wnck_update_drag_icon): make sure the width and
the height of the rectangle are strictly positive (so we don't try to
draw in a non-existing rectangle)
diff --git a/libwnck/window.h b/libwnck/window.h
index da2245d..411a38b 100644
--- a/libwnck/window.h
+++ b/libwnck/window.h
@@ -104,7 +104,7 @@ typedef enum
WNCK_WINDOW_CHANGE_X = 1 << 0,
WNCK_WINDOW_CHANGE_Y = 1 << 1,
WNCK_WINDOW_CHANGE_WIDTH = 1 << 2,
- WNCK_WINDOW_CHANGE_HEIGHT = 1 << 3,
+ WNCK_WINDOW_CHANGE_HEIGHT = 1 << 3
} WnckWindowMoveResizeMask;
#define WNCK_TYPE_WINDOW (wnck_window_get_type ())
diff --git a/libwnck/xutils.c b/libwnck/xutils.c
index 2774c93..98d37e1 100644
--- a/libwnck/xutils.c
+++ b/libwnck/xutils.c
@@ -295,7 +295,7 @@ _wnck_get_string_property_latin1 (Window xwindow,
int format;
gulong nitems;
gulong bytes_after;
- guchar *str;
+ gchar *str;
int err, result;
char *retval;
@@ -333,7 +333,7 @@ _wnck_get_utf8_property (Window xwindow,
int format;
gulong nitems;
gulong bytes_after;
- guchar *val;
+ gchar *val;
int err, result;
char *retval;
Atom utf8_string;
@@ -627,7 +627,7 @@ _wnck_set_utf8_list (Window xwindow,
xwindow,
atom,
utf8_string, 8, PropModeReplace,
- flattened->str, flattened->len);
+ (guchar *) flattened->str, flattened->len);
_wnck_error_trap_pop ();
@@ -2216,7 +2216,8 @@ _wnck_get_window_geometry (Screen *screen,
int *widthp,
int *heightp)
{
- int x, y, width, height, bw, depth;
+ int x, y;
+ unsigned int width, height, bw, depth;
Window root_window;
width = 1;