X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fscreen.cc;h=657705565893fa6c0e89bdb3dcb524ef2e405993;hb=711a7d8c5623814c374ed6f56476bc616cb9391f;hp=d925ff5c603803b360a0b9d0db55ac34e41fd165;hpb=7175ac2b5aec7aface6a2f86df32dd0386e0cc05;p=chaz%2Fopenbox

diff --git a/src/screen.cc b/src/screen.cc
index d925ff5c..65770556 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -532,7 +532,7 @@ void OBScreen::manageWindow(Window window)
   }
 
   // call the python NEWWINDOW binding
-  EventData *data = new_event_data(window, EventNewWindow, 0);
+  EventData *data = new_event_data(_number, window, EventNewWindow, 0);
   Openbox::instance->bindings()->fireEvent(data);
   Py_DECREF((PyObject*)data);
 
@@ -545,7 +545,8 @@ void OBScreen::unmanageWindow(OBClient *client)
   OBFrame *frame = client->frame;
 
   // call the python CLOSEWINDOW binding 
-  EventData *data = new_event_data(client->window(), EventCloseWindow, 0);
+  EventData *data = new_event_data(_number, client->window(),
+                                   EventCloseWindow, 0);
   Openbox::instance->bindings()->fireEvent(data);
   Py_DECREF((PyObject*)data);
 
@@ -648,6 +649,8 @@ void OBScreen::changeDesktop(long desktop)
                                      otk::OBProperty::Atom_Cardinal,
                                      _desktop);
 
+  if (old == _desktop) return;
+  
   OBClient::List::iterator it, end = clients.end();
   for (it = clients.begin(); it != end; ++it) {
     if ((*it)->desktop() == old) {