aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-18 11:12:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-18 11:12:33 +0000
commit01fa5465743c9ee43d040350f4405d35293e4869 (patch)
tree92b9184ebd5f235b11235099cf525ac1ee2d59af
parent403a7b916584dc9f443fd366e605e0d5b1c5541c (diff)
downloadmatchbox-window-manager-2-01fa5465743c9ee43d040350f4405d35293e4869.tar.gz
matchbox-window-manager-2-01fa5465743c9ee43d040350f4405d35293e4869.tar.bz2
matchbox-window-manager-2-01fa5465743c9ee43d040350f4405d35293e4869.zip
Fix XChangeProperty variable type
According to XChangeProperty doc, array of "long" should be used when format is 32. This patch changes the variable to the correct type. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--matchbox/core/mb-window-manager.c6
-rw-r--r--matchbox/core/mb-wm-client-base.c4
-rw-r--r--matchbox/core/mb-wm-root-window.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/matchbox/core/mb-window-manager.c b/matchbox/core/mb-window-manager.c
index 3b5afee..6e209ac 100644
--- a/matchbox/core/mb-window-manager.c
+++ b/matchbox/core/mb-window-manager.c
@@ -1825,7 +1825,7 @@ mb_wm_activate_client_real (MBWindowManager * wm, MBWindowManagerClient *c)
if (is_desktop != was_desktop)
{
- CARD32 card = is_desktop ? 1 : 0;
+ long card = is_desktop ? 1 : 0;
XChangeProperty(wm->xdpy, wm->root_win->xwindow,
wm->atoms[MBWM_ATOM_NET_SHOWING_DESKTOP],
@@ -2204,7 +2204,7 @@ mb_wm_get_modality_type (MBWindowManager * wm)
void
mb_wm_set_n_desktops (MBWindowManager *wm, int n_desktops)
{
- CARD32 card32 = n_desktops;
+ long card32 = n_desktops;
wm->n_desktops = n_desktops;
@@ -2220,7 +2220,7 @@ mb_wm_set_n_desktops (MBWindowManager *wm, int n_desktops)
void
mb_wm_select_desktop (MBWindowManager *wm, int desktop)
{
- CARD32 card32 = desktop;
+ long card32 = desktop;
MBWindowManagerClient *c;
int old_desktop;
diff --git a/matchbox/core/mb-wm-client-base.c b/matchbox/core/mb-wm-client-base.c
index daa679d..4dbf7a7 100644
--- a/matchbox/core/mb-wm-client-base.c
+++ b/matchbox/core/mb-wm-client-base.c
@@ -299,7 +299,7 @@ mb_wm_client_base_set_state_props (MBWindowManagerClient *c)
Window xwin = c->window->xwindow;
MBWindowManager *wm = c->wmref;
Display *xdpy = wm->xdpy;
- CARD32 card32[2];
+ long card32[2];
Atom ewmh_state [MBWMClientWindowEWHMStatesCount];
int ewmh_i = 0;
@@ -493,7 +493,7 @@ mb_wm_client_base_display_sync (MBWindowManagerClient *client)
if (mb_wm_client_needs_geometry_sync (client))
{
int x, y, w, h;
- CARD32 wgeom[4];
+ long wgeom[4];
mb_wm_util_trap_x_errors();
diff --git a/matchbox/core/mb-wm-root-window.c b/matchbox/core/mb-wm-root-window.c
index 62016bb..40e2732 100644
--- a/matchbox/core/mb-wm-root-window.c
+++ b/matchbox/core/mb-wm-root-window.c
@@ -170,7 +170,7 @@ mb_wm_root_window_update_supported_props (MBWMRootWindow *win)
{
MBWindowManager *wm = win->wm;
Window rwin = win->xwindow;
- CARD32 num_supported = 0;
+ long num_supported = 0;
/*
* Supported info
@@ -253,7 +253,7 @@ mb_wm_root_window_init_properties (MBWMRootWindow * win)
Window rwin = win->xwindow;
Window hwin = win->hidden_window;
- CARD32 card32;
+ long card32;
unsigned long val[2];
char *app_name = "matchbox";