button presses which run actions during interactive actions will cancel the action.

[chaz/openbox] / openbox / dock.c

diff --git a/openbox/dock.c b/openbox/dock.c
index 53c791396a1d7254d89d885dc9cdfaba75e19c80..5e61f00fb198b48d903a7a149d2fc7294213f844 100644 (file)
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -2,7 +2,7 @@
 
    dock.c for the Openbox window manager
    Copyright (c) 2006        Mikael Magnusson
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -220,7 +220,7 @@ void dock_configure()
     gint strw, strh;
     Rect *a;
 
-    RrMinsize(dock->a_frame, &minw, &minh);
+    RrMinSize(dock->a_frame, &minw, &minh);
 
     dock->w = dock->h = 0;
 
@@ -616,14 +616,14 @@ void dock_hide(gboolean hide)
     if (!hide) {
         if (dock->hidden && config_dock_hide) {
             ob_main_loop_timeout_add(ob_main_loop, config_dock_show_delay,
-                                 show_timeout, NULL, NULL);
+                                 show_timeout, NULL, g_direct_equal, NULL);
         } else if (!dock->hidden && config_dock_hide) {
             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_delay,
-                                 hide_timeout, NULL, NULL);
+                                 hide_timeout, NULL, g_direct_equal, NULL);
         } else if (dock->hidden && config_dock_hide) {
             ob_main_loop_timeout_remove(ob_main_loop, show_timeout);
         }