Making the null touch selector more like fremantles

[gc-dialer] / src / gtk_toolbox.py

diff --git a/src/gtk_toolbox.py b/src/gtk_toolbox.py
index f402ac9..39ca4ff 100644 (file)
--- a/src/gtk_toolbox.py
+++ b/src/gtk_toolbox.py
@@ -299,11 +299,8 @@ class LoginWindow(object):
                self._serviceCombo.add_attribute(cell, 'text', 1)
                self._serviceCombo.set_active(0)
 
-               callbackMapping = {
-                       "on_loginbutton_clicked": self._on_loginbutton_clicked,
-                       "on_loginclose_clicked": self._on_loginclose_clicked,
-               }
-               widgetTree.signal_autoconnect(callbackMapping)
+               widgetTree.get_widget("loginbutton").connect("clicked", self._on_loginbutton_clicked)
+               widgetTree.get_widget("logins_close_button").connect("clicked", self._on_loginclose_clicked)
 
        def request_credentials(self,
                parentWindow = None,
@@ -414,9 +411,8 @@ class ErrorDisplay(object):
                        self.push_message(message)
 
        def push_message(self, message):
-               if 0 < len(self.__messages):
-                       self.__messages.append(message)
-               else:
+               self.__messages.append(message)
+               if 1 == len(self.__messages):
                        self.__show_message(message)
 
        def push_exception_with_lock(self):
@@ -429,11 +425,11 @@ class ErrorDisplay(object):
                logging.exception(userMessage)
 
        def pop_message(self):
-               if 0 < len(self.__messages):
-                       self.__show_message(self.__messages[0])
-                       del self.__messages[0]
-               else:
+               del self.__messages[0]
+               if 0 == len(self.__messages):
                        self.__hide_message()
+               else:
+                       self.__errorDescription.set_text(self.__messages[0])
 
        def _on_close(self, *args):
                self.pop_message()