diff options
author | Huang Peng <shawn.p.huang@gmail.com> | 2008-10-03 12:21:43 +0800 |
---|---|---|
committer | Huang Peng <shawn.p.huang@gmail.com> | 2008-10-03 12:21:43 +0800 |
commit | 43471e1c3ffcc592f760d54ec35c99903032fbc4 (patch) | |
tree | 09210f4d60c004d81b302732b0dd7dcdb802dbe5 /client/x11 | |
parent | bc9dbaa52ac8e4de2651eb2dd1658d731dd487f5 (diff) | |
download | ibus-43471e1c3ffcc592f760d54ec35c99903032fbc4.tar.gz ibus-43471e1c3ffcc592f760d54ec35c99903032fbc4.tar.xz ibus-43471e1c3ffcc592f760d54ec35c99903032fbc4.zip |
Remove _is_attr.
Diffstat (limited to 'client/x11')
-rw-r--r-- | client/x11/main.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/client/x11/main.c b/client/x11/main.c index b733fb7..95ff8b6 100644 --- a/client/x11/main.c +++ b/client/x11/main.c @@ -255,15 +255,14 @@ _xim_store_ic_values (X11IC *x11ic, IMChangeICStruct *call_data) guint32 attrs = 1; g_return_val_if_fail (x11ic != NULL, 0); -#define _is_attr(a, b) (g_strcmp0(a, b->name) == 0) for (i=0; i< (int) call_data->ic_attr_num; ++i, ++ic_attr) { - if (_is_attr (XNInputStyle, ic_attr)) { + if (g_strcmp0 (XNInputStyle, ic_attr->name) == 0) { x11ic->input_style = *(gint32 *) ic_attr->value; } - else if (_is_attr (XNClientWindow, ic_attr)) { + else if (g_strcmp0 (XNClientWindow, ic_attr->name) == 0) { x11ic->client_window = *(Window *) call_data->ic_attr[i].value; } - else if (_is_attr (XNFocusWindow, ic_attr)) { + else if (g_strcmp0 (XNFocusWindow, ic_attr) == 0) { x11ic->focus_window = *(Window *) call_data->ic_attr[i].value; } else { @@ -272,7 +271,7 @@ _xim_store_ic_values (X11IC *x11ic, IMChangeICStruct *call_data) } for (i=0; i< (int) call_data->preedit_attr_num; ++i, ++pre_attr) { - if (_is_attr (XNSpotLocation, pre_attr)) { + if (g_strcmp0 (XNSpotLocation, pre_attr->name) == 0) { x11ic->has_preedit_area = TRUE; x11ic->preedit_area.x = ((XPoint *)pre_attr->value)->x; x11ic->preedit_area.y = ((XPoint *)pre_attr->value)->y; @@ -286,10 +285,7 @@ _xim_store_ic_values (X11IC *x11ic, IMChangeICStruct *call_data) // g_debug ("Unkown status attribute: %s", sts_attr->name); } -#undef _is_attr - return attrs; - } |