--- usp2-2.01.00.orig/debian/changes
+++ usp2-2.01.00/debian/changes
@@ -1,2 +1,2 @@
-Fix for Focus loss problem introduced in 2.00.08-6ubuntu1
-Rollup of all SVN bug fixes
+Fix for Focus loss problem with Recent and Places plugin when non-tabbed selction chosen
+
--- usp2-2.01.00.orig/debian/changelog
+++ usp2-2.01.00/debian/changelog
@@ -1,6 +1,6 @@
-usp2 (2.01.00-0ubuntu1) lucid; urgency=low
+usp2 (2.01.00-0ubuntu3) lucid; urgency=low
 
   * USP2 Final Release
 
- -- Malac <malacusp@gmail.com>  Sun, 30 May 2010 12:40:24 +0100
+ -- Malac <malacusp@gmail.com>  Tue, 08 Jun 2010 16:43:45 +0100
 
--- usp2-2.01.00.orig/usr/bin/usp
+++ usp2-2.01.00/usr/bin/usp
@@ -224,7 +224,6 @@
 		#gtk.gdk.pointer_ungrab()
 		if not self.pinmenu or forceHide:
 			self.window.hide()
-		#self.PanelButton.applet.do_focus_out_event(self.PanelButton.applet, gtk.gdk.Event(gtk.gdk.LEAVE_NOTIFY))
 
 	def PinMenu(self, *args, **kargs):
 		if self.wTree.get_widget("pin_button").get_active() == True:
@@ -252,7 +251,6 @@
 				self.wTree.get_widget( "sidepane" ).hide()
 			else:
 				self.wTree.get_widget( "sidepane" ).show()
-			
 
 	def CheckTab( self, PlugName, TabNumber):
 		ImageVal = gtk.Image()
@@ -597,7 +595,6 @@
 			if hasattr( self.plugins[plugin], 'minimized' ):
 				if self.plugins[plugin].minimized == True:
 					self.HidePlugin( self.plugins[plugin].container, self.plugins[plugin].icon, self.plugins[plugin].heading, self.plugins[plugin])
-					
 
 		if "applications" in self.plugins:
 			self.plugins["applications"].wTree.get_widget( "entry1" ).grab_focus()
@@ -645,7 +642,6 @@
 				self.wTree.get_widget( "sidepane" ).show()
 				Button1.connect( "button_press_event", self.TogglePluginView, PluginData, icon, tooltip, plugin )
 				self.wTree.get_widget( "vbox26" ).pack_start( Button1, False, False, 0 )
-				
 			else:
 				PluginData.show()
 				if hasattr( plugin, 'SetHidden' ):
@@ -800,7 +796,6 @@
 							self.PanelButton.toggle.set_active(False)
 						Execute( widget, self.Exec )
 						self.Exec=""
-				#self.applet.do_focus_out_event(self.applet, gtk.gdk.Event(gtk.gdk.LEAVE_NOTIFY))
 
 class MenuWin:
 	def __init__(self, applet, iid):
@@ -842,18 +837,16 @@
 		self.toggle.set_active(False)
 		self.toggle.connect("enter-notify-event", self.enterNotify)
 		self.toggle.connect("button_press_event", self.showMenu)
-		
 		self.toggle.connect("drag_data_received", self.dummyCallback)
 		self.toggle.drag_dest_set(gtk.DEST_DEFAULT_MOTION | gtk.DEST_DEFAULT_DROP, [("text/uri-list", 0, 0), ( "text/plain", 0, 1)], gtk.gdk.ACTION_COPY)
-		
 		self.toggle.connect("drag-motion", self.dragMotion)
 		self.toggle.connect("drag-leave", self.dragLeave)
 
 		self.dragging = False
-		
+
 		self.client = gconf.client_get_default()
 		self.applet.connect("change-orient", self.change_orientation)
-		
+
 		# Change color
 		self.applet.connect("change_background", self.change_background)
 		self.applet.add(self.toggle)
