Merge branch 'master' into chaz

[chaz/openbox] / openbox / dock.c

diff --git a/openbox/dock.c b/openbox/dock.c
index b8a5ff5668d42f39b9b05dca00142582436ba95a..f18683d6044e5d684a0e24414319cc3028334376 100644 (file)
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -145,7 +145,7 @@ void dock_manage(Window icon_win, Window name_win)
     app->name_win = name_win;
     app->icon_win = icon_win;
 
-    if (OBT_PROP_GETSS(app->name_win, WM_CLASS, locale, &data)) {
+    if (OBT_PROP_GETSS_TYPE(app->name_win, WM_CLASS, STRING_NO_CC, &data)) {
         if (data[0]) {
             app->name = g_strdup(data[0]);
             if (data[1])
@@ -551,6 +551,8 @@ void dock_configure(void)
         dock->area.height += ob_rr_theme->obwidth * 2;
     }
 
+    /* screen_resize() depends on this function to call screen_update_areas(),
+       so if this changes, also update screen_resize(). */
     screen_update_areas();
 }
 
@@ -632,7 +634,6 @@ static gboolean hide_timeout(gpointer data)
 
     hide_timeout_id = 0;
 
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
@@ -644,7 +645,6 @@ static gboolean show_timeout(gpointer data)
 
     show_timeout_id = 0;
 
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
@@ -662,7 +662,7 @@ void dock_hide(gboolean hide)
     } else {
         if (!dock->hidden && config_dock_hide) {
             hide_timeout_id = g_timeout_add_full(G_PRIORITY_DEFAULT,
-                                                 config_dock_show_delay,
+                                                 config_dock_hide_delay,
                                                  hide_timeout, NULL, NULL);
         } else if (dock->hidden && config_dock_hide && show_timeout_id) {
             if (show_timeout_id) g_source_remove(show_timeout_id);