X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=3ebcc69ae8f568a0d6c5deafb129b464f8763ec8;hb=fde5ca09e9ea7ab08b6dc06723f19bad6d03af22;hp=cea6d99b224403701c23186b106d408e6cf90226;hpb=1046c19fda68f0e7c050b526e399b68b829f007f;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index cea6d99b..3ebcc69a 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -931,7 +931,7 @@ static void client_get_all(ObClient *self)
 
     client_update_wmhints(self);
     /* this may have already been called from client_update_wmhints */
-    if (self->transient && self->transient_for == NULL)
+    if (self->transient_for == NULL)
         client_update_transient_for(self);
     client_get_startup_id(self);
     client_get_desktop(self);/* uses transient data/group/startup id if a
@@ -3261,7 +3261,7 @@ void client_activate(ObClient *self, gboolean here, gboolean user)
         event_halt_focus_delay();
 
         if (client_normal(self) && screen_showing_desktop)
-            screen_show_desktop(FALSE);
+            screen_show_desktop(FALSE, FALSE);
         if (self->iconic)
             client_iconify(self, FALSE, here);
         if (self->desktop != DESKTOP_ALL &&