gnome-shell r174 - trunk/js/ui

[danw svn gnome org]

Author: danw
Date: Mon Feb  2 20:54:33 2009
New Revision: 174
URL: http://svn.gnome.org/viewvc/gnome-shell?rev=174&view=rev

Log:
Fix a crash deleting a workspace, and another crash if the user tries to
select a workspace after deleting it.


Modified:
   trunk/js/ui/workspaces.js

Modified: trunk/js/ui/workspaces.js
==============================================================================
--- trunk/js/ui/workspaces.js	(original)
+++ trunk/js/ui/workspaces.js	Mon Feb  2 20:54:33 2009
@@ -419,7 +419,7 @@
                                                        reactive: true
                                                      });
             this._removeButton.set_from_file(global.imagedir + "remove-workspace.svg");
-            this._removeButton.connect('button-press-event', Lang.bind(this, this._removeSelf));
+            this._removeButton.connect('button-release-event', Lang.bind(this, this._removeSelf));
 
             this.actor.add_actor(this._removeButton);
             this._adjustRemoveButton();
@@ -674,6 +674,10 @@
                          });
 
         this._visible = false;
+
+        // Don't let the user try to select this workspace as it's
+        // making its exit.
+        this._desktop.reactive = false;
     },
     
     destroy : function() {
@@ -757,6 +761,7 @@
         let workspace = screen.get_workspace_by_index(this.workspaceNum);
 
         screen.remove_workspace(workspace, event.get_time());
+        return true;
     }
 };
 
@@ -830,7 +835,7 @@
                                          reactive: true
                                        });
         plus.set_from_file(global.imagedir + "add-workspace.svg");
-        plus.connect('button-press-event', this._appendNewWorkspace);
+        plus.connect('button-release-event', this._appendNewWorkspace);
         this.actor.add_actor(plus);
         plus.lower_bottom();