diff options
| author | dchen@redhat.com <dchen@dchen.redhat.com> | 2009-02-11 15:07:13 +1000 |
|---|---|---|
| committer | dchen@redhat.com <dchen@dchen.redhat.com> | 2009-02-11 15:07:13 +1000 |
| commit | dbdebcff3e27da92f9e4071a088077fb16ca9c02 (patch) | |
| tree | 04f26e752dd6ee442876855b8200f5a68e297e7c /src/ibusobject.h | |
| parent | 445d68d0a6ad1403f1c834067a2f04ffd06d485f (diff) | |
| parent | e24356351f817c873273d11a2efbdc4e47189fff (diff) | |
| download | ibus-dbdebcff3e27da92f9e4071a088077fb16ca9c02.tar.gz ibus-dbdebcff3e27da92f9e4071a088077fb16ca9c02.tar.xz ibus-dbdebcff3e27da92f9e4071a088077fb16ca9c02.zip | |
Fix conflict merge with phuang
Diffstat (limited to 'src/ibusobject.h')
| -rw-r--r-- | src/ibusobject.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ibusobject.h b/src/ibusobject.h index 36e8fc9..627936f 100644 --- a/src/ibusobject.h +++ b/src/ibusobject.h @@ -57,9 +57,10 @@ typedef enum { IBUS_RESERVED_2 = (1 << 3), } IBusObjectFlags; -#define IBUS_OBJECT_FLAGS(obj) (IBUS_OBJECT (obj)->flags) +#define IBUS_OBJECT_FLAGS(obj) (IBUS_OBJECT (obj)->flags) #define IBUS_OBJECT_SET_FLAGS(obj,flag) G_STMT_START{ (IBUS_OBJECT_FLAGS (obj) |= (flag)); }G_STMT_END #define IBUS_OBJECT_UNSET_FLAGS(obj,flag) G_STMT_START{ (IBUS_OBJECT_FLAGS (obj) &= ~(flag)); }G_STMT_END +#define IBUS_OBJECT_DESTROYED(obj) (IBUS_OBJECT_FLAGS (obj) & IBUS_DESTROYED) G_BEGIN_DECLS |