--- rxvt-unicode/src/init.C	2012/12/29 14:23:35	1.330
+++ rxvt-unicode/src/init.C	2014/08/16 10:51:23	1.334
@@ -16,7 +16,7 @@
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -662,6 +662,11 @@
     pointerBlankDelay = 2;
 #endif
 
+  if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
+    multiClickTime = i;
+  else
+    multiClickTime = 500;
+
   /* no point having a scrollbar without having any scrollback! */
   if (!saveLines)
     set_option (Opt_scrollBar, 0);
@@ -1398,7 +1403,9 @@
 
   wmHint.flags         = InputHint | StateHint | WindowGroupHint;
   wmHint.input         = True;
-  wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
+  wmHint.initial_state = option (Opt_iconic) ? IconicState
+                         : option (Opt_dockapp) ? WithdrawnState
+                         : NormalState;
   wmHint.window_group  = top;
 
   XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
@@ -1410,9 +1417,7 @@
    */
 
   if (rs [Rs_iconfile])
-    {
-      set_icon (rs [Rs_iconfile]);
-    }
+    set_icon (rs [Rs_iconfile]);
 #endif
 
 #if ENABLE_FRILLS