combobox text

2 files changed, 14 insertions, 14 deletions

diff --git a/activity.py b/activity.py
index 39b0660..d50f303 100644
--- a/activity.py
+++ b/activity.py
@@ -74,7 +74,7 @@ class SpeakActivity(SharedActivity):
         self.connect("notify::active", self._activeCb)
 
         # make a box to type into
-        self.entrycombo = Gtk.combo_box_entry_new_text()
+        self.entrycombo = Gtk.combo_box_entry_new()
         self.entrycombo.connect("changed", self._combo_changed_cb)
         self.entry = self.entrycombo.get_child()
         self.entry.set_editable(True)
diff --git a/activity.py~ b/activity.py~
index bfe3606..39b0660 100644
--- a/activity.py~
+++ b/activity.py~
@@ -106,8 +106,8 @@ class SpeakActivity(SharedActivity):
 
         box.show_all()
         self.notebook.append_page(box)
-
-     """   self.chat = chat.View()
+        """
+        self.chat = chat.View()
         self.chat.show_all()
         self.notebook.append_page(self.chat)
 	"""
@@ -220,10 +220,10 @@ class SpeakActivity(SharedActivity):
                         for i in self.entrycombo.get_model()],
                 }
         file(file_path, 'w').write(json.dumps(cfg))
-
+    """
     def share_instance(self, connection, is_initiator):
         self.chat.messenger = Messenger(connection, is_initiator, self.chat)
-
+    """
     def _cursor_moved_cb(self, entry, *ignored):
         # make the eyes track the motion of the text cursor
         index = entry.props.cursor_position
@@ -241,7 +241,7 @@ class SpeakActivity(SharedActivity):
     def _mouse_moved_cb(self, widget, event):
         # make the eyes track the motion of the mouse cursor
         self.face.look_at()
-        self.chat.look_at()
+      #  self.chat.look_at()
 
     def _mouse_clicked_cb(self, widget, event):
         pass
@@ -346,7 +346,7 @@ class SpeakActivity(SharedActivity):
 
     def _update_face(self):
         self.face.update()
-        self.chat.update(self.face.status)
+ #       self.chat.update(self.face.status)
 
     def _combo_changed_cb(self, combo):
         # when a new item is chosen, make sure the text is selected
@@ -402,7 +402,7 @@ class SpeakActivity(SharedActivity):
         # only generate sound when this activity is active
         if not self.props.active:
             self.face.shut_up()
-            self.chat.shut_up()
+   #         self.chat.shut_up()
 
     def _set_voice(self, new_voice):
         try:
@@ -417,7 +417,7 @@ class SpeakActivity(SharedActivity):
             return
 
         self._mode = MODE_TYPE
-        self.chat.shut_up()
+    #    self.chat.shut_up()
         self.face.shut_up()
         self.notebook.set_current_page(0)
 
@@ -430,7 +430,7 @@ class SpeakActivity(SharedActivity):
             return
 
         self._mode = MODE_BOT
-        self.chat.shut_up()
+   #     self.chat.shut_up()
         self.face.shut_up()
         self.notebook.set_current_page(0)
 
@@ -460,7 +460,7 @@ class SpeakActivity(SharedActivity):
         if not button.props.active:
             return
 
-        is_first_session = not self.chat.me.get_mapped()
+ #       is_first_session = not self.chat.me.get_mapped()
 
         self._mode = MODE_CHAT
         self.face.shut_up()
@@ -469,11 +469,11 @@ class SpeakActivity(SharedActivity):
         old_voice = self.voices.props.value
         self.voices.set_model(voices_model)
         self._set_voice(old_voice)
-
+        """ 
         if is_first_session:
-            self.chat.me.say_notification(
+        	self.chat.me.say_notification(
                     _("You are in off-line mode, share and invite someone."))
-
+        """
     def __changed_voices_cb(self, combo):
         voice = combo.props.value
         self.face.set_voice(voice)