Merge branch 'v0.6' of https://github.com/kozec/syncthing-gui into v0.6

kozec · Jan 27, 2015 · 26b58ae · 26b58ae
2 parents 868bca5 + 1f0fe18
commit 26b58ae
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/syncthing_gtk/daemon.py b/syncthing_gtk/daemon.py
@@ -692,7 +692,7 @@ def _syncthing_cb_shutdown(self, data, reason):
 			if self._connected:
 				self._connected = False
 				self._epoch += 1
-				self.emit("disconnected", reason, None)
+				self.emit("disconnected", reason, "")
 			self.cancel_all()
 
 	def _init_event_pooling(self, events):
@@ -881,7 +881,8 @@ def _syncthing_cb_version_known(self, version):
 			# Syncting version too low. Cancel everything and report error
 			self.cancel_all()
 			self._epoch += 1
-			self.emit("connection-error", Daemon.OLD_VERSION, "", None)
+			msg = "daemon is too old"
+			self.emit("connection-error", Daemon.OLD_VERSION, msg, Exception(msg))
 			return
 		if self._my_id != None:
 			device = self._get_device_data(self._my_id)