brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xprops: Some more cardinal-related hygiene

Browse Source
This commit is contained in:
Jasper St. Pierre 2015-06-23 15:32:07 -07:00
parent 12771a555a
commit 7f3ada7831
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/screen.c
View File

@ -750,7 +750,7 @@ void
meta_screen_init_workspaces (MetaScreen *screen) meta_screen_init_workspaces (MetaScreen *screen)
{ {
MetaWorkspace *current_workspace; MetaWorkspace *current_workspace;
gulong current_workspace_index = 0; uint32_t current_workspace_index = 0;
guint32 timestamp; guint32 timestamp;
g_return_if_fail (META_IS_SCREEN (screen)); g_return_if_fail (META_IS_SCREEN (screen));

4
src/x11/window-x11.c
View File

@ -2774,7 +2774,7 @@ maybe_filter_xwindow (MetaDisplay *display,
*/ */
if (!must_be_viewable || attrs->map_state == IsViewable) if (!must_be_viewable || attrs->map_state == IsViewable)
{ {
gulong old_state; uint32_t old_state;
if (!meta_prop_get_cardinal_with_atom_type (display, xwindow, if (!meta_prop_get_cardinal_with_atom_type (display, xwindow,
display->atom_WM_STATE, display->atom_WM_STATE,
@ -2910,7 +2910,7 @@ meta_window_x11_new (MetaDisplay *display,
if (must_be_viewable && attrs.map_state != IsViewable) if (must_be_viewable && attrs.map_state != IsViewable)
{ {
/* Only manage if WM_STATE is IconicState or NormalState */ /* Only manage if WM_STATE is IconicState or NormalState */
gulong state; uint32_t state;
/* WM_STATE isn't a cardinal, it's type WM_STATE, but is an int */ /* WM_STATE isn't a cardinal, it's type WM_STATE, but is an int */
if (!(meta_prop_get_cardinal_with_atom_type (display, xwindow, if (!(meta_prop_get_cardinal_with_atom_type (display, xwindow,

6
src/x11/xprops.c
View File

@ -703,7 +703,7 @@ gboolean
meta_prop_get_cardinal (MetaDisplay *display, meta_prop_get_cardinal (MetaDisplay *display,
Window xwindow, Window xwindow,
Atom xatom, Atom xatom,
gulong *cardinal_p) uint32_t *cardinal_p)
{ {
return meta_prop_get_cardinal_with_atom_type (display, xwindow, xatom, return meta_prop_get_cardinal_with_atom_type (display, xwindow, xatom,
XA_CARDINAL, cardinal_p); XA_CARDINAL, cardinal_p);
@ -712,7 +712,7 @@ meta_prop_get_cardinal (MetaDisplay *display,
static gboolean static gboolean
cardinal_with_atom_type_from_results (GetPropertyResults *results, cardinal_with_atom_type_from_results (GetPropertyResults *results,
Atom prop_type, Atom prop_type,
gulong *cardinal_p) uint32_t *cardinal_p)
{ {
if (!validate_or_free_results (results, 32, prop_type, TRUE)) if (!validate_or_free_results (results, 32, prop_type, TRUE))
return FALSE; return FALSE;
@ -729,7 +729,7 @@ meta_prop_get_cardinal_with_atom_type (MetaDisplay *display,
Window xwindow, Window xwindow,
Atom xatom, Atom xatom,
Atom prop_type, Atom prop_type,
gulong *cardinal_p) uint32_t *cardinal_p)
{ {
GetPropertyResults results; GetPropertyResults results;

6
src/x11/xprops.h
View File

@ -115,12 +115,12 @@ gboolean meta_prop_get_window (MetaDisplay *display,
gboolean meta_prop_get_cardinal (MetaDisplay *display, gboolean meta_prop_get_cardinal (MetaDisplay *display,
Window xwindow, Window xwindow,
Atom xatom, Atom xatom,
gulong *cardinal_p); uint32_t *cardinal_p);
gboolean meta_prop_get_cardinal_with_atom_type (MetaDisplay *display, gboolean meta_prop_get_cardinal_with_atom_type (MetaDisplay *display,
Window xwindow, Window xwindow,
Atom xatom, Atom xatom,
Atom prop_type, Atom prop_type,
gulong *cardinal_p); uint32_t *cardinal_p);
gboolean meta_prop_get_text_property (MetaDisplay *display, gboolean meta_prop_get_text_property (MetaDisplay *display,
Window xwindow, Window xwindow,
Atom xatom, Atom xatom,
@ -174,7 +174,7 @@ typedef struct
char *str; char *str;
MotifWmHints *motif_hints; MotifWmHints *motif_hints;
Window xwindow; Window xwindow;
gulong cardinal; uint32_t cardinal;
XWMHints *wm_hints; XWMHints *wm_hints;
XClassHint class_hint; XClassHint class_hint;
XSyncCounter xcounter; XSyncCounter xcounter;