From b1e9480f5af9ec833b2700fc3d6d7b48a01b1a8f Mon Sep 17 00:00:00 2001
From: Daniel Pavel <daniel.pavel@gmail.com>
Date: Mon, 1 Jul 2013 15:00:21 +0200
Subject: [PATCH] minor logging tweaks

---
 lib/solaar/listener.py    | 19 +++++++++----------
 lib/solaar/ui/__init__.py |  7 +++++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/solaar/listener.py b/lib/solaar/listener.py
index 3f29c3ad..58bf689f 100644
--- a/lib/solaar/listener.py
+++ b/lib/solaar/listener.py
@@ -117,16 +117,15 @@ class ReceiverListener(_listener.EventsListener):
 
 	def _status_changed(self, device, alert=_status.ALERT.NONE, reason=None):
 		assert device is not None
-		if _log.isEnabledFor(_DEBUG):
-			if device.kind is None:
-				_log.debug("status_changed %s: %s, %s (%X) %s", device,
-							'present' if bool(device) else 'removed',
-							device.status, alert, reason or '')
-			else:
-				_log.debug("status_changed %s: %s %s, %s (%X) %s", device,
-							'paired' if bool(device) else 'unpaired',
-							'online' if device.online else 'offline',
-							device.status, alert, reason or '')
+		if device.kind is None:
+			_log.info("status_changed %s: %s, %s (%X) %s", device,
+						'present' if bool(device) else 'removed',
+						device.status, alert, reason or '')
+		else:
+			_log.info("status_changed %s: %s %s, %s (%X) %s", device,
+						'paired' if bool(device) else 'unpaired',
+						'online' if device.online else 'offline',
+						device.status, alert, reason or '')
 
 		if device.kind is None:
 			assert device == self.receiver
diff --git a/lib/solaar/ui/__init__.py b/lib/solaar/ui/__init__.py
index 8fcc6d2b..53627614 100644
--- a/lib/solaar/ui/__init__.py
+++ b/lib/solaar/ui/__init__.py
@@ -14,6 +14,8 @@ GLib.threads_init()
 
 
 def _error_dialog(reason, object):
+	_log.error("%s: %s", reason, object)
+
 	if reason == 'permissions':
 		title = 'Permissions error'
 		text = ('Found a Logitech Receiver (%s), but did not have permission to open it.\n'
@@ -26,7 +28,7 @@ def _error_dialog(reason, object):
 	else:
 		raise Exception("ui.error_dialog: don't know how to handle (%s, %s)", reason, object)
 
-	assert text
+	assert title
 	assert text
 
 	m = Gtk.MessageDialog(None, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, text)
@@ -63,7 +65,8 @@ def destroy():
 from logitech.unifying_receiver.status import ALERT
 def _status_changed(device, alert, reason):
 	assert device is not None
-	_log.info("status changed: %s (%s) %s", device, alert, reason)
+	if _log.isEnabledFor(_DEBUG):
+		_log.debug("status changed: %s (%s) %s", device, alert, reason)
 
 	tray.update(device)
 	if alert & ALERT.ATTENTION: