summaryrefslogtreecommitdiffstats
path: root/tormonitor
diff options
context:
space:
mode:
authorSascha Steinbiss <sascha@steinbiss.name>2015-10-31 13:36:32 +0000
committerSascha Steinbiss <sascha@steinbiss.name>2015-10-31 13:36:32 +0000
commite31217df5813ea8b7e9d9a6620f9c27b57e3b9d9 (patch)
treeb949a767021c40dd78b85957dacc660962eadc73 /tormonitor
parente7eb09943c41122a20183494016e28787e6890e0 (diff)
parent8414ac9ae48eca73125028f14cff5a3936d962bd (diff)
Merge tag '0.2' into upstreamupstream/0.2
Release version 0.2
Diffstat (limited to 'tormonitor')
-rwxr-xr-xtormonitor13
1 files changed, 9 insertions, 4 deletions
diff --git a/tormonitor b/tormonitor
index 5944a1d..123bdd6 100755
--- a/tormonitor
+++ b/tormonitor
@@ -93,7 +93,6 @@ class TorMonitorWindow(Gtk.ApplicationWindow):
self.set_titlebar(headerbar)
grid = Gtk.Grid()
- grid.set_column_homogeneous(True)
self.add(grid)
self._infobar = Gtk.InfoBar()
@@ -127,6 +126,9 @@ class TorMonitorWindow(Gtk.ApplicationWindow):
scrolledwindow_circuits.set_property('expand', True)
scrolledwindow_circuits.set_property('halign', Gtk.Align.FILL)
scrolledwindow_circuits.set_property('valign', Gtk.Align.FILL)
+ scrolledwindow_circuits.set_policy(
+ hscrollbar_policy=Gtk.PolicyType.NEVER,
+ vscrollbar_policy=Gtk.PolicyType.AUTOMATIC)
grid.attach(scrolledwindow_circuits, 0, 1, 1, 1)
# Circuit details
@@ -414,15 +416,18 @@ class TorMonitorWindow(Gtk.ApplicationWindow):
:var stem.response.events.StreamEvent stream: the stream
"""
stream_iter = self._stream_to_iter[stream.id]
- if stream.circ_id != self._treestore.get_value(stream_iter, 1):
- # The stream doesn't belong its parent circuit anymore. Remove it.
+ circuit_iter = self._treestore.iter_parent(stream_iter)
+ if stream.circ_id != self._treestore.get_value(circuit_iter, 1):
+ # The stream doesn't belong to its parent circuit anymore. Remove it.
self.remove_stream(stream)
if stream.circ_id:
# The stream has a new circuit, add it with its new parent.
stream_iter = self.add_stream(stream)
else:
# The stream didn't change parent. Update it.
- self._treestore.set(stream_iter, 2, self.stream_label(stream))
+ #
+ # We should not update the stream label because this would
+ # replace the hostname by its IP address.
if stream.status:
self._treestore.set(stream_iter, 3, str(stream.status).capitalize())