diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2008-03-08 17:43:32 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2008-03-08 17:43:32 +0100 |
| commit | ec328fc04fe6e8d8c3d1ee386d4964963eb2ee17 (patch) | |
| tree | c91070084eee7915dd29453076dc7f30b5b97fa0 /openbox/menuframe.c | |
| parent | cfe36a0df2db3e5fd4c52e32093ea095492297cf (diff) | |
| parent | c716d1788bb4f4b9db403617023f06347ba48102 (diff) | |
Merge branch 'backport' into work
Conflicts:
obt/keyboard.c
openbox/actions/cyclewindows.c
openbox/actions/directionalwindows.c
openbox/frame.c
openbox/openbox.c
Diffstat (limited to 'openbox/menuframe.c')
| -rw-r--r-- | openbox/menuframe.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 7b4c872b..1e767e96 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -701,7 +701,6 @@ void menu_frame_render(ObMenuFrame *self) XSetWindowBorder(obt_display, e->window, RrColorPixel(ob_rr_theme->menu_border_color)); - text_a = (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && !e->entry->data.normal.enabled ? /* disabled */ @@ -1091,7 +1090,6 @@ void menu_frame_hide_all_client(ObClient *client) } } - ObMenuFrame* menu_frame_under(gint x, gint y) { ObMenuFrame *ret = NULL; |