[mutter] common: Don't define _WGO_BASE inside the enum
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] common: Don't define _WGO_BASE inside the enum
- Date: Sat, 16 Aug 2014 19:50:51 +0000 (UTC)
commit d0c004c93ccc7b01f95a9ea539e255c50156e6dc
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Sat Aug 16 15:48:38 2014 -0400
common: Don't define _WGO_BASE inside the enum
Doing this causes gobject-introspection to mess up and think that
the enum prefix is the empty string. Just use the long name within
the enum defines.
src/meta/common.h | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
---
diff --git a/src/meta/common.h b/src/meta/common.h
index 7324434..4dc7ea5 100644
--- a/src/meta/common.h
+++ b/src/meta/common.h
@@ -162,26 +162,25 @@ typedef enum
/* Window grab ops. */
META_GRAB_OP_WINDOW_BASE,
- _WGO_BASE = META_GRAB_OP_WINDOW_BASE,
- META_GRAB_OP_MOVING = _WGO_BASE,
- META_GRAB_OP_RESIZING_NW = _WGO_BASE | _WGO_N | _WGO_W,
- META_GRAB_OP_RESIZING_N = _WGO_BASE | _WGO_N,
- META_GRAB_OP_RESIZING_NE = _WGO_BASE | _WGO_N | _WGO_E,
- META_GRAB_OP_RESIZING_E = _WGO_BASE | _WGO_E,
- META_GRAB_OP_RESIZING_SW = _WGO_BASE | _WGO_S | _WGO_W,
- META_GRAB_OP_RESIZING_S = _WGO_BASE | _WGO_S,
- META_GRAB_OP_RESIZING_SE = _WGO_BASE | _WGO_S | _WGO_E,
- META_GRAB_OP_RESIZING_W = _WGO_BASE | _WGO_W,
- META_GRAB_OP_KEYBOARD_MOVING = _WGO_BASE | _WGO_K,
- META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN = _WGO_BASE | _WGO_U | _WGO_K,
- META_GRAB_OP_KEYBOARD_RESIZING_NW = _WGO_BASE | _WGO_N | _WGO_W | _WGO_K,
- META_GRAB_OP_KEYBOARD_RESIZING_N = _WGO_BASE | _WGO_N | _WGO_K,
- META_GRAB_OP_KEYBOARD_RESIZING_NE = _WGO_BASE | _WGO_N | _WGO_E | _WGO_K,
- META_GRAB_OP_KEYBOARD_RESIZING_E = _WGO_BASE | _WGO_E | _WGO_K,
- META_GRAB_OP_KEYBOARD_RESIZING_SW = _WGO_BASE | _WGO_S | _WGO_W | _WGO_K,
- META_GRAB_OP_KEYBOARD_RESIZING_S = _WGO_BASE | _WGO_S | _WGO_K,
- META_GRAB_OP_KEYBOARD_RESIZING_SE = _WGO_BASE | _WGO_S | _WGO_E | _WGO_K,
- META_GRAB_OP_KEYBOARD_RESIZING_W = _WGO_BASE | _WGO_W | _WGO_K,
+ META_GRAB_OP_MOVING = META_GRAB_OP_WINDOW_BASE,
+ META_GRAB_OP_RESIZING_NW = META_GRAB_OP_WINDOW_BASE | _WGO_N | _WGO_W,
+ META_GRAB_OP_RESIZING_N = META_GRAB_OP_WINDOW_BASE | _WGO_N,
+ META_GRAB_OP_RESIZING_NE = META_GRAB_OP_WINDOW_BASE | _WGO_N | _WGO_E,
+ META_GRAB_OP_RESIZING_E = META_GRAB_OP_WINDOW_BASE | _WGO_E,
+ META_GRAB_OP_RESIZING_SW = META_GRAB_OP_WINDOW_BASE | _WGO_S | _WGO_W,
+ META_GRAB_OP_RESIZING_S = META_GRAB_OP_WINDOW_BASE | _WGO_S,
+ META_GRAB_OP_RESIZING_SE = META_GRAB_OP_WINDOW_BASE | _WGO_S | _WGO_E,
+ META_GRAB_OP_RESIZING_W = META_GRAB_OP_WINDOW_BASE | _WGO_W,
+ META_GRAB_OP_KEYBOARD_MOVING = META_GRAB_OP_WINDOW_BASE | _WGO_K,
+ META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN = META_GRAB_OP_WINDOW_BASE | _WGO_U | _WGO_K,
+ META_GRAB_OP_KEYBOARD_RESIZING_NW = META_GRAB_OP_WINDOW_BASE | _WGO_N | _WGO_W | _WGO_K,
+ META_GRAB_OP_KEYBOARD_RESIZING_N = META_GRAB_OP_WINDOW_BASE | _WGO_N | _WGO_K,
+ META_GRAB_OP_KEYBOARD_RESIZING_NE = META_GRAB_OP_WINDOW_BASE | _WGO_N | _WGO_E | _WGO_K,
+ META_GRAB_OP_KEYBOARD_RESIZING_E = META_GRAB_OP_WINDOW_BASE | _WGO_E | _WGO_K,
+ META_GRAB_OP_KEYBOARD_RESIZING_SW = META_GRAB_OP_WINDOW_BASE | _WGO_S | _WGO_W | _WGO_K,
+ META_GRAB_OP_KEYBOARD_RESIZING_S = META_GRAB_OP_WINDOW_BASE | _WGO_S | _WGO_K,
+ META_GRAB_OP_KEYBOARD_RESIZING_SE = META_GRAB_OP_WINDOW_BASE | _WGO_S | _WGO_E | _WGO_K,
+ META_GRAB_OP_KEYBOARD_RESIZING_W = META_GRAB_OP_WINDOW_BASE | _WGO_W | _WGO_K,
} MetaGrabOp;
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]