make startup notification a little more robust. obconf is just broken, between

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index bf5c8bec06f1aed275910664657e82b6c443390a..5441dbd91f219d335f49f1aed1fb46a5cec7fcc4 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -299,7 +299,7 @@ void client_manage(Window window)
     client_get_all(self);
     client_restore_session_state(self);
 
-    sn_app_started(self->class);
+    sn_app_started(self->startup_id, self->class);
 
     /* update the focus lists, do this before the call to change_state or
        it can end up in the list twice! */
@@ -735,7 +735,7 @@ gboolean client_find_onscreen(ObClient *self, gint *x, gint *y, gint w, gint h,
         /* avoid the xinerama monitor divide while we're at it,
          * remember to fix the placement stuff to avoid it also and
          * then remove this XXX */
-        a = screen_area(self->desktop);
+        a = screen_area_monitor(self->desktop, client_monitor(self));
         /* dont let windows map into the strut unless they
            are bigger than the available area */
         if (w <= a->width) {
@@ -1036,7 +1036,13 @@ void client_update_transient_for(ObClient *self)
                    a dockapp, for example */
                 target = NULL;
             }
-            
+
+#if 0 
+/* we used to do this, but it violates the ICCCM and causes problems because
+   toolkits seem to set transient_for = root rather arbitrarily (eg kicker's
+   config dialogs), so it is being removed. the ewmh provides other ways to
+   make things transient for their group. -dana
+*/
             if (!target && self->group) {
                 /* not transient to a client, see if it is transient for a
                    group */
@@ -1048,6 +1054,8 @@ void client_update_transient_for(ObClient *self)
                     target = OB_TRAN_GROUP;
                 }
             }
+#endif
+
         }
     } else if (self->type == OB_CLIENT_TYPE_DIALOG && self->group) {
         self->transient = TRUE;