Author: nick
Date: 2008-11-21 11:41:55 +0000 (Fri, 21 Nov 2008)
New Revision: 28873
Modified:
libxfcegui4/trunk/libxfcegui4/netk-screen.c
libxfcegui4/trunk/libxfcegui4/netk-trayicon.c
libxfcegui4/trunk/libxfcegui4/netk-window.c
libxfcegui4/trunk/libxfcegui4/netk-xutils.c
libxfcegui4/trunk/libxfcegui4/xfce_clock.c
Log:
* Fix some compile warnings.
Modified: libxfcegui4/trunk/libxfcegui4/netk-screen.c
===================================================================
--- libxfcegui4/trunk/libxfcegui4/netk-screen.c 2008-11-21 10:16:01 UTC (rev
28872)
+++ libxfcegui4/trunk/libxfcegui4/netk-screen.c 2008-11-21 11:41:55 UTC (rev
28873)
@@ -1218,12 +1218,12 @@
if (p_coord[x] < 0)
p_coord[x] = 0;
- else if (p_coord[x] > space_width - screen_width)
+ else if ((int) p_coord[x] > space_width - screen_width)
p_coord[x] = space_width - screen_width;
if (p_coord[y] < 0)
p_coord[y] = 0;
- else if (p_coord[y] > space_height - screen_height)
+ else if ((int) p_coord[y] > space_height - screen_height)
p_coord[y] = space_height - screen_height;
if (p_netk_workspace_set_viewport (space,
Modified: libxfcegui4/trunk/libxfcegui4/netk-trayicon.c
===================================================================
--- libxfcegui4/trunk/libxfcegui4/netk-trayicon.c 2008-11-21 10:16:01 UTC
(rev 28872)
+++ libxfcegui4/trunk/libxfcegui4/netk-trayicon.c 2008-11-21 11:41:55 UTC
(rev 28873)
@@ -195,7 +195,7 @@
{
case ClientMessage:
if (xev->message_type == icon->atoms.manager
- && xev->data.l[1] == icon->atoms.selection)
+ && xev->data.l[1] == (long) icon->atoms.selection)
{
/*
* tray appeared, update the icon window
Modified: libxfcegui4/trunk/libxfcegui4/netk-window.c
===================================================================
--- libxfcegui4/trunk/libxfcegui4/netk-window.c 2008-11-21 10:16:01 UTC (rev
28872)
+++ libxfcegui4/trunk/libxfcegui4/netk-window.c 2008-11-21 11:41:55 UTC (rev
28873)
@@ -925,7 +925,7 @@
NetkWorkspace *
netk_window_get_workspace (NetkWindow * window)
{
- if (window->priv->workspace == ALL_WORKSPACES)
+ if (window->priv->workspace == (gint) ALL_WORKSPACES)
return NULL;
else
return netk_screen_get_workspace (window->priv->screen,
@@ -958,7 +958,7 @@
{
g_return_val_if_fail (NETK_IS_WINDOW (window), FALSE);
- return (window->priv->workspace == ALL_WORKSPACES);
+ return (window->priv->workspace == (gint)ALL_WORKSPACES);
}
void
@@ -988,7 +988,7 @@
g_return_if_fail (NETK_IS_WINDOW (window));
- if (window->priv->workspace != ALL_WORKSPACES)
+ if (window->priv->workspace != (gint)ALL_WORKSPACES)
return;
active = netk_screen_get_active_workspace (window->priv->screen);
Modified: libxfcegui4/trunk/libxfcegui4/netk-xutils.c
===================================================================
--- libxfcegui4/trunk/libxfcegui4/netk-xutils.c 2008-11-21 10:16:01 UTC (rev
28872)
+++ libxfcegui4/trunk/libxfcegui4/netk-xutils.c 2008-11-21 11:41:55 UTC (rev
28873)
@@ -479,14 +479,13 @@
{
Atom type;
int format;
- gulong nitems;
+ gulong i, nitems;
gulong bytes_after;
gchar *val;
int err, result;
Atom utf8_string;
char **retval;
- int i;
- int n_strings;
+ gulong n_strings;
gchar *p;
utf8_string = p_netk_atom_get ("UTF8_STRING");
@@ -1188,7 +1187,7 @@
w = data[0];
h = data[1];
- if (nitems < ((w * h) + 2))
+ if (nitems < (gulong) ((w * h) + 2))
return FALSE; /* not enough data */
*width = MAX (w, *width);
@@ -1239,7 +1238,7 @@
w = data[0];
h = data[1];
- if (nitems < ((w * h) + 2))
+ if (nitems < (gulong) ((w * h) + 2))
break; /* not enough data */
if (best_start == NULL)
@@ -2520,7 +2519,7 @@
p_netk_atom_get ("_NET_WORKAREA"), 0L, 4 * number_of_desktops,
False, XA_CARDINAL, &real_type, &real_format, &items_read,
&items_left, (unsigned char **) &data) == Success)
- && (items_read >= 4 * number_of_desktops))
+ && (items_read >= (gulong) 4 * number_of_desktops))
{
int current_desktop;
Modified: libxfcegui4/trunk/libxfcegui4/xfce_clock.c
===================================================================
--- libxfcegui4/trunk/libxfcegui4/xfce_clock.c 2008-11-21 10:16:01 UTC (rev
28872)
+++ libxfcegui4/trunk/libxfcegui4/xfce_clock.c 2008-11-21 11:41:55 UTC (rev
28873)
@@ -1472,8 +1472,8 @@
m = tm->tm_min;
s = tm->tm_sec;
if (!(((!((clock->display_secs) || (clock->mode == XFCE_CLOCK_LEDS)))
- || (s == clock->old_second)) && (m == clock->old_minute)
- && (h == clock->old_hour)))
+ || (s == (gint)clock->old_second)) && (m == (gint)clock->old_minute)
+ && (h == (gint)clock->old_hour)))
{
clock->old_hour = h;
clock->old_minute = m;
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
