little GUI and API fixes

2 files changed, 10 insertions, 4 deletions

diff --git a/module/gui/Collector.py b/module/gui/Collector.py
index c569785e2..3ec4262f1 100644
--- a/module/gui/Collector.py
+++ b/module/gui/Collector.py
@@ -71,13 +71,13 @@ class CollectorModel(QAbstractItemModel):
             called from main loop, pass events to the correct methods
         """
         QMutexLocker(self.mutex)
-        if event.event == "reload":
+        if event.eventname == "reload":
             self.fullReload()
-        elif event.event == "remove":
+        elif event.eventname == "remove":
             self.removeEvent(event)
-        elif event.event == "insert":
+        elif event.eventname == "insert":
             self.insertEvent(event)
-        elif event.event == "update":
+        elif event.eventname == "update":
             self.updateEvent(event)
     
     def fullReload(self):
diff --git a/module/gui/connector.py b/module/gui/connector.py
index 91f23dafb..74d791776 100644
--- a/module/gui/connector.py
+++ b/module/gui/connector.py
@@ -46,6 +46,7 @@ class Connector(QObject):
         self.password = None
         self.ssl = None
         self.running = True
+        self.internal = False
         self.proxy = self.Dummy()
     
     def setConnectionData(self, host, port, user, password, ssl=False):
@@ -66,6 +67,8 @@ class Connector(QObject):
             connect error signals,
             check server version
         """
+        if self.internal: return True
+
         err = None
         try:
             client = ThriftClient(self.host, self.port, self.user, self.password)
@@ -103,6 +106,9 @@ class Connector(QObject):
         """
             dummy rpc proxy, to prevent errors
         """
+        def __nonzero__(self):
+            return False
+
         def __getattr__(self, attr):
             def dummy(*args, **kwargs):
                 return None