diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-09-21 19:31:45 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-09-21 19:31:45 +0000 |
| commit | 22bf54526c96bd108d8b4fa8a7fedd23b6495226 (patch) | |
| tree | 63bb1ace022bdf48ed51706ef8ad172fdd9c11b9 | |
| parent | 38370b2e82c20acc1a42a03e1e26bdc018a0b9e5 (diff) | |
rename dock/himeTimeout to dock/hideDelay in the config file
| -rw-r--r-- | openbox/config.c | 8 | ||||
| -rw-r--r-- | openbox/config.h | 2 | ||||
| -rw-r--r-- | openbox/dock.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/openbox/config.c b/openbox/config.c index c86b739c..d05b9ab9 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -44,7 +44,7 @@ gint config_dock_x; gint config_dock_y; ObOrientation config_dock_orient; gboolean config_dock_hide; -guint config_dock_hide_timeout; +guint config_dock_hide_delay; guint config_keyboard_reset_keycode; guint config_keyboard_reset_state; @@ -317,8 +317,8 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) } if ((n = parse_find_node("autoHide", node))) config_dock_hide = parse_bool(doc, n); - if ((n = parse_find_node("hideTimeout", node))) - config_dock_hide_timeout = parse_int(doc, n) * 1000; + if ((n = parse_find_node("hideDelay", node))) + config_dock_hide_delay = parse_int(doc, n) * 1000; } static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d) @@ -502,7 +502,7 @@ void config_startup(ObParseInst *i) config_dock_y = 0; config_dock_orient = OB_ORIENTATION_VERT; config_dock_hide = FALSE; - config_dock_hide_timeout = 300; + config_dock_hide_delay = 300; parse_register(i, "dock", parse_dock, NULL); diff --git a/openbox/config.h b/openbox/config.h index 4e687395..917e8fa7 100644 --- a/openbox/config.h +++ b/openbox/config.h @@ -54,7 +54,7 @@ extern ObOrientation config_dock_orient; /*! Whether to auto-hide the dock when the pointer is not over it */ extern gboolean config_dock_hide; /*! The number of microseconds to wait before hiding the dock */ -extern guint config_dock_hide_timeout; +extern guint config_dock_hide_delay; /* The name of the theme */ extern char *config_theme; diff --git a/openbox/dock.c b/openbox/dock.c index fe9a0f50..4c5e892a 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -584,7 +584,7 @@ void dock_hide(gboolean hide) /* if was hiding, stop it */ ob_main_loop_timeout_remove(ob_main_loop, hide_timeout); } else if (!dock->hidden && config_dock_hide) { - ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_timeout, + ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_delay, hide_timeout, NULL, NULL); } } |