--- ups-monitor-0.8.3/ups-monitor	2005-12-02 23:18:52.000000000 +0100
+++ ups-monitor	2007-08-11 21:58:55.000000000 +0200
@@ -306,9 +306,9 @@
 			debug_print( "Disconnected")
 			self.disconnect()
 			if self.failure_callback:
-				gtk.threads_enter()
+				gtk.gdk.threads_enter()
 				self.failure_callback()
-				gtk.threads_leave()
+				gtk.gdk.threads_leave()
 			return
 			
 		except Exception, e:
@@ -316,9 +316,9 @@
 			debug_print( "Timed out while sending or receiving data")
 			self.disconnect()
 			if self.failure_callback:
-				gtk.threads_enter()
+				gtk.gdk.threads_enter()
 				self.failure_callback()
-				gtk.threads_leave()
+				gtk.gdk.threads_leave()
 			return
 		
 		if find(response,"ERR UNKNOWN-UPS") != -1:
@@ -346,9 +346,9 @@
 
 		if self.poll_callback:
 			debug_print( "Calling callback thread")
-			gtk.threads_enter()
+			gtk.gdk.threads_enter()
 			self.poll_callback()
-			gtk.threads_leave()
+			gtk.gdk.threads_leave()
 		
 	def parse_input(self,linelist):
 		
@@ -370,7 +370,7 @@
 		
 		for line in linelist:
 			key, value = line
-			value = value.replace(".",radixchar)
+			value = value.replace(",",radixchar)
 			if key == "battery.charge":
 				self.battery_charge = float(value) / 100
 			if key == "battery.runtime":
@@ -379,7 +379,7 @@
 					self.max_remaining_time = self.remaining_time
 				if self.remaining_time > self.max_remaining_time:
 					self.max_remaining_time = self.remaining_time
-			if key == "battery.voltage":
+			if key == "output.voltage":
 				self.battery_voltage = float(value)
 			if key == "ups.load":
 				self.ups_load = float(value) / 100
@@ -1002,7 +1002,7 @@
 		
 		combobox = self.get_widget("hbox_local_upses").get_data("combo")
 		if not combobox:
-			combobox = gtk.Combo()
+			combobox = gtk.ComboBoxEntry()
 			combobox.set_sensitive(False)
 			self.get_widget("hbox_local_upses").pack_end(combobox)
 			self.get_widget("hbox_local_upses").set_data("combo",combobox)
@@ -1154,7 +1154,7 @@
 			except IOError, e:
 				debug_print("No ups.conf")
 			
-	gtk.threads_init()
+	gtk.gdk.threads_init()
 
 	gtk.main()