@@ -895,27 +888,26 @@
 				print _("** WARNING ** - Menu Hotkey Binding Error")
 				print _("Error Report :\n"), str(cause)
 				pass
-		
+
 		gobject.idle_add(self.change_orientation)
 
 	def dummyCallback(self, *arguments, **keywords):
 		pass
-	
+
 	def dragLeave(self, widget, *arguments, **keywords):
 		self.dragging = False
 		self.loseFocus(widget, None)
-		
+
 	def dragMotion(self, widget, dragContext, x, y, timestamp):
 		if not self.dragging:
 			self.showMenu(widget)
 			self.dragging = True
-		
+
 	def onBindingPress(self):
 		if self.mainwin.window.flags() & gtk.VISIBLE:
 			MenuWin.showMenu(self,self.toggle)
 			self.mainwin.ungrab()
 			self.toggle.set_active(False)
-			#self.applet.do_focus_out_event(self.applet, gtk.gdk.Event(gtk.gdk.LEAVE_NOTIFY))
 		else:
 			MenuWin.showMenu(self,self.toggle)
 			self.mainwin.grab()
@@ -942,7 +934,6 @@
 		if self.mainwin.pinmenu == False:
 			self.mainwin.window.hide()
 			self.toggle.set_active(False)
-			#self.applet.do_focus_out_event(self.applet, gtk.gdk.Event(gtk.gdk.LEAVE_NOTIFY))
 		try:
 			os.system("uspconfig &")
 		except:
@@ -953,7 +944,6 @@
 		if self.mainwin.pinmenu == False:
 			self.mainwin.window.hide()
 			self.toggle.set_active(False)
-			#self.applet.do_focus_out_event(self.applet, gtk.gdk.Event(gtk.gdk.LEAVE_NOTIFY))
 		try:
 			os.system("%s &" % self.menu_editor)
 		except:
@@ -1075,7 +1065,6 @@
 			if self.mainwin.window.flags() & gtk.VISIBLE :
 				self.mainwin.window.hide()
 				self.toggle.set_active(False)
-				#self.applet.do_focus_out_event(self.applet, gtk.gdk.Event(gtk.gdk.LEAVE_NOTIFY))
 			else:
 				self.toggle.set_active(True)
 				self.mainwin.window.present()
@@ -1111,7 +1100,6 @@
 			if self.toggle.get_active() == True:
 				self.mainwin.window.hide()
 				self.toggle.set_active(False)
-				#self.applet.do_focus_out_event(self.applet, gtk.gdk.Event(gtk.gdk.LEAVE_NOTIFY))
 			else:
 
 				self.toggle.set_active(True)
@@ -1129,7 +1117,6 @@
 					if self.toggle.get_active() == True:
 						self.mainwin.window.hide()
 						self.toggle.set_active(False)
-						#self.applet.do_focus_out_event(self.applet, gtk.gdk.Event(gtk.gdk.LEAVE_NOTIFY))
 					else:
 
 						# This is very, very weird, but there is something wrong
@@ -1156,16 +1143,15 @@
 				widget.emit_stop_by_name("button_press_event")
 				self.toggle.set_active(False)
 				self.mainwin.window.hide()
-				#self.applet.do_focus_out_event(self.applet, gtk.gdk.Event(gtk.gdk.LEAVE_NOTIFY))
 
 	def loseFocus(self, widget, event):
+		print gtk.gdk.window_at_pointer()
 		if gtk.gdk.window_at_pointer() == None and self.mainwin.pinmenu == False:
 			self.toggle.set_active(False)
 			self.mainwin.window.hide()
-		self.mainwin.ungrab()
-		gtk.gdk.pointer_ungrab()
-		#self.applet.do_focus_out_event(self.applet, gtk.gdk.Event(gtk.gdk.LEAVE_NOTIFY))
-		print self.toggle.get_pointer()
+			self.mainwin.ungrab()
+			gtk.gdk.pointer_ungrab()
+		#print event, self.mainwin.window.get_pointer(), self.mainwin.window.get_size(), self.mainwin.window.get_position()
 
 		return