[mutter] Fix 'comparison between signed and unsigned integer' compiler errors
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Fix 'comparison between signed and unsigned integer' compiler errors
- Date: Mon, 17 Dec 2012 12:34:55 +0000 (UTC)
commit 7d7b859b40800a17acdc9ed755b5c8588954e865
Author: Rui Matos <tiagomatos gmail com>
Date: Mon Dec 17 12:30:01 2012 +0000
Fix 'comparison between signed and unsigned integer' compiler errors
src/core/keybindings.c | 4 ++--
src/core/prefs.c | 4 ++--
src/meta/prefs.h | 4 ++--
src/ui/ui.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index e3cec58..223d670 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1491,7 +1491,7 @@ process_overlay_key (MetaDisplay *display,
{
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;
@@ -1552,7 +1552,7 @@ process_overlay_key (MetaDisplay *display,
return TRUE;
}
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;
/* We keep the keyboard frozen - this allows us to use ReplayKeyboard
diff --git a/src/core/prefs.c b/src/core/prefs.c
index fadf01f..d5cf3dd 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -2137,13 +2137,13 @@ meta_prefs_get_window_binding (const char *name,
g_assert_not_reached ();
}
-guint
+gint
meta_prefs_get_mouse_button_resize (void)
{
return resize_with_right_button ? 3: 2;
}
-guint
+gint
meta_prefs_get_mouse_button_menu (void)
{
return resize_with_right_button ? 2: 3;
diff --git a/src/meta/prefs.h b/src/meta/prefs.h
index 0545127..6fe31a3 100644
--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -86,8 +86,8 @@ void meta_prefs_override_preference_schema (const char *key,
const char* meta_preference_to_string (MetaPreference pref);
MetaVirtualModifier meta_prefs_get_mouse_button_mods (void);
-guint meta_prefs_get_mouse_button_resize (void);
-guint meta_prefs_get_mouse_button_menu (void);
+gint meta_prefs_get_mouse_button_resize (void);
+gint meta_prefs_get_mouse_button_menu (void);
GDesktopFocusMode meta_prefs_get_focus_mode (void);
GDesktopFocusNewWindows meta_prefs_get_focus_new_windows (void);
gboolean meta_prefs_get_attach_modal_dialogs (void);
diff --git a/src/ui/ui.c b/src/ui/ui.c
index e161d26..2e7dd4a 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -50,7 +50,7 @@ struct _MetaUI
MetaFrames *frames;
/* For double-click tracking */
- guint button_click_number;
+ gint button_click_number;
Window button_click_window;
int button_click_x;
int button_click_y;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]