diff options
| author | Dana Jansens <danakj@orodu.net> | 2011-01-28 13:25:32 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2011-08-01 11:50:16 -0400 |
| commit | 5b2ed63cb4d97c3a0492de272517a1c054949a8d (patch) | |
| tree | 794555359914bafcbe496fe97b23cf801dc614f9 | |
| parent | 2288da0ae3b44c987687e3deeb7864fcb7b23bb9 (diff) | |
Fix bug #4877 (Some harmless code quirks involving booleans)
| -rw-r--r-- | data/rc.xsd | 9 | ||||
| -rw-r--r-- | openbox/focus_cycle.c | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/data/rc.xsd b/data/rc.xsd index 03a38e5b..ad96994a 100644 --- a/data/rc.xsd +++ b/data/rc.xsd @@ -171,7 +171,7 @@ <xsd:element minOccurs="0" name="edge" type="xsd:string"/> <xsd:element minOccurs="0" name="wrap" type="ob:bool"/> <xsd:element minOccurs="0" name="follow" type="ob:bool"/> - <xsd:element minOccurs="0" name="dialog" type="ob:bool"/> + <xsd:element minOccurs="0" name="dialog" type="ob:dialogtype"/> <xsd:element minOccurs="0" name="panels" type="ob:bool"/> <xsd:element minOccurs="0" name="here" type="ob:bool"/> <xsd:element minOccurs="0" name="linear" type="ob:bool"/> @@ -541,4 +541,11 @@ <xsd:enumeration value="Nonpixel"/> </xsd:restriction> </xsd:simpleType> + <xsd:simpleType name="dialogtype"> + <xsd:restriction base="xsd:string"> + <xsd:enumeration value="None"/> + <xsd:enumeration value="Icons"/> + <xsd:enumeration value="List"/> + </xsd:restriction> + </xsd:simpleType> </xsd:schema> diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index 39d704cc..6d4cc2a5 100644 --- a/openbox/focus_cycle.c +++ b/openbox/focus_cycle.c @@ -93,7 +93,8 @@ void focus_cycle_reorder() focus_cycle_update_indicator(focus_cycle_target); if (!focus_cycle_target) focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, - TRUE, TRUE, TRUE, TRUE, TRUE); + TRUE, TRUE, OB_FOCUS_CYCLE_POPUP_MODE_NONE, + TRUE, TRUE); } } |