sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Fix 'comparison between signed and unsigned integer' compiler errors

Browse source
This commit is contained in:
Rui Matos 2012-12-17 12:30:01 +00:00
parent d78de379cc
commit 7d7b859b40
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/keybindings.c
View file

@ -1491,7 +1491,7 @@ process_overlay_key (MetaDisplay *display,
{ {
if (display->overlay_key_only_pressed) if (display->overlay_key_only_pressed)
{ {
if (event->detail != display->overlay_key_combo.keycode) if (event->detail != (int)display->overlay_key_combo.keycode)
{ {
display->overlay_key_only_pressed = FALSE; display->overlay_key_only_pressed = FALSE;
@ -1552,7 +1552,7 @@ process_overlay_key (MetaDisplay *display,
return TRUE; return TRUE;
} }
else if (event->evtype == XI_KeyPress && else if (event->evtype == XI_KeyPress &&
event->detail == display->overlay_key_combo.keycode) event->detail == (int)display->overlay_key_combo.keycode)
{ {
display->overlay_key_only_pressed = TRUE; display->overlay_key_only_pressed = TRUE;
/* We keep the keyboard frozen - this allows us to use ReplayKeyboard /* We keep the keyboard frozen - this allows us to use ReplayKeyboard

4
src/core/prefs.c
View file

@ -2137,13 +2137,13 @@ meta_prefs_get_window_binding (const char *name,
g_assert_not_reached (); g_assert_not_reached ();
} }
guint gint
meta_prefs_get_mouse_button_resize (void) meta_prefs_get_mouse_button_resize (void)
{ {
return resize_with_right_button ? 3: 2; return resize_with_right_button ? 3: 2;
} }
guint gint
meta_prefs_get_mouse_button_menu (void) meta_prefs_get_mouse_button_menu (void)
{ {
return resize_with_right_button ? 2: 3; return resize_with_right_button ? 2: 3;

4
src/meta/prefs.h
View file

@ -86,8 +86,8 @@ void meta_prefs_override_preference_schema (const char *key,
const char* meta_preference_to_string (MetaPreference pref); const char* meta_preference_to_string (MetaPreference pref);
MetaVirtualModifier meta_prefs_get_mouse_button_mods (void); MetaVirtualModifier meta_prefs_get_mouse_button_mods (void);
guint meta_prefs_get_mouse_button_resize (void); gint meta_prefs_get_mouse_button_resize (void);
guint meta_prefs_get_mouse_button_menu (void); gint meta_prefs_get_mouse_button_menu (void);
GDesktopFocusMode meta_prefs_get_focus_mode (void); GDesktopFocusMode meta_prefs_get_focus_mode (void);
GDesktopFocusNewWindows meta_prefs_get_focus_new_windows (void); GDesktopFocusNewWindows meta_prefs_get_focus_new_windows (void);
gboolean meta_prefs_get_attach_modal_dialogs (void); gboolean meta_prefs_get_attach_modal_dialogs (void);

2
src/ui/ui.c
View file

@ -50,7 +50,7 @@ struct _MetaUI
MetaFrames *frames; MetaFrames *frames;
/* For double-click tracking */ /* For double-click tracking */
guint button_click_number; gint button_click_number;
Window button_click_window; Window button_click_window;
int button_click_x; int button_click_x;
int button_click_y; int button_click_y;