Adding the ignore file

[gc-dialer] / src / gtk_toolbox.py

diff --git a/src/gtk_toolbox.py b/src/gtk_toolbox.py
index f402ac9..7112030 100644 (file)
--- a/src/gtk_toolbox.py
+++ b/src/gtk_toolbox.py
@@ -17,6 +17,9 @@ import gobject
 import gtk
 
 
+_moduleLogger = logging.getLogger("gtk_toolbox")
+
+
 def get_screen_orientation():
        width, height = gtk.gdk.get_default_root_window().get_size()
        if width < height:
@@ -215,7 +218,8 @@ def comap(function, target):
                        mappedItem = function(*item)
                        target.send(mappedItem)
                except Exception, e:
-                       target.throw(e.__class__, e.message)
+                       _moduleLogger.exception("Forwarding exception!")
+                       target.throw(e.__class__, str(e))
 
 
 def _flush_queue(queue):
@@ -280,6 +284,22 @@ def threaded_stage(target, thread_factory = threading.Thread):
        return queue_sink(messages)
 
 
+def log_exception(logger):
+
+       def log_exception_decorator(func):
+
+               @functools.wraps(func)
+               def wrapper(*args, **kwds):
+                       try:
+                               return func(*args, **kwds)
+                       except Exception:
+                               logger.exception(func.__name__)
+
+               return wrapper
+
+       return log_exception_decorator
+
+
 class LoginWindow(object):
 
        def __init__(self, widgetTree):
@@ -299,11 +319,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 +431,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):
@@ -424,16 +440,16 @@ class ErrorDisplay(object):
                        self.push_exception()
 
        def push_exception(self):
-               userMessage = str(sys.exc_value)
+               userMessage = str(sys.exc_info()[1])
                self.push_message(userMessage)
-               logging.exception(userMessage)
+               _moduleLogger.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()
@@ -466,7 +482,7 @@ class DummyErrorDisplay(object):
 
        def push_exception(self, exception = None):
                userMessage = str(sys.exc_value)
-               logging.exception(userMessage)
+               _moduleLogger.exception(userMessage)
 
        def pop_message(self):
                if 0 < len(self.__messages):
@@ -474,7 +490,7 @@ class DummyErrorDisplay(object):
                        del self.__messages[0]
 
        def __show_message(self, message):
-               logging.debug(message)
+               _moduleLogger.debug(message)
 
 
 class MessageBox(gtk.MessageDialog):
@@ -548,7 +564,7 @@ class PopupCalendar(object):
                        self._calendar.select_month(self._displayDate.month, self._displayDate.year)
                        self._calendar.select_day(self._displayDate.day)
                except Exception, e:
-                       logging.exception(e.message)
+                       _moduleLogger.exception(e)
 
 
 class QuickAddView(object):