From da1f7c1f44bb4826775892d68db1abb0d2c09a1b Mon Sep 17 00:00:00 2001
From: flavio <fdanesse@gmail.com>
Date: Sat, 28 Jul 2012 00:03:20 +0000
Subject: Merge branch 'gtk3' of git.sugarlabs.org:speak/mainline into gtk3

---
diff --git a/activity.py b/activity.py
index b87f9ec..e3cae54 100644
--- a/activity.py
+++ b/activity.py
@@ -384,6 +384,7 @@ class SpeakActivity(SharedActivity):
         self.face.status.rate = adj.get_value()
         self.face.say_notification(_("rate adjusted"))
 
+    # face subtoolbar
     def make_face_bar(self):
         facebar = Gtk.Toolbar()
 
@@ -425,6 +426,7 @@ class SpeakActivity(SharedActivity):
         facebar.show_all()
         return facebar
 
+    # mouth changed callback
     def mouth_changed_cb(self, combo, quiet):
         self.face.status.mouth = combo.props.value
         self._update_face()
@@ -433,6 +435,7 @@ class SpeakActivity(SharedActivity):
         if not quiet:
             self.face.say_notification(_("mouth changed"))
 
+    # eyes changed callback
     def eyes_changed_cb(self, ignored, quiet):
         if self.numeyesadj is None:
             return
diff --git a/toolitem.py b/toolitem.py
index 75206e5..ca97a34 100644
--- a/toolitem.py
+++ b/toolitem.py
@@ -19,17 +19,19 @@
 
 from gi.repository import Gtk
 
+
 class ToolWidget(Gtk.ToolItem):
 
     def __init__(self, widget=None, label_text=""):
         Gtk.ToolItem.__init__(self)
-        
         self.wid = widget
         self.label = Gtk.Label(label_text)
         self._box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
         
-        if self.label: self._box.pack_start(self.label, True, True, 5)
-        if self.wid: self._box.pack_start(self.wid, True, True, 5)
+        if self.label:
+                self._box.pack_start(self.label, True, True, 5)
+        if self.wid:
+                self._box.pack_start(self.wid, True, True, 5)
         
         self.add(self._box)
-        self.show_all()
\ No newline at end of file
+        self.show_all()
--
cgit v0.9.1